wine-commits November 2011

wine-commits@winehq.org

2 participants
852 discussions

Hans Leidekker : winhttp: Accept a missing buffer when parsing a decoded URL.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: dcf1a81d8cf5ac324c1a743cc54dafcec5a5e874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcf1a81d8cf5ac324c1a743cc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 15 09:11:27 2011 +0100 winhttp: Accept a missing buffer when parsing a decoded URL. --- dlls/winhttp/tests/url.c | 21 ++++++++++++++++++--- dlls/winhttp/url.c | 2 +- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index e753351..7de31f2 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -67,8 +67,8 @@ static const WCHAR url11[] = '@','w','w','w','.','w','i','n','e','h','q','.','o','r','g',':','4','4','3','/','s','i','t','e','/','a','b','o','u','t','?','q','u','e','r','y',0}; static const WCHAR url12[] = {'h','t','t','p',':','/','/','e','x','a','m','p','l','e','.','n','e','t','/','p','a','t','h','?','v','a','r','1','=','e','x','a','m','p','l','e','@','e','x','a','m','p','l','e','.','c','o','m','&','v','a','r','2','=','x','&','v','a','r','3','=','y', 0}; - - +static const WCHAR url13[] = + {'h','t','t','p','s',':','/','/','t','o','o','l','s','.','g','o','o','g','l','e','.','c','o','m','/','s','e','r','v','i','c','e','/','u','p','d','a','t','e','2','?','w','=','3',':','B','x','D','H','o','W','y','8','e','z','M',0}; static const WCHAR url_k1[] = {'h','t','t','p',':','/','/','u','s','e','r','n','a','m','e',':','p','a','s','s','w','o','r','d', @@ -570,7 +570,6 @@ static void WinHttpCrackUrl_test( void ) reset_url_components( &uc ); ret = WinHttpCrackUrl( url12, 0, 0, &uc); - ok( ret, "WinHttpCrackUrl failed\n" ); ok( uc.nScheme == INTERNET_SCHEME_HTTP, "unexpected scheme\n" ); ok( uc.lpszScheme == url12,"unexpected scheme\n" ); @@ -584,6 +583,22 @@ static void WinHttpCrackUrl_test( void ) ok( uc.dwUrlPathLength == 5, "unexpected path length\n" ); ok( uc.lpszExtraInfo == url12 + 23, "unexpected extra info\n" ); ok( uc.dwExtraInfoLength == 39, "unexpected extra info length\n" ); + + uc.lpszScheme = scheme; + uc.dwSchemeLength = 20; + uc.lpszHostName = host; + uc.dwHostNameLength = 20; + uc.lpszUserName = NULL; + uc.dwUserNameLength = 0; + uc.lpszPassword = NULL; + uc.dwPasswordLength = 0; + uc.lpszUrlPath = path; + uc.dwUrlPathLength = 40; + uc.lpszExtraInfo = NULL; + uc.dwExtraInfoLength = 0; + uc.nPort = 0; + ret = WinHttpCrackUrl( url13, 0, ICU_DECODE, &uc ); + ok( ret, "WinHttpCrackUrl failed\n" ); } START_TEST(url) diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index a662855..3938801 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -38,7 +38,7 @@ static BOOL set_component( WCHAR **str, DWORD *str_len, WCHAR *value, DWORD len, { if (!*str) { - if (len && (flags & ICU_DECODE)) + if (len && *str_len && (flags & ICU_DECODE)) { set_last_error( ERROR_INVALID_PARAMETER ); return FALSE;

1 0

Hans Leidekker : winhttp: Implement WinHttpDetectAutoProxyConfigUrl.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 96f2e7139cb14b1711c0dc22fea1f9eb47802df5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96f2e7139cb14b1711c0dc22f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 15 09:11:05 2011 +0100 winhttp: Implement WinHttpDetectAutoProxyConfigUrl. --- dlls/winhttp/session.c | 107 ++++++++++++++++++++++++++++++++++++++++- dlls/winhttp/tests/winhttp.c | 39 +++++++++++++++ include/winhttp.h | 3 + 3 files changed, 146 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index b7cc31b..c187079 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1113,15 +1113,116 @@ BOOL WINAPI WinHttpSetOption( HINTERNET handle, DWORD option, LPVOID buffer, DWO return ret; } +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 )) + { + heap_free( ret ); + return NULL; + } + 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 (!strcasecmp( domain + len_domain - len_suffix, suffix )) return TRUE; + return FALSE; +} + +static WCHAR *build_wpad_url( const struct addrinfo *ai ) +{ + static const WCHAR fmtW[] = + {'h','t','t','p',':','/','/','%','u','.','%','u','.','%','u','.','%','u', + '/','w','p','a','d','.','d','a','t',0}; + struct sockaddr_in *addr; + WCHAR *ret; + + while (ai && ai->ai_family != AF_INET) ai = ai->ai_next; + if (!ai) return NULL; + + if (!(ret = GlobalAlloc( 0, sizeof(fmtW) + 12 * sizeof(WCHAR) ))) return NULL; + addr = (struct sockaddr_in *)ai->ai_addr; + sprintfW( ret, fmtW, + (unsigned int)(ntohl( addr->sin_addr.s_addr ) >> 24 & 0xff), + (unsigned int)(ntohl( addr->sin_addr.s_addr ) >> 16 & 0xff), + (unsigned int)(ntohl( addr->sin_addr.s_addr ) >> 8 & 0xff), + (unsigned int)(ntohl( addr->sin_addr.s_addr ) & 0xff) ); + return ret; +} + /*********************************************************************** * WinHttpDetectAutoProxyConfigUrl (winhttp.@) */ BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url ) { - FIXME("0x%08x, %p\n", flags, url); + BOOL ret = FALSE; - set_last_error( ERROR_WINHTTP_AUTODETECTION_FAILED ); - return FALSE; + TRACE("0x%08x, %p\n", flags, url); + + if (!flags || !url) + { + set_last_error( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (flags & WINHTTP_AUTO_DETECT_TYPE_DHCP) FIXME("discovery via DHCP not supported\n"); + if (flags & WINHTTP_AUTO_DETECT_TYPE_DNS_A) + { +#ifdef HAVE_GETADDRINFO + char *fqdn, *domain, *p; + + if (!(fqdn = get_computer_name( ComputerNamePhysicalDnsFullyQualified ))) return FALSE; + if (!(domain = get_computer_name( ComputerNamePhysicalDnsDomain ))) + { + heap_free( fqdn ); + return FALSE; + } + p = fqdn; + while ((p = strchr( p, '.' )) && is_domain_suffix( p + 1, domain )) + { + struct addrinfo *ai; + char *name; + int res; + + if (!(name = heap_alloc( sizeof("wpad") + strlen(p) ))) + { + heap_free( fqdn ); + heap_free( domain ); + return FALSE; + } + strcpy( name, "wpad" ); + strcat( name, p ); + res = getaddrinfo( name, NULL, NULL, &ai ); + heap_free( name ); + if (!res) + { + *url = build_wpad_url( ai ); + freeaddrinfo( ai ); + if (*url) + { + TRACE("returning %s\n", debugstr_w(*url)); + ret = TRUE; + break; + } + } + p++; + } + heap_free( domain ); + heap_free( fqdn ); +#else + FIXME("getaddrinfo not found at build time\n"); +#endif + } + if (!ret) set_last_error( ERROR_WINHTTP_AUTODETECTION_FAILED ); + return ret; } static const WCHAR Connections[] = { diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index acf88dc..f481a82 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2518,6 +2518,44 @@ static void test_IWinHttpRequest(void) CoUninitialize(); } +static void test_WinHttpDetectAutoProxyConfigUrl(void) +{ + BOOL ret; + WCHAR *url; + DWORD error; + + SetLastError(0xdeadbeef); + ret = WinHttpDetectAutoProxyConfigUrl( 0, NULL ); + error = GetLastError(); + ok( !ret, "expected failure\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + url = NULL; + SetLastError(0xdeadbeef); + ret = WinHttpDetectAutoProxyConfigUrl( 0, &url ); + error = GetLastError(); + ok( !ret, "expected failure\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + SetLastError(0xdeadbeef); + ret = WinHttpDetectAutoProxyConfigUrl( WINHTTP_AUTO_DETECT_TYPE_DNS_A, NULL ); + error = GetLastError(); + ok( !ret, "expected failure\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + url = NULL; + SetLastError(0xdeadbeef); + ret = WinHttpDetectAutoProxyConfigUrl( WINHTTP_AUTO_DETECT_TYPE_DNS_A, &url ); + error = GetLastError(); + if (!ret) + ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %u\n", error ); + else + { + trace("%s\n", wine_dbgstr_w(url)); + GlobalFree( url ); + } +} + START_TEST (winhttp) { static const WCHAR basicW[] = {'/','b','a','s','i','c',0}; @@ -2540,6 +2578,7 @@ START_TEST (winhttp) test_resolve_timeout(); test_credentials(); test_IWinHttpRequest(); + test_WinHttpDetectAutoProxyConfigUrl(); si.event = CreateEvent(NULL, 0, 0, NULL); si.port = 7532; diff --git a/include/winhttp.h b/include/winhttp.h index 68bec0a..36f8b9d 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -503,6 +503,9 @@ typedef struct typedef VOID (CALLBACK *WINHTTP_STATUS_CALLBACK)(HINTERNET,DWORD_PTR,DWORD,LPVOID,DWORD); +#define WINHTTP_AUTO_DETECT_TYPE_DHCP 0x00000001 +#define WINHTTP_AUTO_DETECT_TYPE_DNS_A 0x00000002 + typedef struct { DWORD dwFlags;

1 0

Hans Leidekker : ws2_32: Fix handling of NULL and empty hostname in getaddrinfo/GetAddrInfoW.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 75be2284e13d327d93a9665eb32cd901cbed7234 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75be2284e13d327d93a9665eb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 15 11:38:20 2011 +0100 ws2_32: Fix handling of NULL and empty hostname in getaddrinfo/GetAddrInfoW. --- dlls/ws2_32/socket.c | 56 +++++++++++++++++---------- dlls/ws2_32/tests/sock.c | 95 ++++++++++++++++++++++++++++++++++++++------- 2 files changed, 116 insertions(+), 35 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 00a15b6..fe645c1 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4785,6 +4785,22 @@ static int convert_eai_u2w(int unixret) { return unixret; } +static char *get_hostname(void) +{ + char *ret; + DWORD size = 0; + + GetComputerNameExA( ComputerNamePhysicalDnsHostname, NULL, &size ); + if (GetLastError() != ERROR_MORE_DATA) return NULL; + if (!(ret = HeapAlloc( GetProcessHeap(), 0, size ))) return NULL; + if (!GetComputerNameExA( ComputerNamePhysicalDnsHostname, ret, &size )) + { + HeapFree( GetProcessHeap(), 0, ret ); + return NULL; + } + return ret; +} + /*********************************************************************** * getaddrinfo (WS2_32.@) */ @@ -4794,17 +4810,19 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr struct addrinfo *unixaires = NULL; int result; struct addrinfo unixhints, *punixhints = NULL; - CHAR *node = NULL, *serv = NULL; + char *hostname = NULL; + const char *node; - if (nodename) - if (!(node = strdup_lower(nodename))) return WSA_NOT_ENOUGH_MEMORY; + if (!nodename && !servname) return WSAHOST_NOT_FOUND; - if (servname) { - if (!(serv = strdup_lower(servname))) { - HeapFree(GetProcessHeap(), 0, node); - return WSA_NOT_ENOUGH_MEMORY; - } - } + if (!nodename) + node = "localhost"; + else if (!nodename[0]) + node = hostname = get_hostname(); + else + node = nodename; + + if (!node) return WSA_NOT_ENOUGH_MEMORY; if (hints) { punixhints = &unixhints; @@ -4826,12 +4844,10 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr } /* getaddrinfo(3) is thread safe, no need to wrap in CS */ - result = getaddrinfo(nodename, servname, punixhints, &unixaires); + result = getaddrinfo(node, servname, punixhints, &unixaires); TRACE("%s, %s %p -> %p %d\n", debugstr_a(nodename), debugstr_a(servname), hints, res, result); - - HeapFree(GetProcessHeap(), 0, node); - HeapFree(GetProcessHeap(), 0, serv); + HeapFree(GetProcessHeap(), 0, hostname); if (!result) { struct addrinfo *xuai = unixaires; @@ -4991,15 +5007,15 @@ static struct WS_addrinfo *addrinfo_WtoA(const struct WS_addrinfoW *ai) int WINAPI GetAddrInfoW(LPCWSTR nodename, LPCWSTR servname, const ADDRINFOW *hints, PADDRINFOW *res) { int ret, len; - char *nodenameA, *servnameA = NULL; + char *nodenameA = NULL, *servnameA = NULL; struct WS_addrinfo *resA, *hintsA = NULL; - if (!nodename) return WSAHOST_NOT_FOUND; - - len = WideCharToMultiByte(CP_ACP, 0, nodename, -1, NULL, 0, NULL, NULL); - if (!(nodenameA = HeapAlloc(GetProcessHeap(), 0, len))) return EAI_MEMORY; - WideCharToMultiByte(CP_ACP, 0, nodename, -1, nodenameA, len, NULL, NULL); - + if (nodename) + { + len = WideCharToMultiByte(CP_ACP, 0, nodename, -1, NULL, 0, NULL, NULL); + if (!(nodenameA = HeapAlloc(GetProcessHeap(), 0, len))) return EAI_MEMORY; + WideCharToMultiByte(CP_ACP, 0, nodename, -1, nodenameA, len, NULL, NULL); + } if (servname) { len = WideCharToMultiByte(CP_ACP, 0, servname, -1, NULL, 0, NULL, NULL); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 237bc86..7b5dde8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -59,9 +59,11 @@ k.keepaliveinterval = interval; /* Function pointers */ -static void (WINAPI *pFreeAddrInfoW)(PADDRINFOW) = 0; -static int (WINAPI *pGetAddrInfoW)(LPCWSTR,LPCWSTR,const ADDRINFOW *,PADDRINFOW *) = 0; -static PCSTR (WINAPI *pInetNtop)(INT,LPVOID,LPSTR,ULONG) = 0; +static void (WINAPI *pfreeaddrinfo)(struct addrinfo *); +static int (WINAPI *pgetaddrinfo)(LPCSTR,LPCSTR,const struct addrinfo *,struct addrinfo **); +static void (WINAPI *pFreeAddrInfoW)(PADDRINFOW); +static int (WINAPI *pGetAddrInfoW)(LPCWSTR,LPCWSTR,const ADDRINFOW *,PADDRINFOW *); +static PCSTR (WINAPI *pInetNtop)(INT,LPVOID,LPSTR,ULONG); /**************** Structs and typedefs ***************/ @@ -1002,6 +1004,8 @@ static void Init (void) WSADATA data; HMODULE hws2_32 = GetModuleHandle("ws2_32.dll"); + pfreeaddrinfo = (void *)GetProcAddress(hws2_32, "freeaddrinfo"); + pgetaddrinfo = (void *)GetProcAddress(hws2_32, "getaddrinfo"); pFreeAddrInfoW = (void *)GetProcAddress(hws2_32, "FreeAddrInfoW"); pGetAddrInfoW = (void *)GetProcAddress(hws2_32, "GetAddrInfoW"); pInetNtop = (void *)GetProcAddress(hws2_32, "inet_ntop"); @@ -4153,7 +4157,6 @@ static void test_GetAddrInfoW(void) static const WCHAR empty[] = {0}; static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; static const WCHAR zero[] = {'0',0}; - int ret; ADDRINFOW *result, hint; @@ -4162,7 +4165,6 @@ static void test_GetAddrInfoW(void) win_skip("GetAddrInfoW and/or FreeAddrInfoW not present\n"); return; } - memset(&hint, 0, sizeof(ADDRINFOW)); ret = pGetAddrInfoW(NULL, NULL, NULL, &result); @@ -4170,44 +4172,107 @@ static void test_GetAddrInfoW(void) result = NULL; ret = pGetAddrInfoW(empty, NULL, NULL, &result); - todo_wine - { ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); ok(result != NULL, "GetAddrInfoW failed\n"); - } pFreeAddrInfoW(result); result = NULL; ret = pGetAddrInfoW(NULL, zero, NULL, &result); - todo_wine - { ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); ok(result != NULL, "GetAddrInfoW failed\n"); - } pFreeAddrInfoW(result); result = NULL; ret = pGetAddrInfoW(empty, zero, NULL, &result); - todo_wine - { ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); ok(result != NULL, "GetAddrInfoW failed\n"); - } pFreeAddrInfoW(result); + result = NULL; ret = pGetAddrInfoW(localhost, NULL, NULL, &result); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); pFreeAddrInfoW(result); + result = NULL; + ret = pGetAddrInfoW(localhost, empty, NULL, &result); + ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + pFreeAddrInfoW(result); + + result = NULL; + ret = pGetAddrInfoW(localhost, zero, NULL, &result); + ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + pFreeAddrInfoW(result); + + result = NULL; ret = pGetAddrInfoW(localhost, port, NULL, &result); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); pFreeAddrInfoW(result); + result = NULL; ret = pGetAddrInfoW(localhost, port, &hint, &result); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); pFreeAddrInfoW(result); } +static void test_getaddrinfo(void) +{ + int ret; + ADDRINFOA *result, hint; + + if (!pgetaddrinfo || !pfreeaddrinfo) + { + win_skip("getaddrinfo and/or freeaddrinfo not present\n"); + return; + } + memset(&hint, 0, sizeof(ADDRINFOA)); + + ret = pgetaddrinfo(NULL, NULL, NULL, &result); + ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + + result = NULL; + ret = pgetaddrinfo("", NULL, NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + ok(result != NULL, "getaddrinfo failed\n"); + pfreeaddrinfo(result); + + result = NULL; + ret = pgetaddrinfo(NULL, "0", NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + ok(result != NULL, "getaddrinfo failed\n"); + pfreeaddrinfo(result); + + result = NULL; + ret = pgetaddrinfo("", "0", NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + ok(result != NULL, "getaddrinfo failed\n"); + pfreeaddrinfo(result); + + result = NULL; + ret = pgetaddrinfo("localhost", NULL, NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + pfreeaddrinfo(result); + + result = NULL; + ret = pgetaddrinfo("localhost", "", NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + pfreeaddrinfo(result); + + result = NULL; + ret = pgetaddrinfo("localhost", "0", NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + pfreeaddrinfo(result); + + result = NULL; + ret = pgetaddrinfo("localhost", "80", NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + pfreeaddrinfo(result); + + result = NULL; + ret = pgetaddrinfo("localhost", "80", &hint, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + pfreeaddrinfo(result); +} + static void test_ConnectEx(void) { SOCKET listener = INVALID_SOCKET; @@ -5153,7 +5218,7 @@ START_TEST( sock ) test_ipv6only(); test_GetAddrInfoW(); - + test_getaddrinfo(); test_AcceptEx(); test_ConnectEx();

1 0

Nikolay Sivov : msxml3: Properly handle qualified names in getAttributeNode ().
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: f87aee778da3109b6065f1bdd2fb2636ce17f95a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f87aee778da3109b6065f1bdd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 14 13:48:36 2011 +0300 msxml3: Properly handle qualified names in getAttributeNode(). --- dlls/msxml3/element.c | 53 ++++++++++++++++++++-------- dlls/msxml3/tests/domdoc.c | 82 ++++++++++++++++++++++++++++++++------------ 2 files changed, 97 insertions(+), 38 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 0863a16..57fef4c 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1171,40 +1171,61 @@ static HRESULT WINAPI domelem_getAttributeNode( BSTR p, IXMLDOMAttribute** attributeNode ) { domelem *This = impl_from_IXMLDOMElement( iface ); - xmlChar *xml_name; + xmlChar *local, *prefix, *nameA; + HRESULT hr = S_FALSE; xmlNodePtr element; xmlAttrPtr attr; - IUnknown *unk; - HRESULT hr = S_FALSE; TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), attributeNode); - if(!attributeNode) + element = get_element( This ); + if (!element) return E_FAIL; + + if (attributeNode) *attributeNode = NULL; + + nameA = xmlchar_from_wchar(p); + if (!xmlValidateNameValue(nameA)) + { + heap_free(nameA); return E_FAIL; + } + + if (!attributeNode) + { + heap_free(nameA); + return S_FALSE; + } *attributeNode = NULL; - element = get_element( This ); - if ( !element ) - return E_FAIL; + local = xmlSplitQName2(nameA, &prefix); - xml_name = xmlchar_from_wchar(p); + if (local) + { + /* try to get namespace for supplied qualified name */ + xmlNsPtr ns = xmlSearchNs(element->doc, element, prefix); + xmlFree(prefix); - if(!xmlValidateNameValue(xml_name)) + attr = xmlHasNsProp(element, local, ns ? ns->href : NULL); + xmlFree(local); + } + else { - heap_free(xml_name); - return E_FAIL; + attr = xmlHasProp(element, nameA); + /* attribute has attached namespace and we requested non-qualified + name - it's a failure case */ + if (attr && attr->ns) attr = NULL; } - attr = xmlHasProp(element, xml_name); - if(attr) { - unk = create_attribute((xmlNodePtr)attr); + heap_free(nameA); + + if (attr) + { + IUnknown *unk = create_attribute((xmlNodePtr)attr); hr = IUnknown_QueryInterface(unk, &IID_IXMLDOMAttribute, (void**)attributeNode); IUnknown_Release(unk); } - heap_free(xml_name); - return hr; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index dfad107..eb1270d 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1393,9 +1393,9 @@ static const CHAR szNonUnicodeXML[] = "<?xml version='1.0' encoding='Windows-1252'?>\n" "<open></open>\n"; -static const CHAR szExampleXML[] = +static const char szExampleXML[] = "<?xml version='1.0' encoding='utf-8'?>\n" -"<root xmlns:foo='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'>\n" +"<root xmlns:foo='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29' a=\"attr a\" foo:b=\"attr b\" >\n" " <elem>\n" " <a>A1 field</a>\n" " <b>B1 field</b>\n" @@ -1752,10 +1752,10 @@ static const char default_ns_doc[] = { " d=\"d attr\" />" }; -static const WCHAR szNonExistentFile[] = { +static const WCHAR nonexistent_fileW[] = { 'c', ':', '\\', 'N', 'o', 'n', 'e', 'x', 'i', 's', 't', 'e', 'n', 't', '.', 'x', 'm', 'l', 0 }; -static const WCHAR szNonExistentAttribute[] = { +static const WCHAR nonexistent_attrW[] = { 'n','o','n','E','x','i','s','i','t','i','n','g','A','t','t','r','i','b','u','t','e',0 }; static const WCHAR szDocument[] = { @@ -2066,7 +2066,7 @@ if (0) /* try to load a document from a nonexistent file */ b = VARIANT_TRUE; - str = SysAllocString( szNonExistentFile ); + str = SysAllocString( nonexistent_fileW ); VariantInit(&var); V_VT(&var) = VT_BSTR; V_BSTR(&var) = str; @@ -2776,7 +2776,7 @@ static void test_domnode( void ) ok( !lstrcmpW( str, szlc ), "incorrect nodeName\n"); SysFreeString( str ); - str = SysAllocString( szNonExistentFile ); + str = SysAllocString( nonexistent_fileW ); V_VT(&var) = VT_I4; V_I4(&var) = 0x1234; r = IXMLDOMElement_getAttribute( element, str, &var ); @@ -2784,22 +2784,6 @@ static void test_domnode( void ) ok( V_VT(&var) == VT_NULL || V_VT(&var) == VT_EMPTY, "vt = %x\n", V_VT(&var)); VariantClear(&var); - r = IXMLDOMElement_getAttributeNode( element, str, NULL); - ok( r == E_FAIL, "getAttributeNode ret %08x\n", r ); - - attr = (IXMLDOMAttribute*)0xdeadbeef; - r = IXMLDOMElement_getAttributeNode( element, str, &attr); - ok( r == E_FAIL, "getAttributeNode ret %08x\n", r ); - ok( attr == NULL, "getAttributeNode ret %p, expected NULL\n", attr ); - SysFreeString( str ); - - attr = (IXMLDOMAttribute*)0xdeadbeef; - str = SysAllocString( szNonExistentAttribute ); - r = IXMLDOMElement_getAttributeNode( element, str, &attr); - ok( r == S_FALSE, "getAttributeNode ret %08x\n", r ); - ok( attr == NULL, "getAttributeNode ret %p, expected NULL\n", attr ); - SysFreeString( str ); - str = SysAllocString( szdl ); V_VT(&var) = VT_I4; V_I4(&var) = 0x1234; @@ -10662,6 +10646,59 @@ static void test_parseerror(void) IXMLDOMDocument_Release(doc); } +static void test_getAttributeNode(void) +{ + IXMLDOMAttribute *attr; + IXMLDOMDocument *doc; + IXMLDOMElement *elem; + VARIANT_BOOL v; + HRESULT hr; + BSTR str; + + doc = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_loadXML(doc, _bstr_(szExampleXML), &v); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_get_documentElement(doc, &elem); + EXPECT_HR(hr, S_OK); + + str = SysAllocString(nonexistent_fileW); + hr = IXMLDOMElement_getAttributeNode(elem, str, NULL); + EXPECT_HR(hr, E_FAIL); + + attr = (IXMLDOMAttribute*)0xdeadbeef; + hr = IXMLDOMElement_getAttributeNode(elem, str, &attr); + EXPECT_HR(hr, E_FAIL); + ok(attr == NULL, "got %p\n", attr); + SysFreeString(str); + + str = SysAllocString(nonexistent_attrW); + hr = IXMLDOMElement_getAttributeNode(elem, str, NULL); + EXPECT_HR(hr, S_FALSE); + + attr = (IXMLDOMAttribute*)0xdeadbeef; + hr = IXMLDOMElement_getAttributeNode(elem, str, &attr); + EXPECT_HR(hr, S_FALSE); + ok(attr == NULL, "got %p\n", attr); + SysFreeString(str); + + hr = IXMLDOMElement_getAttributeNode(elem, _bstr_("foo:b"), &attr); + EXPECT_HR(hr, S_OK); + IXMLDOMAttribute_Release(attr); + + hr = IXMLDOMElement_getAttributeNode(elem, _bstr_("b"), &attr); + EXPECT_HR(hr, S_FALSE); + + hr = IXMLDOMElement_getAttributeNode(elem, _bstr_("a"), &attr); + EXPECT_HR(hr, S_OK); + IXMLDOMAttribute_Release(attr); + + IXMLDOMElement_Release(elem); + IXMLDOMDocument_Release(doc); + free_bstrs(); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -10735,6 +10772,7 @@ START_TEST(domdoc) test_load(); test_dispex(); test_parseerror(); + test_getAttributeNode(); test_xsltemplate();

1 0

Nikolay Sivov : msxml3: Added IDispatchEx support for IXMLDOMImplementation .
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 6d4c1931f994023731fc80e8038aea705ab0c406 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d4c1931f994023731fc80e80… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 14 10:03:31 2011 +0300 msxml3: Added IDispatchEx support for IXMLDOMImplementation. --- dlls/msxml3/domimpl.c | 24 ++++++++++++++++++++---- dlls/msxml3/tests/domdoc.c | 10 ++++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c index 2ecf073..501d596 100644 --- a/dlls/msxml3/domimpl.c +++ b/dlls/msxml3/domimpl.c @@ -44,6 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _domimpl { + DispatchEx dispex; IXMLDOMImplementation IXMLDOMImplementation_iface; LONG ref; } domimpl; @@ -67,6 +68,10 @@ static HRESULT WINAPI dimimpl_QueryInterface( { *ppvObject = iface; } + else if (dispex_query_interface(&This->dispex, riid, ppvObject)) + { + return *ppvObject ? S_OK : E_NOINTERFACE; + } else { TRACE("Unsupported interface %s\n", debugstr_guid(riid)); @@ -97,6 +102,7 @@ static ULONG WINAPI dimimpl_Release( TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { + release_dispex(&This->dispex); heap_free( This ); } @@ -122,13 +128,10 @@ static HRESULT WINAPI dimimpl_GetTypeInfo( ITypeInfo** ppTInfo ) { domimpl *This = impl_from_IXMLDOMImplementation( iface ); - HRESULT hr; TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - hr = get_typeinfo(IXMLDOMImplementation_tid, ppTInfo); - - return hr; + return get_typeinfo(IXMLDOMImplementation_tid, ppTInfo); } static HRESULT WINAPI dimimpl_GetIDsOfNames( @@ -220,6 +223,18 @@ static const struct IXMLDOMImplementationVtbl dimimpl_vtbl = dimimpl_hasFeature }; +static const tid_t dimimpl_iface_tids[] = { + IXMLDOMImplementation_tid, + 0 +}; + +static dispex_static_data_t dimimpl_dispex = { + NULL, + IXMLDOMImplementation_tid, + NULL, + dimimpl_iface_tids +}; + IUnknown* create_doc_Implementation(void) { domimpl *This; @@ -230,6 +245,7 @@ IUnknown* create_doc_Implementation(void) This->IXMLDOMImplementation_iface.lpVtbl = &dimimpl_vtbl; This->ref = 1; + init_dispex(&This->dispex, (IUnknown*)&This->IXMLDOMImplementation_iface, &dimimpl_dispex); return (IUnknown*)&This->IXMLDOMImplementation_iface; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index a79da43..dfad107 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10507,6 +10507,7 @@ static const DOMNodeType dispex_types_test[] = static void test_dispex(void) { const DOMNodeType *type = dispex_types_test; + IXMLDOMImplementation *impl; IXMLDOMNodeList *node_list; IXMLDOMParseError *error; IXMLDOMNamedNodeMap *map; @@ -10612,6 +10613,15 @@ static void test_dispex(void) IXMLDOMNamedNodeMap_Release(map); IXMLDOMElement_Release(elem); + /* IXMLDOMImplementation */ + hr = IXMLDOMDocument_get_implementation(doc, &impl); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMImplementation_QueryInterface(impl, &IID_IDispatchEx, (void**)&dispex); + EXPECT_HR(hr, S_OK); + IDispatchEx_Release(dispex); + IXMLDOMImplementation_Release(impl); + IXMLDOMDocument_Release(doc); /* IXMLHTTPRequest */

1 0

Nikolay Sivov : msxml3: Support multiple IXMLDOMNamedNodeMap implementations.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: b6d3068c24e028bdc50d9583baaf83cb9a391311 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6d3068c24e028bdc50d9583b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 13 00:45:10 2011 +0300 msxml3: Support multiple IXMLDOMNamedNodeMap implementations. --- dlls/msxml3/element.c | 263 ++++++++++++++++++++++++++++++++++++++++++- dlls/msxml3/msxml_private.h | 33 ++++-- dlls/msxml3/nodemap.c | 227 ++++--------------------------------- dlls/msxml3/pi.c | 71 +++++++++++- 4 files changed, 373 insertions(+), 221 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b6d3068c24e028bdc50d9…

1 0

Juan Lang : iphlpapi: Fix enumerating IPv6 addresses.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: d2236db8c1a8960579e29259dfe54998e20aff2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2236db8c1a8960579e29259d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 14 19:20:06 2011 -0800 iphlpapi: Fix enumerating IPv6 addresses. --- dlls/iphlpapi/iphlpapi_main.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index a2bdea3..28185a8 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -770,12 +770,10 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, DWORD index, ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, GetProcessHeap(), 0); if (!ret) - { num_v4_gateways = count_v4_gateways(index, routeTable); - if (!(flags & GAA_FLAG_SKIP_UNICAST)) - ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs); - } } + if (!ret && !(flags & GAA_FLAG_SKIP_UNICAST)) + ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs); } else {

1 0

Stefan Dösinger : ddraw: Set correct HEL and HAL color models.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 9e0baa55cec232656048c972e94a9dc2a15ec30b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e0baa55cec232656048c972e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 17 22:14:54 2011 +0200 ddraw: Set correct HEL and HAL color models. --- dlls/ddraw/ddraw.c | 7 +++++++ dlls/ddraw/tests/d3d.c | 12 ++++++++++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 8fdda89..5d4b008 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3968,6 +3968,9 @@ static HRESULT WINAPI d3d3_EnumDevices(IDirect3D3 *iface, LPD3DENUMDEVICESCALLBA | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PERSPECTIVE); hal_desc.dpcTriCaps.dwTextureCaps &= ~(D3DPTEXTURECAPS_POW2 | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PERSPECTIVE); + /* RGB, RAMP and MMX devices have a HAL dcmColorModel of 0 */ + hal_desc.dcmColorModel = 0; + hr = callback((GUID *)&IID_IDirect3DRGBDevice, reference_description, device_name, &hal_desc, &hel_desc, context); if (hr != D3DENUMRET_OK) @@ -3983,11 +3986,15 @@ static HRESULT WINAPI d3d3_EnumDevices(IDirect3D3 *iface, LPD3DENUMDEVICESCALLBA TRACE("Enumerating HAL Direct3D device.\n"); hal_desc = device_desc1; hel_desc = device_desc1; + /* The hal device does not have the pow2 flag set in hel, but in hal. */ hel_desc.dpcLineCaps.dwTextureCaps &= ~(D3DPTEXTURECAPS_POW2 | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PERSPECTIVE); hel_desc.dpcTriCaps.dwTextureCaps &= ~(D3DPTEXTURECAPS_POW2 | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PERSPECTIVE); + /* HAL devices have a HEL dcmColorModel of 0 */ + hel_desc.dcmColorModel = 0; + hr = callback((GUID *)&IID_IDirect3DHALDevice, wined3d_description, device_name, &hal_desc, &hel_desc, context); if (hr != D3DENUMRET_OK) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 4cd9346..4a45867 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -804,10 +804,15 @@ static HRESULT WINAPI enumDevicesCallback(GUID *Guid,LPSTR DeviceDescription,LPS "RGB Device %d hel tri caps does not have D3DPTEXTURECAPS_PERSPECTIVE set\n", ver); ok(hel->dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_PERSPECTIVE, "RGB Device %d hel tri caps does not have D3DPTEXTURECAPS_PERSPECTIVE set\n", ver); + + ok(hal->dcmColorModel == 0, "RGB Device %u hal caps has colormodel %u\n", ver, hal->dcmColorModel); + ok(hel->dcmColorModel == D3DCOLOR_RGB, "RGB Device %u hel caps has colormodel %u\n", ver, hel->dcmColorModel); } else if(IsEqualGUID(&IID_IDirect3DHALDevice, Guid)) { trace("HAL Device %d\n", ver); + ok(hal->dcmColorModel == D3DCOLOR_RGB, "HAL Device %u hal caps has colormodel %u\n", ver, hel->dcmColorModel); + ok(hel->dcmColorModel == 0, "HAL Device %u hel caps has colormodel %u\n", ver, hel->dcmColorModel); } else if(IsEqualGUID(&IID_IDirect3DRefDevice, Guid)) { @@ -848,6 +853,10 @@ static HRESULT WINAPI enumDevicesCallback(GUID *Guid,LPSTR DeviceDescription,LPS "Ramp Device %d hel tri caps does not have D3DPTEXTURECAPS_PERSPECTIVE set\n", ver); ok(hel->dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_PERSPECTIVE, "Ramp Device %d hel tri caps does not have D3DPTEXTURECAPS_PERSPECTIVE set\n", ver); + + ok(hal->dcmColorModel == 0, "Ramp Device %u hal caps has colormodel %u\n", ver, hal->dcmColorModel); + ok(hel->dcmColorModel == D3DCOLOR_MONO, "Ramp Device %u hel caps has colormodel %u\n", + ver, hel->dcmColorModel); } else if(IsEqualGUID(&IID_IDirect3DMMXDevice, Guid)) { @@ -868,6 +877,9 @@ static HRESULT WINAPI enumDevicesCallback(GUID *Guid,LPSTR DeviceDescription,LPS "MMX Device %d hel tri caps does not have D3DPTEXTURECAPS_PERSPECTIVE set\n", ver); ok(hel->dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_PERSPECTIVE, "MMX Device %d hel tri caps does not have D3DPTEXTURECAPS_PERSPECTIVE set\n", ver); + + ok(hal->dcmColorModel == 0, "MMX Device %u hal caps has colormodel %u\n", ver, hal->dcmColorModel); + ok(hel->dcmColorModel == D3DCOLOR_RGB, "MMX Device %u hel caps has colormodel %u\n", ver, hel->dcmColorModel); } else {

1 0

Stefan Dösinger : ddraw: Add more tests and fixes for SetSurfaceDesc.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: c3d6061593601463ac96d632956b645c4c6342c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3d6061593601463ac96d6329… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Oct 15 15:41:17 2011 +0200 ddraw: Add more tests and fixes for SetSurfaceDesc. --- dlls/ddraw/surface.c | 37 ++++++++------------ dlls/ddraw/tests/dsurface.c | 80 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 22 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 46240f4..854ec3c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4033,6 +4033,19 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, return DDERR_INVALIDPARAMS; } + /* Tests show that only LPSURFACE and PIXELFORMAT can be set, and LPSURFACE is required + * for PIXELFORMAT to work */ + if (DDSD->dwFlags & ~(DDSD_LPSURFACE | DDSD_PIXELFORMAT)) + { + WARN("Invalid flags (0x%08x) set, returning DDERR_INVALIDPARAMS\n", DDSD->dwFlags); + return DDERR_INVALIDPARAMS; + } + if (!(DDSD->dwFlags & DDSD_LPSURFACE)) + { + WARN("DDSD_LPSURFACE is not set, returning DDERR_INVALIDPARAMS\n"); + return DDERR_INVALIDPARAMS; + } + wined3d_mutex_lock(); if (DDSD->dwFlags & DDSD_PIXELFORMAT) { @@ -4052,28 +4065,9 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, wined3d_mutex_unlock(); return hr; } + This->surface_desc.u4.ddpfPixelFormat = DDSD->u4.ddpfPixelFormat; } } - if (DDSD->dwFlags & DDSD_CKDESTOVERLAY) - { - wined3d_surface_set_color_key(This->wined3d_surface, DDCKEY_DESTOVERLAY, - (WINEDDCOLORKEY *)&DDSD->u3.ddckCKDestOverlay); - } - if (DDSD->dwFlags & DDSD_CKDESTBLT) - { - wined3d_surface_set_color_key(This->wined3d_surface, DDCKEY_DESTBLT, - (WINEDDCOLORKEY *)&DDSD->ddckCKDestBlt); - } - if (DDSD->dwFlags & DDSD_CKSRCOVERLAY) - { - wined3d_surface_set_color_key(This->wined3d_surface, DDCKEY_SRCOVERLAY, - (WINEDDCOLORKEY *)&DDSD->ddckCKSrcOverlay); - } - if (DDSD->dwFlags & DDSD_CKSRCBLT) - { - wined3d_surface_set_color_key(This->wined3d_surface, DDCKEY_SRCBLT, - (WINEDDCOLORKEY *)&DDSD->ddckCKSrcBlt); - } if (DDSD->dwFlags & DDSD_LPSURFACE && DDSD->lpSurface) { hr = wined3d_surface_set_mem(This->wined3d_surface, DDSD->lpSurface); @@ -4089,10 +4083,9 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, break; /* Go on */ } } + /* DDSD->lpSurface is set by Lock() */ } - This->surface_desc = *DDSD; - wined3d_mutex_unlock(); return DD_OK; diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 987801f..ca9d3b7 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -4483,6 +4483,7 @@ static void set_surface_desc_test(void) IDirectDrawSurface *surface; IDirectDrawSurface3 *surface3; BYTE data[8*8*4]; + DWORD old_pitch; hr = IDirectDraw_CreateSurface(lpDD, NULL, &surface, NULL); ok(hr == DDERR_INVALIDPARAMS, "CreateSurface with a NULL DDSD returned %#x," @@ -4526,6 +4527,85 @@ static void set_surface_desc_test(void) " DDERR_INVALIDPARAMS(%#x)\n", hr, DDERR_INVALIDPARAMS); IDirectDrawSurface_Release(surface3); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_PIXELFORMAT; + ddsd.dwWidth = 8; + ddsd.dwHeight = 8; + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 32; + U2(ddsd.ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; + + hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface, NULL); + ok(SUCCEEDED(hr), "IDirectDraw_CreateSurface failed, hr %#x.\n", hr); + hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface3, (void **) &surface3); + ok(SUCCEEDED(hr), "IDirectDrawSurface_QueryInterface failed, hr %#x.\n", hr); + IDirectDrawSurface_Release(surface); + hr = IDirectDrawSurface3_GetSurfaceDesc(surface3, &ddsd); + ok(SUCCEEDED(hr), "IDirectDrawSurface3_GetSurfaceDesc failed, hr %#x.\n", hr); + old_pitch = ddsd.lPitch; + + /* Setting width and height is an error */ + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT; + ddsd.dwWidth = 16; + ddsd.dwHeight = 16; + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + ddsd.lpSurface = data; + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_LPSURFACE; + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + + reset_ddsd(&ddsd); + hr = IDirectDrawSurface3_GetSurfaceDesc(surface3, &ddsd); + ok(SUCCEEDED(hr), "IDirectDrawSurface3_GetSurfaceDesc failed, hr %#x.\n", hr); + ok(ddsd.dwWidth == 8, "SetSurfaceDesc: Expected width 8, got %u\n", ddsd.dwWidth); + ok(ddsd.dwHeight == 8, "SetSurfaceDesc: Expected height 8, got %u\n", ddsd.dwHeight); + + /* Setting the pitch is an error */ + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_PITCH; + ddsd.lPitch = 1024; + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + ddsd.dwFlags = DDSD_PITCH | DDSD_LPSURFACE; + ddsd.lpSurface = data; + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + ddsd.lPitch = old_pitch; + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + + /* Setting the pixelformat without lpsurface is an error, but with LPSURFACE it works */ + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_PIXELFORMAT; + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 32; + U2(ddsd.ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + ddsd.dwFlags = DDSD_PIXELFORMAT | DDSD_LPSURFACE; + ddsd.lpSurface = data; + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(hr == DD_OK, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DD_OK); + + /* Can't set color keys */ + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_CKSRCBLT; + ddsd.ddckCKSrcBlt.dwColorSpaceLowValue = 0x00ff0000; + ddsd.ddckCKSrcBlt.dwColorSpaceHighValue = 0x00ff0000; + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + + IDirectDrawSurface_Release(surface3); } static BOOL fourcc_supported(DWORD fourcc, DWORD caps)

1 0

Stefan Dösinger : ddraw/tests: Mark a VMware failure broken.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 460e35aace89c39b102b3b2cadd024a5486f0d95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=460e35aace89c39b102b3b2ca… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 14 23:08:06 2011 +0100 ddraw/tests: Mark a VMware failure broken. --- dlls/ddraw/tests/overlay.c | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/tests/overlay.c b/dlls/ddraw/tests/overlay.c index ded7c5a..64d0063 100644 --- a/dlls/ddraw/tests/overlay.c +++ b/dlls/ddraw/tests/overlay.c @@ -263,22 +263,27 @@ static void yv12_test(void) } hr = IDirectDrawSurface7_Blt(dst, NULL, surface, NULL, 0, NULL); - ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned 0x%08x, expected DD_OK\n", hr); - - memset(&desc, 0, sizeof(desc)); - desc.dwSize = sizeof(desc); - hr = IDirectDrawSurface7_Lock(dst, NULL, &desc, 0, NULL); - ok(hr == DD_OK, "IDirectDrawSurface7_Lock returned 0x%08x, expected DD_OK\n", hr); - - base = desc.lpSurface; - ok(base[0] == 0x10, "Y data is 0x%02x, expected 0x10\n", base[0]); - base += desc.dwHeight * desc.lPitch; - todo_wine ok(base[0] == 0x20, "V data is 0x%02x, expected 0x20\n", base[0]); - base += desc.dwHeight / 4 * desc.lPitch; - todo_wine ok(base[0] == 0x30, "U data is 0x%02x, expected 0x30\n", base[0]); + /* VMware rejects YV12 blits. This behavior has not been seen on real hardware yet, so mark it broken */ + ok(hr == DD_OK || broken(hr == E_NOTIMPL), + "IDirectDrawSurface7_Blt returned 0x%08x, expected DD_OK\n", hr); - hr = IDirectDrawSurface7_Unlock(dst, NULL); - ok(hr == DD_OK, "IDirectDrawSurface7_Unlock returned 0x%08x, expected DD_OK\n", hr); + if (SUCCEEDED(hr)) + { + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + hr = IDirectDrawSurface7_Lock(dst, NULL, &desc, 0, NULL); + ok(hr == DD_OK, "IDirectDrawSurface7_Lock returned 0x%08x, expected DD_OK\n", hr); + + base = desc.lpSurface; + ok(base[0] == 0x10, "Y data is 0x%02x, expected 0x10\n", base[0]); + base += desc.dwHeight * desc.lPitch; + todo_wine ok(base[0] == 0x20, "V data is 0x%02x, expected 0x20\n", base[0]); + base += desc.dwHeight / 4 * desc.lPitch; + todo_wine ok(base[0] == 0x30, "U data is 0x%02x, expected 0x30\n", base[0]); + + hr = IDirectDrawSurface7_Unlock(dst, NULL); + ok(hr == DD_OK, "IDirectDrawSurface7_Unlock returned 0x%08x, expected DD_OK\n", hr); + } IDirectDrawSurface7_Release(dst); cleanup:

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
86
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 November 2011