August 2019 - Wine-commits - list.winehq.org

Tag wine-4.13 : Alexandre Julliard : Release 4.13
by Alexandre Julliard 02 Aug '19

02 Aug '19

Module: wine Branch: refs/tags/wine-4.13 Tag: 074ff20a8494ed44c2c0d354ea376a35fcbb1374 URL: https://source.winehq.org/git/wine.git/?a=tag;h=074ff20a8494ed44c2c0d354ea3… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 2 21:24:39 2019 +0200 Release 4.13

1 0

Zebediah Figura : mspatcha: Use RtlComputeCrc32().
by Alexandre Julliard 02 Aug '19

02 Aug '19

Module: wine Branch: master Commit: 3f848c3a16339e6073c3a996c49d74b16642c3fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f848c3a16339e6073c3a996… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 1 18:53:59 2019 -0500 mspatcha: Use RtlComputeCrc32(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mspatcha/pa19.c | 84 +++++++--------------------------------------------- 1 file changed, 10 insertions(+), 74 deletions(-) diff --git a/dlls/mspatcha/pa19.c b/dlls/mspatcha/pa19.c index 633915e..0cb715c 100644 --- a/dlls/mspatcha/pa19.c +++ b/dlls/mspatcha/pa19.c @@ -36,6 +36,7 @@ #include <stdlib.h> #include "windef.h" +#include "winternl.h" #include "wine/heap.h" #include "wine/debug.h" @@ -52,83 +53,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(mspatcha); #define my_max(a, b) ((a) > (b) ? (a) : (b)) #define my_min(a, b) ((a) < (b) ? (a) : (b)) - -/* The CRC32 code is copyright (C) 1986 Gary S. Brown and was placed in the - * public domain. - * CRC polynomial 0xedb88320 - */ -static const UINT32 CRC_table[256] = -{ - 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, - 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, - 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, - 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, - 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, - 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, - 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, - 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, - 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, - 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, - 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106, - 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, - 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, - 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, - 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, - 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, - 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, - 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, - 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, - 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, - 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, - 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, - 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, - 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, - 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, - 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, - 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e, - 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, - 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, - 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, - 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, - 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, - 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, - 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, - 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, - 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, - 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, - 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, - 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, - 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, - 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, - 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, - 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d -}; - -static UINT32 compute_crc32(UINT32 crc, const BYTE *pData, INT_PTR iLen) +static UINT32 compute_zero_crc32(UINT32 crc, INT_PTR len) { - crc ^= 0xFFFFFFFF; + static const BYTE zero_buffer[1024]; - while (iLen > 0) { - crc = CRC_table[(crc ^ *pData) & 0xFF] ^ (crc >> 8); - pData++; - iLen--; - } - return crc ^ 0xFFFFFFFF; -} - -static UINT32 compute_zero_crc32(UINT32 crc, INT_PTR iLen) -{ - crc ^= 0xFFFFFFFF; - - while (iLen > 0) + while (len) { - crc = CRC_table[crc & 0xFF] ^ (crc >> 8); - iLen--; + crc = RtlComputeCrc32(crc, zero_buffer, min(len, sizeof(zero_buffer))); + len -= min(len, sizeof(zero_buffer)); } - return crc ^ 0xFFFFFFFF; + return crc; } - /*********************************************************************************** * PatchAPI PA19 file header * @@ -490,7 +426,7 @@ static int read_header(struct patch_file_header *ph, const BYTE *buf, size_t siz ph->src = my_min(ph->src + 4, ph->end); { - UINT32 crc = compute_crc32(0, buf, ph->src - buf) ^ 0xFFFFFFFF; + UINT32 crc = RtlComputeCrc32(0, buf, ph->src - buf) ^ 0xFFFFFFFF; if (crc != 0) { TRACE("patch file crc32 failed\n"); @@ -613,7 +549,7 @@ struct input_file_info *find_matching_old_file(const struct patch_file_header *p { ULONG end; ULONG start = next_zeroed_range(ph->file_table + i, index, old_file_size, &end); - crc32 = compute_crc32(crc32, old_file_view + index, start - index); + crc32 = RtlComputeCrc32(crc32, old_file_view + index, start - index); crc32 = compute_zero_crc32(crc32, end - start); index = end; } @@ -681,7 +617,7 @@ static DWORD compute_target_crc32(struct input_file_info *fi, const BYTE *new_fi ULONG end; ULONG start = next_retained_range_new(fi, index, new_file_size, &end); ++fi->next_r; - crc32 = compute_crc32(crc32, new_file_buf + index, start - index); + crc32 = RtlComputeCrc32(crc32, new_file_buf + index, start - index); crc32 = compute_zero_crc32(crc32, end - start); index = end; }

1 0

Zebediah Figura : mspatcha: Use the standard max() and min() macros.
by Alexandre Julliard 02 Aug '19

02 Aug '19

Module: wine Branch: master Commit: 31cbdfa49e5a13b4695c6c7e691d6e1400518e34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31cbdfa49e5a13b4695c6c7e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 1 18:54:00 2019 -0500 mspatcha: Use the standard max() and min() macros. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mspatcha/lzxd_dec.c | 16 +++++++--------- dlls/mspatcha/pa19.c | 21 +++++++++------------ 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/dlls/mspatcha/lzxd_dec.c b/dlls/mspatcha/lzxd_dec.c index f21e1ed..fe04723 100644 --- a/dlls/mspatcha/lzxd_dec.c +++ b/dlls/mspatcha/lzxd_dec.c @@ -54,8 +54,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mspatcha); #define E8_TRANSFORM_LIMIT_BITS 30 #define E8_TRANSFORM_DEAD_ZONE 10 -#define my_min(a, b) ((a) < (b) ? (a) : (b)) - struct LZXD_dec { /* use byte pointers instead of uint16 for simplicity on uncompressed * chunks, and the stream is not 16-bit aligned anyway */ @@ -120,7 +118,7 @@ static int init_chunk(struct LZXD_dec *dec, size_t index, size_t buf_limit) dec->bit_pos = 0; dec->tail_bits = 0; - dec->uncomp_chunk_end = my_min(buf_limit, index + MAX_CHUNK_UNCOMPRESSED_SIZE); + dec->uncomp_chunk_end = min(buf_limit, index + MAX_CHUNK_UNCOMPRESSED_SIZE); return 0; } @@ -407,8 +405,8 @@ static int copy_uncompressed(struct LZXD_dec *dec, BYTE *base, size_t *index_ptr while (dec->src < dec->stream_end) { /* now treat the input as an unaligned byte stream */ - size_t to_copy = my_min(end - index, dec->uncomp_chunk_end - index); - to_copy = my_min(to_copy, (size_t)(dec->stream_end - dec->src)); + size_t to_copy = min(end - index, dec->uncomp_chunk_end - index); + to_copy = min(to_copy, (size_t)(dec->stream_end - dec->src)); memcpy(base + index, dec->src, to_copy); index += to_copy; @@ -522,7 +520,7 @@ static int decode_lzxd_block(struct LZXD_dec *dec, BYTE *base, size_t predef_siz ret_if_failed(make_huffman_codes(codes, dec->len_lengths, LEN_CODE_COUNT)); make_decode_table(dec->len_table, codes, dec->len_lengths, MAX_CODE_LEN, LEN_CODE_COUNT); - block_limit = my_min(buf_limit, index + block_size); + block_limit = min(buf_limit, index + block_size); while (index < block_limit) { @@ -606,7 +604,7 @@ static int decode_lzxd_block(struct LZXD_dec *dec, BYTE *base, size_t predef_siz --length; } - end = my_min(index + length, block_limit); + end = min(index + length, block_limit); while (index < end) { base[index] = base[index - dist]; @@ -624,12 +622,12 @@ static int decode_lzxd_block(struct LZXD_dec *dec, BYTE *base, size_t predef_siz static void reverse_e8_transform(BYTE *decode_buf, ptrdiff_t len, ptrdiff_t e8_file_size) { - ptrdiff_t limit = my_min((ptrdiff_t)1 << E8_TRANSFORM_LIMIT_BITS, len); + ptrdiff_t limit = min((ptrdiff_t)1 << E8_TRANSFORM_LIMIT_BITS, len); ptrdiff_t i; for (i = 0; i < limit; ) { - ptrdiff_t end = my_min(i + MAX_CHUNK_UNCOMPRESSED_SIZE - E8_TRANSFORM_DEAD_ZONE, + ptrdiff_t end = min(i + MAX_CHUNK_UNCOMPRESSED_SIZE - E8_TRANSFORM_DEAD_ZONE, limit - E8_TRANSFORM_DEAD_ZONE); ptrdiff_t next = i + MAX_CHUNK_UNCOMPRESSED_SIZE; diff --git a/dlls/mspatcha/pa19.c b/dlls/mspatcha/pa19.c index 0cb715c..0ed60f4 100644 --- a/dlls/mspatcha/pa19.c +++ b/dlls/mspatcha/pa19.c @@ -50,9 +50,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mspatcha); #define PA19_FILE_MAGIC 0x39314150 #define PATCH_OPTION_EXTRA_FLAGS 0x80000000 -#define my_max(a, b) ((a) > (b) ? (a) : (b)) -#define my_min(a, b) ((a) < (b) ? (a) : (b)) - static UINT32 compute_zero_crc32(UINT32 crc, INT_PTR len) { static const BYTE zero_buffer[1024]; @@ -173,7 +170,7 @@ static UINT64 read_uvli(struct patch_file_header *ph) const BYTE *vli = ph->src; UINT64 n; ptrdiff_t i; - ptrdiff_t limit = my_min(ph->end - vli, 9); + ptrdiff_t limit = min(ph->end - vli, 9); if (ph->src >= ph->end) { @@ -204,7 +201,7 @@ static INT64 read_svli(struct patch_file_header *ph) const BYTE *vli = ph->src; INT64 n; ptrdiff_t i; - ptrdiff_t limit = my_min(ph->end - vli, 9); + ptrdiff_t limit = min(ph->end - vli, 9); if (ph->src >= ph->end) { @@ -423,7 +420,7 @@ static int read_header(struct patch_file_header *ph, const BYTE *buf, size_t siz } /* skip the crc adjustment field */ - ph->src = my_min(ph->src + 4, ph->end); + ph->src = min(ph->src + 4, ph->end); { UINT32 crc = RtlComputeCrc32(0, buf, ph->src - buf) ^ 0xFFFFFFFF; @@ -464,8 +461,8 @@ static ULONG next_ignored_range(const struct input_file_info *fi, size_t index, if (fi->next_i < fi->ignore_range_count && fi->stream_size != 0) { start = fi->ignore_table[fi->next_i].OffsetInOldFile; - *end = my_max(start + fi->ignore_table[fi->next_i].LengthInBytes, index); - start = my_max(start, index); + *end = max(start + fi->ignore_table[fi->next_i].LengthInBytes, index); + start = max(start, index); } return start; } @@ -479,8 +476,8 @@ static ULONG next_retained_range_old(const struct input_file_info *fi, size_t in if (fi->next_r < fi->retain_range_count) { start = fi->retain_table[fi->next_r].OffsetInOldFile; - *end = my_max(start + fi->retain_table[fi->next_r].LengthInBytes, index); - start = my_max(start, index); + *end = max(start + fi->retain_table[fi->next_r].LengthInBytes, index); + start = max(start, index); } return start; } @@ -494,8 +491,8 @@ static ULONG next_retained_range_new(const struct input_file_info *fi, size_t in if (fi->next_r < fi->retain_range_count) { start = fi->retain_table[fi->next_r].OffsetInNewFile; - *end = my_max(start + fi->retain_table[fi->next_r].LengthInBytes, index); - start = my_max(start, index); + *end = max(start + fi->retain_table[fi->next_r].LengthInBytes, index); + start = max(start, index); } return start; }

1 0

Alistair Leslie-Hughes : include: Add some missing declarations.
by Alexandre Julliard 02 Aug '19

02 Aug '19

Module: wine Branch: master Commit: 0333278f7ba6277c29fe7bd0adaca08fae3c5f04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0333278f7ba6277c29fe7bd0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 2 02:20:30 2019 +0000 include: Add some missing declarations. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/mbstring.h | 2 ++ include/msvcrt/stdlib.h | 8 ++++++++ include/msvcrt/string.h | 4 ++++ include/msvcrt/wchar.h | 11 +++++++++++ 4 files changed, 25 insertions(+) diff --git a/include/msvcrt/mbstring.h b/include/msvcrt/mbstring.h index 7a40f7b..f9b106b 100644 --- a/include/msvcrt/mbstring.h +++ b/include/msvcrt/mbstring.h @@ -75,6 +75,7 @@ int __cdecl _mbsicoll(const unsigned char*,const unsigned char*); unsigned char* __cdecl _mbsinc(const unsigned char*); size_t __cdecl _mbslen(const unsigned char*); unsigned char* __cdecl _mbslwr(unsigned char*); +errno_t __cdecl _mbslwr_s(unsigned char*, size_t); unsigned char* __cdecl _mbsnbcat(unsigned char*,const unsigned char*,size_t); errno_t __cdecl _mbsnbcat_s(unsigned char*,size_t,const unsigned char*,size_t); int __cdecl _mbsnbcmp(const unsigned char*,const unsigned char*,size_t); @@ -104,6 +105,7 @@ unsigned char* __cdecl _mbsstr(const unsigned char*,const unsigned char*); unsigned char* __cdecl _mbstok(unsigned char*,const unsigned char*); unsigned char* __cdecl _mbstok_l(unsigned char*,const unsigned char*,_locale_t); unsigned char* __cdecl _mbsupr(unsigned char*); +errno_t __cdecl _mbsupr_s(unsigned char*, size_t); #ifndef _MBLEADTRAIL_DEFINED #define _MBLEADTRAIL_DEFINED diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 3454b17..47a50bc 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -159,10 +159,13 @@ char* __cdecl _ecvt(double,int,int*,int*); char* __cdecl _fcvt(double,int,int*,int*); char* __cdecl _fullpath(char*,const char*,size_t); char* __cdecl _gcvt(double,int,char*); +errno_t __cdecl _gcvt_s(char*, size_t, double, int); char* __cdecl _i64toa(__int64,char*,int); +errno_t __cdecl _i64toa_s(__int64, char*, size_t, int); char* __cdecl _itoa(int,char*,int); errno_t __cdecl _itoa_s(int,char*,size_t,int); char* __cdecl _ltoa(__msvcrt_long,char*,int); +errno_t __cdecl _ltoa_s(__msvcrt_long, char*, size_t, int); __msvcrt_ulong __cdecl _lrotl(__msvcrt_ulong,int); __msvcrt_ulong __cdecl _lrotr(__msvcrt_ulong,int); void __cdecl _makepath(char*,const char*,const char*,const char*,const char*); @@ -232,10 +235,15 @@ void __cdecl qsort(void*,size_t,size_t,int (__cdecl *)(const void*,cons #ifndef _WSTDLIB_DEFINED #define _WSTDLIB_DEFINED wchar_t* __cdecl _itow(int,wchar_t*,int); +errno_t __cdecl _itow_s(int,wchar_t*,int, int); wchar_t* __cdecl _i64tow(__int64,wchar_t*,int); +errno_t __cdecl _i64tow_s(__int64, wchar_t*, size_t, int); wchar_t* __cdecl _ltow(__msvcrt_long,wchar_t*,int); +errno_t __cdecl _ltow_s(__msvcrt_long,wchar_t*,int,int); wchar_t* __cdecl _ui64tow(unsigned __int64,wchar_t*,int); +errno_t __cdecl _ui64tow_s(unsigned __int64, wchar_t*, size_t, int); wchar_t* __cdecl _ultow(__msvcrt_ulong,wchar_t*,int); +errno_t __cdecl _ultow_s(__msvcrt_ulong, wchar_t*, size_t, int); wchar_t* __cdecl _wfullpath(wchar_t*,const wchar_t*,size_t); wchar_t* __cdecl _wgetenv(const wchar_t*); void __cdecl _wmakepath(wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*); diff --git a/include/msvcrt/string.h b/include/msvcrt/string.h index 39a0296..85ba38a 100644 --- a/include/msvcrt/string.h +++ b/include/msvcrt/string.h @@ -95,16 +95,19 @@ int __cdecl _wcsicmp(const wchar_t*,const wchar_t*); int __cdecl _wcsicoll(const wchar_t*,const wchar_t*); int __cdecl _wcsicoll_l(const wchar_t*, const wchar_t*, _locale_t); wchar_t* __cdecl _wcslwr(wchar_t*); +errno_t __cdecl _wcslwr_s(wchar_t*, size_t); int __cdecl _wcscoll_l(const wchar_t*, const wchar_t*, _locale_t); int __cdecl _wcsncoll(const wchar_t*, const wchar_t*, size_t); int __cdecl _wcsncoll_l(const wchar_t*, const wchar_t*, size_t, _locale_t); int __cdecl _wcsnicmp(const wchar_t*,const wchar_t*,size_t); int __cdecl _wcsnicoll(const wchar_t*,const wchar_t*,size_t); int __cdecl _wcsnicoll_l(const wchar_t*, const wchar_t*, size_t, _locale_t); +size_t __cdecl _wcsnlen(const wchar_t*,size_t); wchar_t* __cdecl _wcsnset(wchar_t*,wchar_t,size_t); wchar_t* __cdecl _wcsrev(wchar_t*); wchar_t* __cdecl _wcsset(wchar_t*,wchar_t); wchar_t* __cdecl _wcsupr(wchar_t*); +errno_t __cdecl _wcsupr_s(wchar_t*, size_t); wchar_t* __cdecl wcscat(wchar_t*,const wchar_t*); errno_t __cdecl wcscat_s(wchar_t*,size_t,const wchar_t*); @@ -119,6 +122,7 @@ wchar_t* __cdecl wcsncat(wchar_t*,const wchar_t*,size_t); int __cdecl wcsncmp(const wchar_t*,const wchar_t*,size_t); wchar_t* __cdecl wcsncpy(wchar_t*,const wchar_t*,size_t); errno_t __cdecl wcsncpy_s(wchar_t*,size_t,const wchar_t*,size_t); +size_t __cdecl wcsnlen(const wchar_t*,size_t); wchar_t* __cdecl wcspbrk(const wchar_t*,const wchar_t*); wchar_t* __cdecl wcsrchr(const wchar_t*,wchar_t wcFor); size_t __cdecl wcsspn(const wchar_t*,const wchar_t*); diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 78df974..baa93a6 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -392,13 +392,19 @@ static inline int WINAPIV swprintf(wchar_t *buffer, size_t size, const wchar_t * #ifndef _WSTDLIB_DEFINED #define _WSTDLIB_DEFINED wchar_t* __cdecl _itow(int,wchar_t*,int); +errno_t __cdecl _itow_s(int,wchar_t*,int, int); wchar_t* __cdecl _i64tow(__int64,wchar_t*,int); +errno_t __cdecl _i64tow_s(__int64, wchar_t*, size_t, int); wchar_t* __cdecl _ltow(__msvcrt_long,wchar_t*,int); +errno_t __cdecl _ltow_s(__msvcrt_long,wchar_t*,int,int); wchar_t* __cdecl _ui64tow(unsigned __int64,wchar_t*,int); +errno_t __cdecl _ui64tow_s(unsigned __int64, wchar_t*, size_t, int); wchar_t* __cdecl _ultow(__msvcrt_ulong,wchar_t*,int); +errno_t __cdecl _ultow_s(__msvcrt_ulong, wchar_t*, size_t, int); wchar_t* __cdecl _wfullpath(wchar_t*,const wchar_t*,size_t); wchar_t* __cdecl _wgetenv(const wchar_t*); void __cdecl _wmakepath(wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*); +int __cdecl _wmakepath_s(wchar_t*,size_t,const wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*); void __cdecl _wperror(const wchar_t*); int __cdecl _wputenv(const wchar_t*); void __cdecl _wsearchenv(const wchar_t*,const wchar_t*,wchar_t*); @@ -431,6 +437,7 @@ int __cdecl _wcsicmp(const wchar_t*,const wchar_t*); int __cdecl _wcsicoll(const wchar_t*,const wchar_t*); int __cdecl _wcsicoll_l(const wchar_t*,const wchar_t*,_locale_t); wchar_t* __cdecl _wcslwr(wchar_t*); +errno_t __cdecl _wcslwr_s(wchar_t*, size_t); int __cdecl _wcsncoll(const wchar_t*,const wchar_t*,size_t); int __cdecl _wcsncoll_l(const wchar_t*,const wchar_t*,size_t,_locale_t); int __cdecl _wcsnicmp(const wchar_t*,const wchar_t*,size_t); @@ -440,6 +447,7 @@ wchar_t* __cdecl _wcsnset(wchar_t*,wchar_t,size_t); wchar_t* __cdecl _wcsrev(wchar_t*); wchar_t* __cdecl _wcsset(wchar_t*,wchar_t); wchar_t* __cdecl _wcsupr(wchar_t*); +errno_t __cdecl _wcsupr_s(wchar_t*, size_t); wchar_t* __cdecl wcscat(wchar_t*,const wchar_t*); errno_t __cdecl wcscat_s(wchar_t*,size_t,const wchar_t*); @@ -451,9 +459,11 @@ errno_t __cdecl wcscpy_s(wchar_t*,size_t,const wchar_t*); size_t __cdecl wcscspn(const wchar_t*,const wchar_t*); size_t __cdecl wcslen(const wchar_t*); wchar_t* __cdecl wcsncat(wchar_t*,const wchar_t*,size_t); +errno_t __cdecl wcsncat_s(wchar_t *, size_t, const wchar_t *, size_t); int __cdecl wcsncmp(const wchar_t*,const wchar_t*,size_t); wchar_t* __cdecl wcsncpy(wchar_t*,const wchar_t*,size_t); errno_t __cdecl wcsncpy_s(wchar_t*,size_t,const wchar_t*,size_t); +size_t __cdecl wcsnlen(const size_t*,size_t); wchar_t* __cdecl wcspbrk(const wchar_t*,const wchar_t*); wchar_t* __cdecl wcsrchr(const wchar_t*,wchar_t wcFor); size_t __cdecl wcsspn(const wchar_t*,const wchar_t*); @@ -491,6 +501,7 @@ size_t __cdecl mbsrtowcs(wchar_t*,const char**,size_t,mbstate_t*); size_t __cdecl wcrtomb(char*,wchar_t,mbstate_t*); size_t __cdecl wcsrtombs(char*,const wchar_t**,size_t,mbstate_t*); int __cdecl wctob(wint_t); +errno_t __cdecl wmemcpy_s(wchar_t *, size_t, const wchar_t *, size_t); static inline wchar_t *wmemchr(const wchar_t *s, wchar_t c, size_t n) {

1 0

Alistair Leslie-Hughes : include: Add tchar defines.
by Alexandre Julliard 02 Aug '19

02 Aug '19

Module: wine Branch: master Commit: 75133c6158726d96689595c933404fed73ef1b15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75133c6158726d96689595c9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 2 02:20:32 2019 +0000 include: Add tchar defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/tchar.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/tchar.h b/include/tchar.h index 9e7a846..5234a70 100644 --- a/include/tchar.h +++ b/include/tchar.h @@ -91,7 +91,9 @@ extern "C" { #define _istupper WINE_tchar_routine(isupper, _ismbcupper, iswupper) #define _istxdigit WINE_tchar_routine(isxdigit, isxdigit, iswxdigit) #define _itot WINE_tchar_routine(_itoa, _itoa, _itow) +#define _itot_s WINE_tchar_routine(_itoa_s, _itoa_s, _itow_s) #define _ltot WINE_tchar_routine(_ltoa, _ltoa, _ltow) +#define _ltot_s WINE_tchar_routine(_ltoa_s, _ltoa_s, _ltow_s) #define _puttc WINE_tchar_routine(putc, putc, putwc) #define _puttchar WINE_tchar_routine(putchar, putchar, putwchar) #define _putts WINE_tchar_routine(puts, puts, putws) @@ -106,11 +108,13 @@ extern "C" { #define _tchmod WINE_tchar_routine(chmod, _chmod, _wchmod) #define _tcreat WINE_tchar_routine(creat, _creat, _wcreat) #define _tcscat WINE_tchar_routine(strcat, _mbscat, wcscat) +#define _tcscat_s WINE_tchar_routine(strncat_s, _mbsncat_s, wcsncat_s) #define _tcschr WINE_tchar_routine(strchr, _mbschr, wcschr) #define _tcsclen WINE_tchar_routine(strlen, _mbslen, wcslen) #define _tcscmp WINE_tchar_routine(strcmp, _mbscmp, wcscmp) #define _tcscoll WINE_tchar_routine(strcoll, _mbscoll, wcscoll) #define _tcscpy WINE_tchar_routine(strcpy, _mbscpy, wcscpy) +#define _tcscpy_s WINE_tchar_routine(strcpy_s, _mbscpy_s, wcscpy_s) #define _tcscspn WINE_tchar_routine(strcspn, _mbscspn, wcscspn) #define _tcsdec WINE_tchar_routine(_strdec, _mbsdec, _wcsdec) #define _tcsdup WINE_tchar_routine(strdup, _mbsdup, _wcsdup) @@ -120,21 +124,27 @@ extern "C" { #define _tcsinc WINE_tchar_routine(_strinc, _mbsinc, _wcsinc) #define _tcslen WINE_tchar_routine(strlen, strlen, wcslen) #define _tcslwr WINE_tchar_routine(_strlwr, _mbslwr, _wcslwr) +#define _tcslwr_s WINE_tchar_routine(_strlwr_s, _mbslwr_s, _wcslwr_s) #define _tcsnbcnt WINE_tchar_routine(_strncnt, _mbsnbcnt, _wcnscnt) #define _tcsncat WINE_tchar_routine(strncat, _mbsnbcat, wcsncat) +#define _tcscat_s WINE_tchar_routine(strcat_s, _mbsnbcat_s, wcscat_s) #define _tcsnccat WINE_tchar_routine(strncat, _mbsncat, wcsncat) #define _tcsncmp WINE_tchar_routine(strncmp, _mbsnbcmp, wcsncmp) +#define _tcsncpy WINE_tchar_routine(strncpy, _mbsncpy, wcsncpy) +#define _tcsncpy_s WINE_tchar_routine(strncpy_s, _mbsncpy_s, wcsncpy_s) #define _tcsnccmp WINE_tchar_routine(strncmp, _mbsncmp, wcsncmp) #define _tcsnccnt WINE_tchar_routine(_strncnt, _mbsnccnt, _wcsncnt) #define _tcsnccpy WINE_tchar_routine(strncpy, _mbsncpy, wcsncpy) #define _tcsncicmp WINE_tchar_routine(_strnicmp, _mbsnicmp, _wcsnicmp) #define _tcsncpy WINE_tchar_routine(strncpy, _mbsnbcpy, wcsncpy) +#define _tcsncpy WINE_tchar_routine(strncpy_s, _mbsnbcpy_s, wcsncpy_s) #define _tcsncset WINE_tchar_routine(_strnset, _mbsnset, _wcsnset) #define _tcsnextc WINE_tchar_routine(_strnextc, _mbsnextc, _wcsnextc) #define _tcsnicmp WINE_tchar_routine(_strnicmp, _mbsnicmp, _wcsnicmp) #define _tcsnicoll WINE_tchar_routine(_strnicoll, _strnicoll _wcsnicoll) #define _tcsninc WINE_tchar_routine(_strninc, _mbsninc, _wcsninc) #define _tcsnccnt WINE_tchar_routine(_strncnt, _mbsnccnt, _wcsncnt) +#define _tcsnlen WINE_tchar_routine(strnlen, _mbsnblen, wcsnlen) #define _tcsnset WINE_tchar_routine(_strnset, _mbsnbset, _wcsnset) #define _tcspbrk WINE_tchar_routine(strpbrk, _mbspbrk, wcspbrk) #define _tcsspnp WINE_tchar_routine(_strspnp, _mbsspnp, _wcsspnp) @@ -148,6 +158,7 @@ extern "C" { #define _tcstol WINE_tchar_routine(strtol, strtol, wcstol) #define _tcstoul WINE_tchar_routine(strtoul, strtoul, wcstoul) #define _tcsupr WINE_tchar_routine(_strupr, _mbsupr, _wcsupr) +#define _tcsupr_s WINE_tchar_routine(_strupr_s, _mbsupr_s, _wcsupr_s) #define _tcsxfrm WINE_tchar_routine(strxfrm, strxfrm, wcsxfrm) #define _tctime WINE_tchar_routine(ctime, ctime, _wctime) #define _tenviron WINE_tchar_routine(_environ, _environ, _wenviron) @@ -172,6 +183,7 @@ extern "C" { #define _tgetenv WINE_tchar_routine(getenv, getenv, _wgetenv) #define _tmain WINE_tchar_routine(main, main, wmain) #define _tmakepath WINE_tchar_routine(_makepath, _makepath, _wmakepath) +#define _tmakepath_s WINE_tchar_routine(_makepath_s, _makepath_s, _wmakepath_s) #define _tmkdir WINE_tchar_routine(mkdir, _mkdir, _wmkdir) #define _tmktemp WINE_tchar_routine(mktemp, _mktemp, _wmktemp) #define _tperror WINE_tchar_routine(perror, perror, _wperror) @@ -196,6 +208,7 @@ extern "C" { #define _tspawnvp WINE_tchar_routine(_spawnvp, _spawnvp, _tspawnvp) #define _tspawnvpe WINE_tchar_routine(_spawnvpe, _spawnvpe, _tspawnvpe) #define _tsplitpath WINE_tchar_routine(_splitpath, _splitpath, _wsplitpath) +#define _tsplitpath_s WINE_tchar_routine(_splitpath_s, _splitpath_s,_wsplitpath_s) #define _tstat WINE_tchar_routine(_stat, _stat, _wstat) #define _tstati64 WINE_tchar_routine(_stati64, _stati64, _wstati64) #define _tstrdate WINE_tchar_routine(_strdate, _strdate, _wstrdate) @@ -208,6 +221,7 @@ extern "C" { #define _tutime WINE_tchar_routine(utime, _utime, _wutime) #define _tWinMain WINE_tchar_routine(WinMain, WinMain, wWinMain) #define _ultot WINE_tchar_routine(_ultoa, _ultoa, _ultow) +#define _ultot_s WINE_tchar_routine(_ultoa_s, _ultoa_s, _ultow_s) #define _ungettc WINE_tchar_routine(ungetc, ungetc, ungetwc) #define _vftprintf WINE_tchar_routine(vfprintf, vfprintf, vfwprintf) #define _vsntprintf WINE_tchar_routine(vsnprintf, _vsnprintf, _vsnwprintf)

1 0

Alistair Leslie-Hughes : include: Define ADDRINFOT.
by Alexandre Julliard 02 Aug '19

02 Aug '19

Module: wine Branch: master Commit: c71db79c4b402e80e4f1e5a9642d2fe698943336 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c71db79c4b402e80e4f1e5a9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 2 02:20:33 2019 +0000 include: Define ADDRINFOT. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ws2tcpip.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index ea19ee3..b26ab2f 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -54,6 +54,9 @@ typedef struct WS(addrinfoW) struct WS(addrinfoW)* ai_next; } ADDRINFOW, *PADDRINFOW; +DECL_WINELIB_TYPE_AW(ADDRINFOT) +DECL_WINELIB_TYPE_AW(PADDRINFOT) + #ifdef USE_WS_PREFIX typedef int WS_socklen_t; #else

1 0

Alistair Leslie-Hughes : include: Added LVITEMINDEX.
by Alexandre Julliard 02 Aug '19

02 Aug '19

Module: wine Branch: master Commit: eed7a2dca9e8f10b2226d3fed7f2b5b1561b89a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eed7a2dca9e8f10b2226d3fe… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 2 02:20:34 2019 +0000 include: Added LVITEMINDEX. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 0ad5614..906f2c3 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -3886,6 +3886,17 @@ typedef struct NMLVSCROLL int dy; } NMLVSCROLL, *LPNMLVSCROLL; +typedef struct tagLVITEMINDEX +{ + int iItem; + int iGroup; +} LVITEMINDEX, *PLVITEMINDEX; + +#define LVGGR_GROUP 0 +#define LVGGR_HEADER 1 +#define LVGGR_LABEL 2 +#define LVGGR_SUBSETLINK 3 + #define ListView_SetItemCount(hwnd,count) \ (BOOL)SNDMSG((hwnd),LVM_SETITEMCOUNT,(WPARAM)(INT)(count),0) #define ListView_SetTextBkColor(hwnd,clrBk) \

1 0

Alistair Leslie-Hughes : include: Add missing D3DKMT typedefs.
by Alexandre Julliard 02 Aug '19

02 Aug '19

Module: wine Branch: master Commit: c078e913384fa29f2b1e2db20ae0c2a6d940f645 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c078e913384fa29f2b1e2db2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 2 03:34:30 2019 +0000 include: Add missing D3DKMT typedefs. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/d3dkmthk.h | 437 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 437 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c078e913384fa29f2b1e…

1 0

Alistair Leslie-Hughes : gdi32: Add D3DKMTQueryStatistics stub.
by Alexandre Julliard 02 Aug '19

02 Aug '19

Module: wine Branch: master Commit: 5373f7264c13ea729a81867c4d90e2ce5a42cf50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5373f7264c13ea729a81867c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 2 03:34:31 2019 +0000 gdi32: Add D3DKMTQueryStatistics stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47074 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/gdi32/driver.c | 9 +++++++++ dlls/gdi32/gdi32.spec | 1 + include/ddk/d3dkmthk.h | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index 43452cd..a28fc5c 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -68,7 +68,7 @@ @ stub D3DKMTQueryRemoteVidPnSourceFromGdiDisplayName @ stub D3DKMTQueryResourceInfo @ stub D3DKMTQueryResourceInfoFromNtHandle -@ stub D3DKMTQueryStatistics +@ stdcall D3DKMTQueryStatistics(ptr) gdi32.D3DKMTQueryStatistics @ stub D3DKMTReclaimAllocations @ stub D3DKMTReleaseKeyedMutex @ stub D3DKMTReleaseKeyedMutex2 diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 90f9656..fc0839f 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1447,3 +1447,12 @@ NTSTATUS WINAPI D3DKMTDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) return status; } + +/****************************************************************************** + * D3DKMTQueryStatistics [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTQueryStatistics(D3DKMT_QUERYSTATISTICS *stats) +{ + FIXME("(%p): stub\n", stats); + return STATUS_SUCCESS; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 9abd821..cc5d2c2 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -88,6 +88,7 @@ @ stdcall D3DKMTEscape(ptr) @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) @ stdcall D3DKMTOpenAdapterFromHdc(ptr) +@ stdcall D3DKMTQueryStatistics(ptr) @ stdcall DPtoLP(long ptr long) @ stdcall DeleteColorSpace(long) @ stdcall DeleteDC(long) diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 8e28c94..ea4df3a 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -608,6 +608,7 @@ NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDevice(const D3DKMT_DESTROYDEVICE *desc); NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); +NTSTATUS WINAPI D3DKMTQueryStatistics(D3DKMT_QUERYSTATISTICS *stats); #ifdef __cplusplus }

1 0

Qian Hong : advapi32: Initialize the LsaLookupSids() LSA_TRANSLATED_NAME.Name string properly.
by Alexandre Julliard 02 Aug '19

02 Aug '19

Module: wine Branch: master Commit: 2e53f8bccb65d112e5e341586c730094950fe6c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e53f8bccb65d112e5e34158… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Aug 2 06:29:16 2019 +0200 advapi32: Initialize the LsaLookupSids() LSA_TRANSLATED_NAME.Name string properly. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39129 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/lsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 592876a..793d791 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -508,7 +508,7 @@ NTSTATUS WINAPI LsaLookupSids( { (*Names)[i].Use = SidTypeUnknown; (*Names)[i].DomainIndex = -1; - (*Names)[i].Name.Buffer = NULL; + RtlInitUnicodeStringEx(&(*Names)[i].Name, NULL); memset(&(*ReferencedDomains)->Domains[i], 0, sizeof(LSA_TRUST_INFORMATION));

1 0