November 2019 - Wine-commits

Hans Leidekker : wininet: Add support for detecting the proxy config URL.
by Alexandre Julliard 22 Nov '19

22 Nov '19

Module: wine Branch: master Commit: a4357043ff9aa14f086207c239f0fc29c0a24b83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4357043ff9aa14f086207c2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 22 16:32:25 2019 +0100 wininet: Add support for detecting the proxy config URL. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/Makefile.in | 4 +- dlls/wininet/internet.c | 201 ++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 173 insertions(+), 32 deletions(-) diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in index 6eeb7cf85b..e1d4979d87 100644 --- a/dlls/wininet/Makefile.in +++ b/dlls/wininet/Makefile.in @@ -2,9 +2,9 @@ EXTRADEFS = -D_WINX32_ MODULE = wininet.dll IMPORTLIB = wininet IMPORTS = mpr shlwapi shell32 user32 ws2_32 advapi32 -DELAYIMPORTS = secur32 crypt32 cryptui +DELAYIMPORTS = secur32 crypt32 cryptui dhcpcsvc iphlpapi EXTRAINCL = $(Z_CFLAGS) -EXTRALIBS = $(CORESERVICES_LIBS) $(Z_LIBS) +EXTRALIBS = $(Z_LIBS) C_SRCS = \ cookie.c \ diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 266100861d..3e8be9fa2b 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -28,14 +28,6 @@ #include "config.h" -#ifdef HAVE_CORESERVICES_CORESERVICES_H -#define GetCurrentThread MacGetCurrentThread -#define LoadResource MacLoadResource -#include <CoreServices/CoreServices.h> -#undef GetCurrentThread -#undef LoadResource -#endif - #include "winsock2.h" #include "ws2ipdef.h" @@ -56,6 +48,10 @@ #include "winerror.h" #define NO_SHLWAPI_STREAM #include "shlwapi.h" +#include "ws2tcpip.h" +#include "winternl.h" +#include "iphlpapi.h" +#include "dhcpcsdk.h" #include "wine/exception.h" @@ -2295,38 +2291,183 @@ BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer, return res == ERROR_SUCCESS; } -static WCHAR *get_proxy_autoconfig_url(void) +static IP_ADAPTER_ADDRESSES *get_adapters(void) { -#if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 + ULONG err, size = 1024, flags = GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST | + GAA_FLAG_SKIP_DNS_SERVER | GAA_FLAG_SKIP_FRIENDLY_NAME; + IP_ADAPTER_ADDRESSES *tmp, *ret; - CFDictionaryRef settings = CFNetworkCopySystemProxySettings(); - WCHAR *ret = NULL; - SIZE_T len; - const void *ref; + if (!(ret = heap_alloc( size ))) return NULL; + err = GetAdaptersAddresses( AF_UNSPEC, flags, NULL, ret, &size ); + while (err == ERROR_BUFFER_OVERFLOW) + { + if (!(tmp = heap_realloc( ret, size ))) break; + ret = tmp; + err = GetAdaptersAddresses( AF_UNSPEC, flags, NULL, ret, &size ); + } + if (err == ERROR_SUCCESS) return ret; + heap_free( ret ); + return NULL; +} + +static WCHAR *detect_proxy_autoconfig_url_dhcp(void) +{ + IP_ADAPTER_ADDRESSES *adapters, *ptr; + DHCPCAPI_PARAMS_ARRAY send_params, recv_params; + DHCPCAPI_PARAMS param; + WCHAR name[MAX_ADAPTER_NAME_LENGTH + 1], *ret = NULL; + DWORD err, size; + BYTE *tmp, *buf = NULL; + + if (!(adapters = get_adapters())) return NULL; + + memset( &send_params, 0, sizeof(send_params) ); + memset( &param, 0, sizeof(param) ); + param.OptionId = OPTION_MSFT_IE_PROXY; + recv_params.nParams = 1; + recv_params.Params = &param; + + for (ptr = adapters; ptr; ptr = ptr->Next) + { + MultiByteToWideChar( CP_ACP, 0, ptr->AdapterName, -1, name, ARRAY_SIZE(name) ); + TRACE( "adapter '%s' type %u dhcpv4 enabled %d\n", wine_dbgstr_w(name), ptr->IfType, ptr->Dhcpv4Enabled ); + + if (ptr->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue; + /* FIXME: also skip adapters where DHCP is disabled */ + + size = 256; + if (!(buf = heap_alloc( size ))) goto done; + err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, name, NULL, send_params, recv_params, + buf, &size, NULL ); + while (err == ERROR_MORE_DATA) + { + if (!(tmp = heap_realloc( buf, size ))) goto done; + buf = tmp; + err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, name, NULL, send_params, recv_params, + buf, &size, NULL ); + } + if (err == ERROR_SUCCESS && param.nBytesData) + { + int len = MultiByteToWideChar( CP_ACP, 0, (const char *)param.Data, param.nBytesData, NULL, 0 ); + if ((ret = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + { + MultiByteToWideChar( CP_ACP, 0, (const char *)param.Data, param.nBytesData, ret, len ); + ret[len] = 0; + } + TRACE("returning %s\n", debugstr_w(ret)); + break; + } + } - if (!settings) return NULL; +done: + heap_free( buf ); + heap_free( adapters ); + return ret; +} - if (!(ref = CFDictionaryGetValue( settings, kCFNetworkProxiesProxyAutoConfigURLString ))) +static char *get_computer_name( COMPUTER_NAME_FORMAT format ) +{ + char *ret; + DWORD size = 0; + + GetComputerNameExA( format, NULL, &size ); + if (GetLastError() != ERROR_MORE_DATA) return NULL; + if (!(ret = heap_alloc( size ))) return NULL; + if (!GetComputerNameExA( format, ret, &size )) { - CFRelease( settings ); + heap_free( ret ); return NULL; } - len = CFStringGetLength( ref ); - if (len) - ret = heap_alloc( (len+1) * sizeof(WCHAR) ); - if (ret) + return ret; +} + +static BOOL is_domain_suffix( const char *domain, const char *suffix ) +{ + int len_domain = strlen( domain ), len_suffix = strlen( suffix ); + + if (len_suffix > len_domain) return FALSE; + if (!_strnicmp( domain + len_domain - len_suffix, suffix, -1 )) return TRUE; + return FALSE; +} + +static int reverse_lookup( const struct addrinfo *ai, char *hostname, size_t len ) +{ + return getnameinfo( ai->ai_addr, ai->ai_addrlen, hostname, len, NULL, 0, 0 ); +} + +static WCHAR *build_wpad_url( const char *hostname, const struct addrinfo *ai ) +{ + static const WCHAR httpW[] = {'h','t','t','p',':','/','/',0}; + static const WCHAR wpadW[] = {'/','w','p','a','d','.','d','a','t',0}; + char name[NI_MAXHOST]; + WCHAR *ret, *p; + int len; + + while (ai && ai->ai_family != AF_INET && ai->ai_family != AF_INET6) ai = ai->ai_next; + if (!ai) return NULL; + + if (!reverse_lookup( ai, name, sizeof(name) )) hostname = name; + + len = lstrlenW( httpW ) + strlen( hostname ) + lstrlenW( wpadW ); + if (!(ret = p = GlobalAlloc( 0, (len + 1) * sizeof(WCHAR) ))) return NULL; + lstrcpyW( p, httpW ); + p += lstrlenW( httpW ); + while (*hostname) { *p++ = *hostname++; } + lstrcpyW( p, wpadW ); + return ret; +} + +static WCHAR *detect_proxy_autoconfig_url_dns(void) +{ + char *fqdn, *domain, *p; + WCHAR *ret; + + if (!(fqdn = get_computer_name( ComputerNamePhysicalDnsFullyQualified ))) return NULL; + if (!(domain = get_computer_name( ComputerNamePhysicalDnsDomain ))) + { + heap_free( fqdn ); + return NULL; + } + p = fqdn; + while ((p = strchr( p, '.' )) && is_domain_suffix( p + 1, domain )) { - CFStringGetCharacters( ref, CFRangeMake(0, len), ret ); - ret[len] = 0; + char *name; + struct addrinfo *ai; + int res; + + if (!(name = heap_alloc( sizeof("wpad") + strlen(p) ))) + { + heap_free( fqdn ); + heap_free( domain ); + return NULL; + } + strcpy( name, "wpad" ); + strcat( name, p ); + res = getaddrinfo( name, NULL, NULL, &ai ); + if (!res) + { + ret = build_wpad_url( name, ai ); + freeaddrinfo( ai ); + if (ret) + { + TRACE("returning %s\n", debugstr_w(ret)); + heap_free( name ); + break; + } + } + heap_free( name ); + p++; } - TRACE( "returning %s\n", debugstr_w(ret) ); - CFRelease( settings ); + heap_free( domain ); + heap_free( fqdn ); + return ret; +} + +static WCHAR *get_proxy_autoconfig_url(void) +{ + WCHAR *ret = detect_proxy_autoconfig_url_dhcp(); + if (!ret) ret = detect_proxy_autoconfig_url_dns(); return ret; -#else - static int once; - if (!once++) FIXME( "no support on this platform\n" ); - return NULL; -#endif } static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL unicode)

1 0

Piotr Caban : msvcrt: Use isspace_l in string to number conversion functions.
by Alexandre Julliard 22 Nov '19

22 Nov '19

Module: wine Branch: master Commit: e2423823fc318b0e1a8818d659ac670f75670ee9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2423823fc318b0e1a8818d6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 22 16:41:23 2019 +0100 msvcrt: Use isspace_l in string to number conversion functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/string.c | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index a5c92497a9..4a7e6f4219 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1066,6 +1066,7 @@ int __cdecl MSVCRT_iswspace(MSVCRT_wint_t); int __cdecl MSVCRT_iswdigit(MSVCRT_wint_t); int __cdecl MSVCRT_isleadbyte(int); int __cdecl MSVCRT__isleadbyte_l(int, MSVCRT__locale_t); +int __cdecl MSVCRT__isspace_l(int, MSVCRT__locale_t); void __cdecl MSVCRT__lock_file(MSVCRT_FILE*); void __cdecl MSVCRT__unlock_file(MSVCRT_FILE*); diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 346cba7e72..10249592bb 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -350,9 +350,8 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale else locinfo = locale->locinfo; - /* FIXME: use *_l functions */ p = str; - while(isspace(*p)) + while(MSVCRT__isspace_l((unsigned char)*p, locale)) p++; if(*p == '-') { @@ -957,7 +956,7 @@ __int64 CDECL MSVCRT_strtoi64_l(const char *nptr, char **endptr, int base, MSVCR if (!MSVCRT_CHECK_PMT(base == 0 || base >= 2)) return 0; if (!MSVCRT_CHECK_PMT(base <= 36)) return 0; - while(isspace(*nptr)) nptr++; + while(MSVCRT__isspace_l((unsigned char)*nptr, locale)) nptr++; if(*nptr == '-') { negative = TRUE; @@ -1050,7 +1049,7 @@ int __cdecl MSVCRT_atoi(const char *str) if(!str) return 0; - while(isspace(*str)) str++; + while(MSVCRT__isspace_l((unsigned char)*str, NULL)) str++; if(*str == '+') { str++; @@ -1209,7 +1208,7 @@ unsigned __int64 CDECL MSVCRT_strtoui64_l(const char *nptr, char **endptr, int b if (!MSVCRT_CHECK_PMT(base == 0 || base >= 2)) return 0; if (!MSVCRT_CHECK_PMT(base <= 36)) return 0; - while(isspace(*nptr)) nptr++; + while(MSVCRT__isspace_l((unsigned char)*nptr, locale)) nptr++; if(*nptr == '-') { negative = TRUE;

1 0

Piotr Caban : ucrtbase: Fix hexadecimal floats parsing in strtod.
by Alexandre Julliard 22 Nov '19

22 Nov '19

Module: wine Branch: master Commit: c953c36d11ee6f83b8b33e9ec1d7664ff5e680ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=c953c36d11ee6f83b8b33e9e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 22 16:41:30 2019 +0100 ucrtbase: Fix hexadecimal floats parsing in strtod. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 263 +++++++++++++++++++++++++++++++++++++------ dlls/ucrtbase/tests/string.c | 15 ++- 2 files changed, 239 insertions(+), 39 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 10249592bb..fa5f7022c1 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -325,6 +325,221 @@ void CDECL MSVCRT__swab(char* src, char* dst, int len) } } +#if _MSVCR_VER >= 140 + +enum round { + ROUND_ZERO, /* only used when dropped part contains only zeros */ + ROUND_DOWN, + ROUND_EVEN, + ROUND_UP +}; + +static double make_double(int sign, int exp, ULONGLONG m, enum round round, int *err) +{ +#define EXP_BITS 11 +#define MANT_BITS 53 + ULONGLONG bits = 0; + + TRACE("%c %s *2^%d (round %d)\n", sign == -1 ? '-' : '+', wine_dbgstr_longlong(m), exp, round); + if (!m) return sign * 0.0; + + /* make sure that we don't overflow modifying exponent */ + if (exp > 1<<EXP_BITS) + { + if (err) *err = MSVCRT_ERANGE; + return sign * INFINITY; + } + if (exp < -(1<<EXP_BITS)) + { + if (err) *err = MSVCRT_ERANGE; + return sign * 0.0; + } + exp += MANT_BITS - 1; + + /* normalize mantissa */ + while(m < (ULONGLONG)1 << (MANT_BITS-1)) + { + m <<= 1; + exp--; + } + while(m >= (ULONGLONG)1 << MANT_BITS) + { + if (m & 1 || round != ROUND_ZERO) + { + if (!(m & 1)) round = ROUND_DOWN; + else if(round == ROUND_ZERO) round = ROUND_EVEN; + else round = ROUND_UP; + } + m >>= 1; + exp++; + } + + /* handle subnormal that falls into regular range due to rounding */ + exp += (1 << (EXP_BITS-1)) - 1; + if (!exp && (round == ROUND_UP || (round == ROUND_EVEN && m & 1))) + { + if (m + 1 >= (ULONGLONG)1 << MANT_BITS) + { + m++; + m >>= 1; + exp++; + round = ROUND_DOWN; + } + } + + /* handle subnormals */ + if (exp <= 0) + m >>= 1; + while(m && exp<0) + { + m >>= 1; + exp++; + } + + /* round mantissa */ + if (round == ROUND_UP || (round == ROUND_EVEN && m & 1)) + { + m++; + if (m >= (ULONGLONG)1 << MANT_BITS) + { + exp++; + m >>= 1; + } + } + + if (exp >= 1<<EXP_BITS) + { + if (err) *err = MSVCRT_ERANGE; + return sign * INFINITY; + } + if (!m || exp < 0) + { + if (err) *err = MSVCRT_ERANGE; + return sign * 0.0; + } + + if (sign == -1) bits |= (ULONGLONG)1 << (MANT_BITS + EXP_BITS - 1); + bits |= (ULONGLONG)exp << (MANT_BITS - 1); + bits |= m & (((ULONGLONG)1 << (MANT_BITS - 1)) - 1); + + TRACE("returning %s\n", wine_dbgstr_longlong(bits)); + return *((double*)&bits); +} + +static inline int hex2int(char c) +{ + if (c >= '0' && c <= '9') + return c - '0'; + else if (c >= 'a' && c <= 'f') + return c - 'a' + 10; + else if (c >= 'A' && c <= 'F') + return c - 'A' + 10; + return -1; +} + +static double strtod16(int sign, const char *p, char **end, + MSVCRT_pthreadlocinfo locinfo, int *err) +{ + enum round round = ROUND_ZERO; + BOOL found_digit = FALSE; + ULONGLONG m = 0; + int val, exp = 0; + + while(m < MSVCRT_UI64_MAX/16) + { + val = hex2int(*p); + if (val == -1) break; + found_digit = TRUE; + p++; + + m = m*16 + val; + } + while(1) + { + val = hex2int(*p); + if (val == -1) break; + p++; + exp += 4; + + if (val || round != ROUND_ZERO) + { + if (val < 8) round = ROUND_DOWN; + else if (val == 8 && round == ROUND_ZERO) round = ROUND_EVEN; + else round = ROUND_UP; + } + } + + if(*p == *locinfo->lconv->decimal_point) + p++; + else if (!found_digit) + { + if(end) *end = (char*)p - 1; + return 0.0; + } + + while(m <= MSVCRT_UI64_MAX/16) + { + val = hex2int(*p); + if (val == -1) break; + found_digit = TRUE; + p++; + + m = m*16 + val; + exp -= 4; + } + while(1) + { + val = hex2int(*p); + if (val == -1) break; + p++; + + if (val || round != ROUND_ZERO) + { + if (val < 8) round = ROUND_DOWN; + else if (val == 8 && round == ROUND_ZERO) round = ROUND_EVEN; + else round = ROUND_UP; + } + } + + if (!found_digit) + { + if(end) *end = (char*)p - 2; + return 0.0; + } + + if(*p=='p' || *p=='P') { + int e=0, s=1; + + p++; + if(*p == '-') { + s = -1; + p++; + } else if(*p == '+') + p++; + + if(*p>='0' && *p<='9') { + while(*p>='0' && *p<='9') { + if(e>INT_MAX/10 || (e=e*10+*p-'0')<0) + e = INT_MAX; + p++; + } + e *= s; + + if(exp<0 && e<0 && exp+e>=0) exp = INT_MIN; + else if(exp>0 && e>0 && exp+e<0) exp = INT_MAX; + else exp += e; + } else { + if(*p=='-' || *p=='+') + p--; + p--; + } + } + + if (end) *end = (char*)p; + return make_double(sign, exp, m, round, err); +} +#endif + static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale, int *err) { MSVCRT_pthreadlocinfo locinfo; @@ -335,7 +550,6 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale double ret; long double lret=1, expcnt = 10; BOOL found_digit = FALSE, negexp; - int base = 10; if(err) *err = 0; @@ -379,33 +593,22 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale return NAN; } - if(p[0] == '0' && MSVCRT__tolower_l(p[1], locale) == 'x') { - base = 16; - expcnt = 2; + if(p[0] == '0' && (p[1] == 'x' || p[1] == 'X')) { p += 2; + return strtod16(sign, p, end, locinfo, err); } #endif - while((*p>='0' && *p<='9') || - (base == 16 && ((*p >= 'a' && *p <= 'f') || (*p >= 'A' && *p <= 'F')))) { - char c = *p++; - int val; + while(*p>='0' && *p<='9') { found_digit = TRUE; - if (c>='0' && c<='9') - val = c - '0'; - else if (c >= 'a' && c <= 'f') - val = 10 + c - 'a'; - else - val = 10 + c - 'A'; - hlp = d*base+val; - if(d>MSVCRT_UI64_MAX/base || hlp<d) { + hlp = d * 10 + *p++ - '0'; + if(d>MSVCRT_UI64_MAX/10 || hlp<d) { exp++; break; } else d = hlp; } - while((*p>='0' && *p<='9') || - (base == 16 && ((*p >= 'a' && *p <= 'f') || (*p >= 'A' && *p <= 'F')))) { + while(*p>='0' && *p<='9') { exp++; p++; } @@ -413,25 +616,15 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale if(*p == *locinfo->lconv->decimal_point) p++; - while((*p>='0' && *p<='9') || - (base == 16 && ((*p >= 'a' && *p <= 'f') || (*p >= 'A' && *p <= 'F')))) { - char c = *p++; - int val; + while(*p>='0' && *p<='9') { found_digit = TRUE; - if (c>='0' && c<='9') - val = c - '0'; - else if (c >= 'a' && c <= 'f') - val = 10 + c - 'a'; - else - val = 10 + c - 'A'; - hlp = d*base+val; - if(d>MSVCRT_UI64_MAX/base || hlp<d) + hlp = d * 10 + *p++ - '0'; + if(d>MSVCRT_UI64_MAX/10 || hlp<d) break; d = hlp; exp--; } - while((*p>='0' && *p<='9') || - (base == 16 && ((*p >= 'a' && *p <= 'f') || (*p >= 'A' && *p <= 'F')))) + while(*p>='0' && *p<='9') p++; if(!found_digit) { @@ -440,11 +633,7 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale return 0.0; } - if(base == 16) - exp *= 4; - - if((base == 10 && (*p=='e' || *p=='E' || *p=='d' || *p=='D')) || - (base == 16 && (*p=='p' || *p=='P'))) { + if(*p=='e' || *p=='E' || *p=='d' || *p=='D') { int e=0, s=1; p++; diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index e4146c6fc4..bfa602c538 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -125,9 +125,9 @@ static void _test_strtod_str(int line, const char* string, double value, int len double d; d = p_strtod(string, &end); if (local_isnan(value)) - ok_(__FILE__, line)(local_isnan(d), "d = %lf (\"%s\")\n", d, string); + ok_(__FILE__, line)(local_isnan(d), "d = %.16le (\"%s\")\n", d, string); else - ok_(__FILE__, line)(d == value, "d = %lf (\"%s\")\n", d, string); + ok_(__FILE__, line)(d == value, "d = %.16le (\"%s\")\n", d, string); ok_(__FILE__, line)(end == string + length, "incorrect end (%d, \"%s\")\n", (int)(end - string), string); } @@ -162,6 +162,17 @@ static void test_strtod(void) test_strtod_str("0x1.1p1", 2.125, 7); test_strtod_str("0x1.A", 1.625, 5); test_strtod_str("0x1p1a", 2, 5); + test_strtod_str("0xp3", 0, 1); + test_strtod_str("0x.", 0, 1); + test_strtod_str("0x.8", 0.5, 4); + test_strtod_str("0x.8p", 0.5, 4); + test_strtod_str("0x0p10000000000000000000000000", 0, 30); + test_strtod_str("0x1p-1026", 1.3906711615670009e-309, 9); + + test_strtod_str("0x1ffffffffffffe.80000000000000000000", 9007199254740990.0, 37); + test_strtod_str("0x1ffffffffffffe.80000000000000000001", 9007199254740991.0, 37); + test_strtod_str("0x1fffffffffffff.80000000000000000000", 9007199254740992.0, 37); + test_strtod_str("0x1fffffffffffff.80000000000000000001", 9007199254740992.0, 37); } static void test__memicmp(void)

1 0

Zebediah Figura : quartz/tests: Fix an invalid free.
by Alexandre Julliard 22 Nov '19

22 Nov '19

Module: wine Branch: master Commit: b909b2c5cf5f43ad204ee874a30cafcf0815e490 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b909b2c5cf5f43ad204ee874… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 22 10:21:32 2019 -0600 quartz/tests: Fix an invalid free. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index d0ae25a969..c5a455afb2 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1340,6 +1340,7 @@ static void test_connect_pin(void) IFilterGraph2_AddFilter(graph, filter, NULL); IBaseFilter_FindPin(filter, L"VMR Input0", &pin); + IPin_QueryInterface(pin, &IID_IMemInputPin, (void **)&input); for (i = 0; i < ARRAY_SIZE(subtype_tests); ++i) { @@ -1411,8 +1412,6 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); - IPin_QueryInterface(pin, &IID_IMemInputPin, (void **)&input); - test_allocator(input); hr = IMemInputPin_GetAllocator(input, &allocator);

1 0

Alistair Leslie-Hughes : dmloader: Stop after find first matching object.
by Alexandre Julliard 22 Nov '19

22 Nov '19

Module: wine Branch: master Commit: 4aee9ba5ad1c7df34a06fe2bbe39ae33fd8ffcee URL: https://source.winehq.org/git/wine.git/?a=commit;h=4aee9ba5ad1c7df34a06fe2b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 22 08:22:35 2019 +0000 dmloader: Stop after find first matching object. This stops a crash in Legoland on startup when finding cached objects. Placing a break in each of the if's causes the wrong object to be loaded. The help states it looks at each type in order. So, we might have to loop the cache multiple times to ensure that when an object has flag DMUS_OBJ_OBJECT, it's preferred over a DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH match. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/loader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 0da8323e7e..69a438765d 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -208,6 +208,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_GetObject(IDirectMusicLoader8 *ifac TRACE(": not loaded yet\n"); pObjectEntry = pExistingEntry; } + break; } else if ((pDesc->dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) && (pExistingEntry->Desc.dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) &&

1 0

Zebediah Figura : quartz/videorenderer: Make VideoRenderer_SendSampleData() infallible.
by Alexandre Julliard 22 Nov '19

22 Nov '19

Module: wine Branch: master Commit: 608acdc83ad44db1ec9301d48695d3ce24fcfd91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=608acdc83ad44db1ec9301d4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 21 18:11:22 2019 -0600 quartz/videorenderer: Make VideoRenderer_SendSampleData() infallible. We already rejected any other format types when connecting. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index b71d15a5d2..e38a773239 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -134,7 +134,7 @@ static void VideoRenderer_AutoShowWindow(VideoRendererImpl *This) ShowWindow(This->baseControlWindow.baseWindow.hWnd, SW_SHOW); } -static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, DWORD size) +static void VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, DWORD size) { const AM_MEDIA_TYPE *amt = &This->renderer.sink.pin.mt; BITMAPINFOHEADER *bmiHeader; @@ -150,11 +150,6 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, { bmiHeader = &((VIDEOINFOHEADER2 *)amt->pbFormat)->bmiHeader; } - else - { - FIXME("Unknown subtype %s.\n", debugstr_guid(&amt->subtype)); - return VFW_E_RUNTIME_ERROR; - } TRACE("Src Rect: %s\n", wine_dbgstr_rect(&This->SourceRect)); TRACE("Dst Rect: %s\n", wine_dbgstr_rect(&This->DestRect)); @@ -165,8 +160,6 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, This->SourceRect.right - This->SourceRect.left, This->SourceRect.bottom - This->SourceRect.top, data, (BITMAPINFO *)bmiHeader, DIB_RGB_COLORS, SRCCOPY); ReleaseDC(This->baseControlWindow.baseWindow.hWnd, dc); - - return S_OK; } static HRESULT WINAPI VideoRenderer_ShouldDrawSampleNow(struct strmbase_renderer *filter,

1 0

Zebediah Figura : strmbase/renderer: Exit BaseRendererImpl_Receive() immediately if flush_event was signaled.
by Alexandre Julliard 22 Nov '19

22 Nov '19

Module: wine Branch: master Commit: 6072c66c5a42800a8624ea550fe1308cb27cfa4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6072c66c5a42800a8624ea55… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 21 18:11:23 2019 -0600 strmbase/renderer: Exit BaseRendererImpl_Receive() immediately if flush_event was signaled. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 0c33b5ea84..aa134ba5da 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -394,15 +394,22 @@ HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *This, IMediaSa if (now - This->stream_start - start <= -10000) { HANDLE handles[2] = {This->advise_event, This->flush_event}; + DWORD ret; IReferenceClock_AdviseTime(This->filter.pClock, This->stream_start, start, (HEVENT)This->advise_event, &cookie); LeaveCriticalSection(&This->csRenderLock); - WaitForMultipleObjects(2, handles, FALSE, INFINITE); + ret = WaitForMultipleObjects(2, handles, FALSE, INFINITE); IReferenceClock_Unadvise(This->filter.pClock, cookie); + if (ret == 1) + { + TRACE("Flush signaled, discarding current sample.\n"); + return S_OK; + } + EnterCriticalSection(&This->csRenderLock); } }

1 0

Zebediah Figura : quartz/videorenderer: Get rid of filter state checks in VideoRenderer_DoRenderSample().
by Alexandre Julliard 22 Nov '19

22 Nov '19

Module: wine Branch: master Commit: 0af834681ca30fd77aa6b37f9afabffb961e37da URL: https://source.winehq.org/git/wine.git/?a=commit;h=0af834681ca30fd77aa6b37f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 21 18:11:24 2019 -0600 quartz/videorenderer: Get rid of filter state checks in VideoRenderer_DoRenderSample(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 65 ++++++++++++++------------------------------- 1 file changed, 20 insertions(+), 45 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index e38a773239..bc5791dd5c 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -134,34 +134,6 @@ static void VideoRenderer_AutoShowWindow(VideoRendererImpl *This) ShowWindow(This->baseControlWindow.baseWindow.hWnd, SW_SHOW); } -static void VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, DWORD size) -{ - const AM_MEDIA_TYPE *amt = &This->renderer.sink.pin.mt; - BITMAPINFOHEADER *bmiHeader; - HDC dc; - - TRACE("(%p)->(%p, %d)\n", This, data, size); - - if (IsEqualGUID(&amt->formattype, &FORMAT_VideoInfo)) - { - bmiHeader = &((VIDEOINFOHEADER *)amt->pbFormat)->bmiHeader; - } - else if (IsEqualGUID(&amt->formattype, &FORMAT_VideoInfo2)) - { - bmiHeader = &((VIDEOINFOHEADER2 *)amt->pbFormat)->bmiHeader; - } - - TRACE("Src Rect: %s\n", wine_dbgstr_rect(&This->SourceRect)); - TRACE("Dst Rect: %s\n", wine_dbgstr_rect(&This->DestRect)); - - dc = GetDC(This->baseControlWindow.baseWindow.hWnd); - StretchDIBits(dc, This->DestRect.left, This->DestRect.top, This->DestRect.right -This->DestRect.left, - This->DestRect.bottom - This->DestRect.top, This->SourceRect.left, This->SourceRect.top, - This->SourceRect.right - This->SourceRect.left, This->SourceRect.bottom - This->SourceRect.top, - data, (BITMAPINFO *)bmiHeader, DIB_RGB_COLORS, SRCCOPY); - ReleaseDC(This->baseControlWindow.baseWindow.hWnd, dc); -} - static HRESULT WINAPI VideoRenderer_ShouldDrawSampleNow(struct strmbase_renderer *filter, IMediaSample *pSample, REFERENCE_TIME *start, REFERENCE_TIME *end) { @@ -173,12 +145,15 @@ static HRESULT WINAPI VideoRenderer_ShouldDrawSampleNow(struct strmbase_renderer static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *pSample) { - VideoRendererImpl *This = impl_from_strmbase_renderer(iface); + VideoRendererImpl *filter = impl_from_strmbase_renderer(iface); + const AM_MEDIA_TYPE *mt = &filter->renderer.sink.pin.mt; LPBYTE pbSrcStream = NULL; + BITMAPINFOHEADER *bih; LONG cbSrcStream = 0; HRESULT hr; + HDC dc; - TRACE("(%p)->(%p)\n", This, pSample); + TRACE("filter %p, sample %p.\n", filter, pSample); hr = IMediaSample_GetPointer(pSample, &pbSrcStream); if (FAILED(hr)) @@ -204,21 +179,21 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa } #endif - if (This->renderer.filter.state == State_Paused) - { - VideoRenderer_SendSampleData(This, pbSrcStream, cbSrcStream); - if (This->renderer.filter.state == State_Paused) - { - /* Flushing */ - return S_OK; - } - if (This->renderer.filter.state == State_Stopped) - { - return VFW_E_WRONG_STATE; - } - } else { - VideoRenderer_SendSampleData(This, pbSrcStream, cbSrcStream); - } + if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) + bih = &((VIDEOINFOHEADER *)mt->pbFormat)->bmiHeader; + else + bih = &((VIDEOINFOHEADER2 *)mt->pbFormat)->bmiHeader; + + dc = GetDC(filter->baseControlWindow.baseWindow.hWnd); + StretchDIBits(dc, filter->DestRect.left, filter->DestRect.top, + filter->DestRect.right - filter->DestRect.left, + filter->DestRect.bottom - filter->DestRect.top, + filter->SourceRect.left, filter->SourceRect.top, + filter->SourceRect.right - filter->SourceRect.left, + filter->SourceRect.bottom - filter->SourceRect.top, + pbSrcStream, (BITMAPINFO *)bih, DIB_RGB_COLORS, SRCCOPY); + ReleaseDC(filter->baseControlWindow.baseWindow.hWnd, dc); + return S_OK; }

1 0

Zebediah Figura : quartz/videorenderer: Remove some dead code.
by Alexandre Julliard 22 Nov '19

22 Nov '19

Module: wine Branch: master Commit: b78dcbf269eedf91bad53ff4dea23d2223748c1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b78dcbf269eedf91bad53ff4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 21 18:11:25 2019 -0600 quartz/videorenderer: Remove some dead code. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index bc5791dd5c..db889bb661 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -149,7 +149,6 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa const AM_MEDIA_TYPE *mt = &filter->renderer.sink.pin.mt; LPBYTE pbSrcStream = NULL; BITMAPINFOHEADER *bih; - LONG cbSrcStream = 0; HRESULT hr; HDC dc; @@ -162,23 +161,6 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa return hr; } - cbSrcStream = IMediaSample_GetActualDataLength(pSample); - - TRACE("val %p %d\n", pbSrcStream, cbSrcStream); - -#if 0 /* For debugging purpose */ - { - int i; - for(i = 0; i < cbSrcStream; i++) - { - if ((i!=0) && !(i%16)) - TRACE("\n"); - TRACE("%02x ", pbSrcStream[i]); - } - TRACE("\n"); - } -#endif - if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) bih = &((VIDEOINFOHEADER *)mt->pbFormat)->bmiHeader; else

1 0

Zebediah Figura : quartz/videorenderer: Wait in Receive() while paused.
by Alexandre Julliard 22 Nov '19

22 Nov '19

Module: wine Branch: master Commit: 6014c0a99784ce7948f0504caa9f63a8eee2eb70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6014c0a99784ce7948f0504c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 21 18:11:26 2019 -0600 quartz/videorenderer: Wait in Receive() while paused. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 10 +++++----- dlls/quartz/videorenderer.c | 25 ++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index e7c0e15edd..046d94b0b8 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -744,7 +744,7 @@ static void test_filter_state(IMemInputPin *input, IFilterGraph2 *graph) hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -777,7 +777,7 @@ static void test_filter_state(IMemInputPin *input, IFilterGraph2 *graph) hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IMediaControl_Run(control); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -803,7 +803,7 @@ static void test_filter_state(IMemInputPin *input, IFilterGraph2 *graph) hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IMediaControl_Run(control); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -868,7 +868,7 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) ok(hr == S_FALSE, "Got hr %#x.\n", hr); thread = send_frame(input); - todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IMediaControl_GetState(control, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -892,7 +892,7 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); thread = send_frame(input); - todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IMediaControl_Run(control); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index db889bb661..bd228277cb 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -54,6 +54,8 @@ typedef struct VideoRendererImpl LONG FullScreenMode; DWORD saved_style; + + HANDLE run_event; } VideoRendererImpl; static inline VideoRendererImpl *impl_from_BaseWindow(BaseWindow *iface) @@ -176,6 +178,15 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa pbSrcStream, (BITMAPINFO *)bih, DIB_RGB_COLORS, SRCCOPY); ReleaseDC(filter->baseControlWindow.baseWindow.hWnd, dc); + if (filter->renderer.filter.state == State_Paused) + { + const HANDLE events[2] = {filter->run_event, filter->renderer.flush_event}; + + LeaveCriticalSection(&filter->renderer.csRenderLock); + WaitForMultipleObjects(2, events, FALSE, INFINITE); + EnterCriticalSection(&filter->renderer.csRenderLock); + } + return S_OK; } @@ -234,7 +245,7 @@ static void video_renderer_destroy(struct strmbase_renderer *iface) BaseControlWindow_Destroy(&filter->baseControlWindow); BaseControlVideo_Destroy(&filter->baseControlVideo); - + CloseHandle(filter->run_event); strmbase_renderer_cleanup(&filter->renderer); CoTaskMemFree(filter); } @@ -267,6 +278,13 @@ static HRESULT video_renderer_pin_query_interface(struct strmbase_renderer *ifac return S_OK; } +static void video_renderer_start_stream(struct strmbase_renderer *iface) +{ + VideoRendererImpl *filter = impl_from_strmbase_renderer(iface); + + SetEvent(filter->run_event); +} + static void video_renderer_stop_stream(struct strmbase_renderer *iface) { VideoRendererImpl *This = impl_from_strmbase_renderer(iface); @@ -276,6 +294,8 @@ static void video_renderer_stop_stream(struct strmbase_renderer *iface) if (This->baseControlWindow.AutoShow) /* Black it out */ RedrawWindow(This->baseControlWindow.baseWindow.hWnd, NULL, NULL, RDW_INVALIDATE|RDW_ERASE); + + ResetEvent(This->run_event); } static void video_renderer_init_stream(struct strmbase_renderer *iface) @@ -315,6 +335,7 @@ static const struct strmbase_renderer_ops renderer_ops = .pfnCheckMediaType = VideoRenderer_CheckMediaType, .pfnDoRenderSample = VideoRenderer_DoRenderSample, .renderer_init_stream = video_renderer_init_stream, + .renderer_start_stream = video_renderer_start_stream, .renderer_stop_stream = video_renderer_stop_stream, .pfnShouldDrawSampleNow = VideoRenderer_ShouldDrawSampleNow, .renderer_destroy = video_renderer_destroy, @@ -722,6 +743,8 @@ HRESULT VideoRenderer_create(IUnknown *outer, void **out) if (FAILED(hr = BaseWindowImpl_PrepareWindow(&pVideoRenderer->baseControlWindow.baseWindow))) goto fail; + pVideoRenderer->run_event = CreateEventW(NULL, TRUE, FALSE, NULL); + *out = &pVideoRenderer->renderer.filter.IUnknown_inner; return S_OK;

1 0