wine-commits December 2015

wine-commits@winehq.org

2 participants
327 discussions

Hans Leidekker : wbemprox: Implement Win32_NetworkAdapterConfiguration.DefaultIPGateway.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: ee81036a16dc6d0c1ab49c28d9b0810066221971 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee81036a16dc6d0c1ab49c28d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 23 11:07:38 2015 +0100 wbemprox: Implement Win32_NetworkAdapterConfiguration.DefaultIPGateway. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 53 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 8 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 8642e3f..345437d 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -165,6 +165,8 @@ static const WCHAR prop_currentverticalresW[] = {'C','u','r','r','e','n','t','V','e','r','t','i','c','a','l','R','e','s','o','l','u','t','i','o','n',0}; static const WCHAR prop_datawidthW[] = {'D','a','t','a','W','i','d','t','h',0}; +static const WCHAR prop_defaultipgatewayW[] = + {'D','e','f','a','u','l','t','I','P','G','a','t','e','w','a','y',0}; static const WCHAR prop_defaultvalueW[] = {'D','e','f','a','u','l','t','V','a','l','u','e',0}; static const WCHAR prop_descriptionW[] = @@ -471,6 +473,7 @@ static const struct column col_networkadapter[] = }; static const struct column col_networkadapterconfig[] = { + { prop_defaultipgatewayW, CIM_STRING|CIM_FLAG_ARRAY|COL_FLAG_DYNAMIC }, { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_dnshostnameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_indexW, CIM_UINT32|COL_FLAG_KEY, VT_I4 }, @@ -862,12 +865,13 @@ struct record_networkadapter }; struct record_networkadapterconfig { - const WCHAR *description; - const WCHAR *dnshostname; - UINT32 index; - UINT32 ipconnectionmetric; - int ipenabled; - const WCHAR *mac_address; + const struct array *defaultipgateway; + const WCHAR *description; + const WCHAR *dnshostname; + UINT32 index; + UINT32 ipconnectionmetric; + int ipenabled; + const WCHAR *mac_address; }; struct record_operatingsystem { @@ -2112,6 +2116,38 @@ static WCHAR *get_dnshostname( IP_ADAPTER_UNICAST_ADDRESS *addr ) 0, NI_NAMEREQD )) return NULL; return heap_strdupW( buf ); } +static struct array *get_defaultipgateway( IP_ADAPTER_GATEWAY_ADDRESS *list ) +{ + IP_ADAPTER_GATEWAY_ADDRESS *gateway; + struct array *ret; + ULONG buflen, i = 0, count = 0; + WCHAR **ptr, buf[54]; /* max IPv6 address length */ + + if (!list) return NULL; + for (gateway = list; gateway; gateway = gateway->Next) count++; + + if (!(ret = heap_alloc( sizeof(*ret) ))) return NULL; + if (!(ptr = heap_alloc( sizeof(*ptr) * count ))) + { + heap_free( ret ); + return NULL; + } + for (gateway = list; gateway; gateway = gateway->Next) + { + buflen = sizeof(buf)/sizeof(buf[0]); + if (WSAAddressToStringW( gateway->Address.lpSockaddr, gateway->Address.iSockaddrLength, + NULL, buf, &buflen) || !(ptr[i++] = heap_strdupW( buf ))) + { + for (; i > 0; i--) heap_free( ptr[i - 1] ); + heap_free( ptr ); + heap_free( ret ); + return NULL; + } + } + ret->count = count; + ret->ptr = ptr; + return ret; +} static enum fill_status fill_networkadapterconfig( struct table *table, const struct expr *cond ) { @@ -2121,11 +2157,11 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st DWORD size = 0, ret; enum fill_status status = FILL_STATUS_UNFILTERED; - ret = GetAdaptersAddresses( AF_UNSPEC, 0, NULL, NULL, &size ); + ret = GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, NULL, NULL, &size ); if (ret != ERROR_BUFFER_OVERFLOW) return FILL_STATUS_FAILED; if (!(buffer = heap_alloc( size ))) return FILL_STATUS_FAILED; - if (GetAdaptersAddresses( AF_UNSPEC, 0, NULL, buffer, &size )) + if (GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, NULL, buffer, &size )) { heap_free( buffer ); return FILL_STATUS_FAILED; @@ -2144,6 +2180,7 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st if (aa->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue; rec = (struct record_networkadapterconfig *)(table->data + offset); + rec->defaultipgateway = get_defaultipgateway( aa->FirstGatewayAddress ); rec->description = heap_strdupW( aa->Description ); rec->dnshostname = get_dnshostname( aa->FirstUnicastAddress ); rec->index = aa->u.s.IfIndex;

1 0

Hans Leidekker : wbemprox: Implement Win32_NetworkAdapterConfiguration.Description.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 9982b16837397cdacabb87823c6586936994afe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9982b16837397cdacabb87823… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 23 11:07:37 2015 +0100 wbemprox: Implement Win32_NetworkAdapterConfiguration.Description. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index b7db266..8642e3f 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -471,6 +471,7 @@ static const struct column col_networkadapter[] = }; static const struct column col_networkadapterconfig[] = { + { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_dnshostnameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_indexW, CIM_UINT32|COL_FLAG_KEY, VT_I4 }, { prop_ipconnectionmetricW, CIM_UINT32, VT_I4 }, @@ -861,6 +862,7 @@ struct record_networkadapter }; struct record_networkadapterconfig { + const WCHAR *description; const WCHAR *dnshostname; UINT32 index; UINT32 ipconnectionmetric; @@ -2142,6 +2144,7 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st if (aa->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue; rec = (struct record_networkadapterconfig *)(table->data + offset); + rec->description = heap_strdupW( aa->Description ); rec->dnshostname = get_dnshostname( aa->FirstUnicastAddress ); rec->index = aa->u.s.IfIndex; rec->ipconnectionmetric = 20;

1 0

Hans Leidekker : wbemprox: Support string literals in comparisons with integer properties.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: df42519cb220877783b8be753660358c951efa27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df42519cb220877783b8be753… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 23 11:07:36 2015 +0100 wbemprox: Support string literals in comparisons with integer properties. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/query.c | 74 +++++++++++++++++++++++++++++++++++++++++---- dlls/wbemprox/tests/query.c | 7 ++++- dlls/wbemprox/wql.y | 12 +++----- 3 files changed, 79 insertions(+), 14 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index f01155a..7fedf89 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -108,10 +108,31 @@ static HRESULT eval_strcmp( UINT op, const WCHAR *lstr, const WCHAR *rstr, LONGL return S_OK; } -static inline BOOL is_strcmp( const struct complex_expr *expr ) +static BOOL is_int( CIMTYPE type ) { - return ((expr->left->type == EXPR_PROPVAL && expr->right->type == EXPR_SVAL) || - (expr->left->type == EXPR_SVAL && expr->right->type == EXPR_PROPVAL)); + switch (type) + { + case CIM_SINT8: + case CIM_SINT16: + case CIM_SINT32: + case CIM_SINT64: + case CIM_UINT8: + case CIM_UINT16: + case CIM_UINT32: + case CIM_UINT64: + return TRUE; + default: + return FALSE; + } +} + +static inline BOOL is_strcmp( const struct complex_expr *expr, UINT ltype, UINT rtype ) +{ + if ((ltype == CIM_STRING || is_int( ltype )) && expr->left->type == EXPR_PROPVAL && + expr->right->type == EXPR_SVAL) return TRUE; + else if ((rtype == CIM_STRING || is_int( rtype )) && expr->right->type == EXPR_PROPVAL && + expr->left->type == EXPR_SVAL) return TRUE; + return FALSE; } static inline BOOL is_boolcmp( const struct complex_expr *expr, UINT ltype, UINT rtype ) @@ -186,6 +207,41 @@ static UINT resolve_type( UINT left, UINT right ) return CIM_ILLEGAL; } +static const WCHAR *format_int( WCHAR *buf, CIMTYPE type, LONGLONG val ) +{ + static const WCHAR fmt_signedW[] = {'%','d',0}; + static const WCHAR fmt_unsignedW[] = {'%','u',0}; + static const WCHAR fmt_signed64W[] = {'%','I','6','4','d',0}; + static const WCHAR fmt_unsigned64W[] = {'%','I','6','4','u',0}; + + switch (type) + { + case CIM_SINT8: + case CIM_SINT16: + case CIM_SINT32: + sprintfW( buf, fmt_signedW, val ); + return buf; + + case CIM_UINT8: + case CIM_UINT16: + case CIM_UINT32: + sprintfW( buf, fmt_unsignedW, val ); + return buf; + + case CIM_SINT64: + wsprintfW( buf, fmt_signed64W, val ); + return buf; + + case CIM_UINT64: + wsprintfW( buf, fmt_unsigned64W, val ); + return buf; + + default: + ERR( "unhandled type %u\n", type ); + return NULL; + } +} + static HRESULT eval_binary( const struct table *table, UINT row, const struct complex_expr *expr, LONGLONG *val, UINT *type ) { @@ -202,10 +258,16 @@ static HRESULT eval_binary( const struct table *table, UINT row, const struct co if (is_boolcmp( expr, ltype, rtype )) return eval_boolcmp( expr->op, lval, rval, ltype, rtype, val ); - if (is_strcmp( expr )) + if (is_strcmp( expr, ltype, rtype )) { - const WCHAR *lstr = (const WCHAR *)(INT_PTR)lval; - const WCHAR *rstr = (const WCHAR *)(INT_PTR)rval; + const WCHAR *lstr, *rstr; + WCHAR lbuf[21], rbuf[21]; + + if (is_int( ltype )) lstr = format_int( lbuf, ltype, lval ); + else lstr = (const WCHAR *)(INT_PTR)lval; + + if (is_int( rtype )) rstr = format_int( rbuf, ltype, rval ); + else rstr = (const WCHAR *)(INT_PTR)rval; return eval_strcmp( expr->op, lstr, rstr, val ); } diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 3138c7a..9dc0db4 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -102,7 +102,12 @@ static void test_select( IWbemServices *services ) {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', 'P','r','o','c','e','s','s',' ','W','H','E','R','E',' ','C','a','p','t','i','o','n',' ', 'L','I','K','E',' ','"','%','f','i','r','e','f','o','x','.','e','x','e','"',0}; - static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7, query8, query9, query10 }; + static const WCHAR query11[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + 'W','i','n','3','2','_','V','i','d','e','o','C','o','n','t','r','o','l','l','e','r',' ','w','h','e','r','e',' ', + 'a','v','a','i','l','a','b','i','l','i','t','y',' ','=',' ','\'','3','\'',0}; + static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7, query8, query9, query10, + query11 }; HRESULT hr; IEnumWbemClassObject *result; BSTR wql = SysAllocString( wqlW ); diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index 734c4da..98b0378 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -647,15 +647,13 @@ static int get_token( const WCHAR *s, int *token ) return 1; case '\"': case '\'': + for (i = 1; s[i]; i++) { - for (i = 1; s[i]; i++) - { - if (s[i] == s[0]) break; - } - if (s[i]) i++; - *token = TK_STRING; - return i; + if (s[i] == s[0]) break; } + if (s[i]) i++; + *token = TK_STRING; + return i; case '.': if (!isdigitW( s[1] )) {

1 0

Hans Leidekker : wbemdisp: Calculate the object count returned from ISWbemObjectSet:: get_Count just once.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 4cce8cbd5f300edc59bc0d79fea5ee1f662b13df URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cce8cbd5f300edc59bc0d79f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 23 11:06:57 2015 +0100 wbemdisp: Calculate the object count returned from ISWbemObjectSet::get_Count just once. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 3465eb1..d1f2609 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -356,6 +356,7 @@ struct objectset ISWbemObjectSet ISWbemObjectSet_iface; LONG refs; IEnumWbemClassObject *objectenum; + LONG count; }; static inline struct objectset *impl_from_ISWbemObjectSet( @@ -517,20 +518,10 @@ static HRESULT WINAPI objectset_get_Count( LONG *iCount ) { struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); - LONG count = 0, total = 0; TRACE( "%p, %p\n", objectset, iCount ); - while (IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, 1 ) == S_OK) count++; - - IEnumWbemClassObject_Reset( objectset->objectenum ); - while (IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, 1 ) == S_OK) total++; - - count = total - count; - IEnumWbemClassObject_Reset( objectset->objectenum ); - while (count--) IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, 1 ); - - *iCount = total; + *iCount = objectset->count; return S_OK; } @@ -567,6 +558,14 @@ static const ISWbemObjectSetVtbl objectset_vtbl = objectset_ItemIndex }; +static LONG get_object_count( IEnumWbemClassObject *iter ) +{ + LONG count = 0; + while (IEnumWbemClassObject_Skip( iter, WBEM_INFINITE, 1 ) == S_OK) count++; + IEnumWbemClassObject_Reset( iter ); + return count; +} + static HRESULT SWbemObjectSet_create( IEnumWbemClassObject *wbem_objectenum, ISWbemObjectSet **obj ) { struct objectset *objectset; @@ -578,6 +577,7 @@ static HRESULT SWbemObjectSet_create( IEnumWbemClassObject *wbem_objectenum, ISW objectset->refs = 1; objectset->objectenum = wbem_objectenum; IEnumWbemClassObject_AddRef( objectset->objectenum ); + objectset->count = get_object_count( objectset->objectenum ); *obj = &objectset->ISWbemObjectSet_iface; TRACE( "returning iface %p\n", *obj );

1 0

Hans Leidekker : winhttp: Don' t drain content until authorization is handled successfully.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: d3f7519035966dc07d71599262f27e2775411fe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3f7519035966dc07d7159926… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 23 11:06:01 2015 +0100 winhttp: Don't drain content until authorization is handled successfully. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 4 ++-- dlls/winhttp/tests/winhttp.c | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 79a319a..b2b72c7 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2421,8 +2421,8 @@ static BOOL receive_response( request_t *request, BOOL async ) { if (request->hdr.disable_flags & WINHTTP_DISABLE_AUTHENTICATION) break; - drain_content( request ); if (!handle_authorization( request, status )) break; + drain_content( request ); /* recurse synchronously */ if ((ret = send_request( request, NULL, 0, request->optional, request->optional_len, 0, 0, FALSE ))) continue; @@ -3062,7 +3062,7 @@ static HRESULT WINAPI winhttp_request_SetCredentials( DWORD target, scheme = WINHTTP_AUTH_SCHEME_BASIC; /* FIXME: query supported schemes */ DWORD err = ERROR_SUCCESS; - TRACE("%p, %s, %p\n", request, debugstr_w(username), password); + TRACE("%p, %s, %p, 0x%08x\n", request, debugstr_w(username), password, flags); EnterCriticalSection( &request->cs ); if (request->state < REQUEST_STATE_OPEN) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 9442085..d676dd8 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2317,9 +2317,7 @@ static void test_basic_authentication(int port) ok(ret || broken(error == ERROR_WINHTTP_SHUTDOWN || error == ERROR_WINHTTP_TIMEOUT) /* XP */, "failed to read data %u\n", GetLastError()); if (ret) { -todo_wine ok(size == 12, "expected 12, got %u\n", size); -todo_wine ok(!memcmp(buffer, unauthorized, 12), "got %s\n", buffer); } @@ -3651,7 +3649,6 @@ static void test_IWinHttpRequest(int port) hr = IWinHttpRequest_get_ResponseText( req, &response ); ok( hr == S_OK, "got %08x\n", hr ); -todo_wine ok( !memcmp( response, unauthW, sizeof(unauthW) ), "got %s\n", wine_dbgstr_w(response) ); SysFreeString( response );

1 0

Hans Leidekker : dnsapi: Add a stub implementation of DnsFlushResolverCacheEntry_A/UTF8/W.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: e10c48143aadc9fbec7677847d3d9eab66bf441f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e10c48143aadc9fbec7677847… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 23 11:05:30 2015 +0100 dnsapi: Add a stub implementation of DnsFlushResolverCacheEntry_A/UTF8/W. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/dnsapi.spec | 6 +++--- dlls/dnsapi/main.c | 32 ++++++++++++++++++++++++++++++++ dlls/dnsapi/tests/name.c | 21 +++++++++++++++++++++ 3 files changed, 56 insertions(+), 3 deletions(-) diff --git a/dlls/dnsapi/dnsapi.spec b/dlls/dnsapi/dnsapi.spec index 4f6f1c8..de0ed1d 100644 --- a/dlls/dnsapi/dnsapi.spec +++ b/dlls/dnsapi/dnsapi.spec @@ -32,9 +32,9 @@ @ stdcall DnsExtractRecordsFromMessage_W(ptr long ptr) @ stub DnsFindAuthoritativeZone @ stdcall DnsFlushResolverCache() -@ stub DnsFlushResolverCacheEntry_A -@ stub DnsFlushResolverCacheEntry_UTF8 -@ stub DnsFlushResolverCacheEntry_W +@ stdcall DnsFlushResolverCacheEntry_A(str) +@ stdcall DnsFlushResolverCacheEntry_UTF8(str) +@ stdcall DnsFlushResolverCacheEntry_W(wstr) @ stdcall DnsFree(ptr long) @ stub DnsFreeAdapterInformation @ stub DnsFreeNetworkInformation diff --git a/dlls/dnsapi/main.c b/dlls/dnsapi/main.c index d4f716a..93528a2 100644 --- a/dlls/dnsapi/main.c +++ b/dlls/dnsapi/main.c @@ -93,6 +93,38 @@ VOID WINAPI DnsFlushResolverCache(void) FIXME(": stub\n"); } +/****************************************************************************** + * DnsFlushResolverCacheEntry_A [DNSAPI.@] + * + */ +BOOL WINAPI DnsFlushResolverCacheEntry_A( PCSTR entry ) +{ + FIXME( "%s: stub\n", debugstr_a(entry) ); + if (!entry) return FALSE; + return TRUE; +} + +/****************************************************************************** + * DnsFlushResolverCacheEntry_UTF8 [DNSAPI.@] + * + */ +BOOL WINAPI DnsFlushResolverCacheEntry_UTF8( PCSTR entry ) +{ + FIXME( "%s: stub\n", debugstr_a(entry) ); + if (!entry) return FALSE; + return TRUE; +} + +/****************************************************************************** + * DnsFlushResolverCacheEntry_W [DNSAPI.@] + * + */ +BOOL WINAPI DnsFlushResolverCacheEntry_W( PCWSTR entry ) +{ + FIXME( "%s: stub\n", debugstr_w(entry) ); + if (!entry) return FALSE; + return TRUE; +} /****************************************************************************** * DnsReleaseContextHandle [DNSAPI.@] diff --git a/dlls/dnsapi/tests/name.c b/dlls/dnsapi/tests/name.c index fba6955..3e54355 100644 --- a/dlls/dnsapi/tests/name.c +++ b/dlls/dnsapi/tests/name.c @@ -27,6 +27,8 @@ #include "wine/test.h" +BOOL WINAPI DnsFlushResolverCacheEntry_A(PCSTR); + static const struct { LPCSTR name; @@ -202,8 +204,27 @@ static void test_DnsNameCompare_A( void ) ok( DnsNameCompare_A( a_dot_b, b_dot_a_dot ) == FALSE, "succeeded unexpectedly\n" ); } +static void test_DnsFlushResolverCacheEntry_A(void) +{ + BOOL ret; + DWORD err; + + SetLastError( 0xdeadbeef ); + ret = DnsFlushResolverCacheEntry_A( NULL ); + err = GetLastError(); + ok( !ret, "got %d\n", ret ); + ok( err == 0xdeadbeef, "got %u\n", err ); + + ret = DnsFlushResolverCacheEntry_A( "localhost" ); + ok( ret, "got %d\n", ret ); + + ret = DnsFlushResolverCacheEntry_A( "nxdomain.test.winehq.org" ); + ok( ret, "got %d\n", ret ); +} + START_TEST(name) { test_DnsValidateName_A(); test_DnsNameCompare_A(); + test_DnsFlushResolverCacheEntry_A(); }

1 0

Hans Leidekker : qmgr: Use the full path for HTTP downloads.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 69d0764196506da7405a401c1feb0216b278ab6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=69d0764196506da7405a401c1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 23 11:04:57 2015 +0100 qmgr: Use the full path for HTTP downloads. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/file.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index 70d3a50..2525caf 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -477,7 +477,7 @@ BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) { static const WCHAR prefix[] = {'B','I','T', 0}; WCHAR tmpDir[MAX_PATH], tmpName[MAX_PATH]; - WCHAR host[MAX_PATH], path[MAX_PATH]; + WCHAR host[MAX_PATH]; URL_COMPONENTSW uc; BOOL ret; @@ -519,10 +519,8 @@ BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) uc.lpszHostName = host; uc.dwHostNameLength = sizeof(host)/sizeof(host[0]); uc.nPort = 0; - uc.lpszUrlPath = path; - uc.dwUrlPathLength = sizeof(path)/sizeof(path[0]); - uc.lpszExtraInfo = NULL; - uc.dwExtraInfoLength = 0; + uc.lpszUrlPath = NULL; + uc.dwUrlPathLength = ~0u; ret = WinHttpCrackUrl(file->info.RemoteName, 0, 0, &uc); if (!ret) {

1 0

Jactry Zeng : riched32/tests: Test WM_GETTEXTLENGTH with multibyte character.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 439e9c6a31422fa3c4d336d5f7d6c1e54d890b20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=439e9c6a31422fa3c4d336d5f… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Dec 22 23:14:39 2015 +0800 riched32/tests: Test WM_GETTEXTLENGTH with multibyte character. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched32/tests/editor.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 62c0d00..c299348 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -130,22 +130,33 @@ static void test_WM_SETTEXT(void) static void test_WM_GETTEXTLENGTH(void) { HWND hwndRichEdit = new_richedit(NULL); - static const char text3[] = "aaa\r\nbbb\r\nccc\r\nddd\r\neee"; - static const char text4[] = "aaa\r\nbbb\r\nccc\r\nddd\r\neee\r\n"; + static const char text1[] = "aaa\r\nbbb\r\nccc\r\nddd\r\neee"; + static const char text2[] = "aaa\r\nbbb\r\nccc\r\nddd\r\neee\r\n"; + static const char text3[] = "abcdef\x8e\xf0"; int result; /* Test for WM_GETTEXTLENGTH */ - SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text3); + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text1); result = SendMessageA(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); - ok(result == lstrlenA(text3), - "WM_GETTEXTLENGTH reports incorrect length %d, expected %d\n", - result, lstrlenA(text3)); + ok(result == lstrlenA(text1), + "WM_GETTEXTLENGTH reports incorrect length %d, expected %d\n", + result, lstrlenA(text1)); - SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text4); + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text2); result = SendMessageA(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); - ok(result == lstrlenA(text4), - "WM_GETTEXTLENGTH reports incorrect length %d, expected %d\n", - result, lstrlenA(text4)); + ok(result == lstrlenA(text2), + "WM_GETTEXTLENGTH reports incorrect length %d, expected %d\n", + result, lstrlenA(text2)); + + /* Test with multibyte character */ + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text3); + result = SendMessageA(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); + ok(result == 8, "WM_GETTEXTLENGTH returned %d, expected 8\n", result); + } DestroyWindow(hwndRichEdit); }

1 0

Jactry Zeng : riched20/tests: Add tests for WM_GETTEXTLENGTH.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: bb5974987e66de2386d45f87c75912aae233f3c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb5974987e66de2386d45f87c… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Dec 22 23:14:19 2015 +0800 riched20/tests: Add tests for WM_GETTEXTLENGTH. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index bfd9ba5..8e93ba8 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8241,6 +8241,37 @@ static void test_alignment_style(void) DestroyWindow(richedit); } +static void test_WM_GETTEXTLENGTH(void) +{ + HWND hwndRichEdit = new_richedit(NULL); + static const char text1[] = "aaa\r\nbbb\r\nccc\r\nddd\r\neee"; + static const char text2[] = "aaa\r\nbbb\r\nccc\r\nddd\r\neee\r\n"; + static const char text3[] = "abcdef\x8e\xf0"; + int result; + + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text1); + result = SendMessageA(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); + ok(result == lstrlenA(text1), "WM_GETTEXTLENGTH returned %d, expected %d\n", + result, lstrlenA(text1)); + + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text2); + result = SendMessageA(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); + ok(result == lstrlenA(text2), "WM_GETTEXTLENGTH returned %d, expected %d\n", + result, lstrlenA(text2)); + + /* Test with multibyte character */ + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text3); + result = SendMessageA(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); + todo_wine ok(result == 8, "WM_GETTEXTLENGTH returned %d, expected 8\n", result); + } + + DestroyWindow(hwndRichEdit); +} + START_TEST( editor ) { BOOL ret; @@ -8285,6 +8316,7 @@ START_TEST( editor ) test_EM_FORMATRANGE(); test_unicode_conversions(); test_EM_GETTEXTLENGTHEX(); + test_WM_GETTEXTLENGTH(); test_EM_REPLACESEL(1); test_EM_REPLACESEL(0); test_WM_NOTIFY();

1 0

Jactry Zeng : riched32/tests: Test EM_GETSELTEXT with multibyte character.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 2226358773b2c268d8e8c3de0571308622acd9f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2226358773b2c268d8e8c3de0… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Dec 22 23:14:11 2015 +0800 riched32/tests: Test EM_GETSELTEXT with multibyte character. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched32/tests/editor.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index e200ff3..62c0d00 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -596,17 +596,27 @@ static void test_EM_GETSELTEXT(void) SendMessageA(hwndRichEdit, EM_SETSEL, 4, 12); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); - ok(result == 8, "EM_GETTEXTRANGE returned %ld\n", result); - ok(!strcmp(expect1, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + ok(result == 8, "EM_GETSELTEXT returned %ld\n", result); + ok(!strcmp(expect1, buffer), "EM_GETSELTEXT filled %s\n", buffer); SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text2); SendMessageA(hwndRichEdit, EM_SETSEL, 4, 11); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); - ok(result == 7, "EM_GETTEXTRANGE returned %ld\n", result); - - ok(!strcmp(expect2, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + ok(result == 7, "EM_GETSELTEXT returned %ld\n", result); + ok(!strcmp(expect2, buffer), "EM_GETSELTEXT filled %s\n", buffer); + /* Test with multibyte character */ + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"abcdef\x8e\xf0ghijk"); + SendMessageA(hwndRichEdit, EM_SETSEL, 4, 8); + result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); + ok(result == 4, "EM_GETSELTEXT returned %ld\n", result); + todo_wine ok(!strcmp("ef\x8e\xf0", buffer), "EM_GETSELTEXT filled %s\n", buffer); + } DestroyWindow(hwndRichEdit); }

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
33
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 December 2015