wine-commits May 2014

wine-commits@winehq.org

2 participants
404 discussions

Hans Leidekker : wbemprox: No longer prefer native.
by Alexandre Julliard 13 May '14

13 May '14

Module: wine Branch: master Commit: e17276b5284d460bd05dcdb8ead360f8abb658c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e17276b5284d460bd05dcdb8e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 13 13:41:58 2014 +0200 wbemprox: No longer prefer native. --- dlls/wbemprox/main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wbemprox/main.c b/dlls/wbemprox/main.c index d1b08f1..e6ccd5c 100644 --- a/dlls/wbemprox/main.c +++ b/dlls/wbemprox/main.c @@ -118,8 +118,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hinstDLL; DisableThreadLibraryCalls(hinstDLL);

1 0

Hans Leidekker : wbemprox: Use a separate index variable to build the safearray in get_properties.
by Alexandre Julliard 13 May '14

13 May '14

Module: wine Branch: master Commit: 27b18a395b1c4caa0bdb2ec9e0175cccfbe9bf12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27b18a395b1c4caa0bdb2ec9e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 13 13:41:35 2014 +0200 wbemprox: Use a separate index variable to build the safearray in get_properties. --- dlls/wbemprox/query.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index c97b52b..b3a3eb9 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -963,12 +963,12 @@ HRESULT get_properties( const struct view *view, LONG flags, SAFEARRAY **props ) { SAFEARRAY *sa; BSTR str; - LONG i; - UINT num_props = count_selected_properties( view ); + UINT i, num_props = count_selected_properties( view ); + LONG j; if (!(sa = SafeArrayCreateVector( VT_BSTR, 0, num_props ))) return E_OUTOFMEMORY; - for (i = 0; i < view->table->num_cols; i++) + for (i = 0, j = 0; i < view->table->num_cols; i++) { BOOL is_system; @@ -980,12 +980,13 @@ HRESULT get_properties( const struct view *view, LONG flags, SAFEARRAY **props ) else if ((flags & WBEM_FLAG_SYSTEM_ONLY) && !is_system) continue; str = SysAllocString( view->table->columns[i].name ); - if (!str || SafeArrayPutElement( sa, &i, str ) != S_OK) + if (!str || SafeArrayPutElement( sa, &j, str ) != S_OK) { SysFreeString( str ); SafeArrayDestroy( sa ); return E_OUTOFMEMORY; } + j++; } *props = sa; return S_OK;

1 0

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8LobbiedApplication Initialize.
by Alexandre Julliard 13 May '14

13 May '14

Module: wine Branch: master Commit: d9ae2b828e6783cc02273bf9018e2ebba93778df URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9ae2b828e6783cc02273bf90… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 14 14:53:40 2014 +1100 dpnet: Implement IDirectPlay8LobbiedApplication Initialize. --- dlls/dpnet/dpnet_private.h | 9 +++++++-- dlls/dpnet/lobbiedapp.c | 16 +++++++++++++--- dlls/dpnet/tests/client.c | 28 ++++++++++++++++++++++++++-- dlls/dpnet/tests/peer.c | 32 ++++++++++++++++++++++++++++++-- 4 files changed, 76 insertions(+), 9 deletions(-) diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index af81474..8fd04d6 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -78,8 +78,13 @@ struct IDirectPlay8AddressImpl */ struct IDirectPlay8LobbiedApplicationImpl { - IDirectPlay8LobbiedApplication IDirectPlay8LobbiedApplication_iface; - LONG ref; + IDirectPlay8LobbiedApplication IDirectPlay8LobbiedApplication_iface; + LONG ref; + + PFNDPNMESSAGEHANDLER msghandler; + DWORD flags; + void *usercontext; + DPNHANDLE *connection; }; /***************************************************************************** diff --git a/dlls/dpnet/lobbiedapp.c b/dlls/dpnet/lobbiedapp.c index b430776..507a895 100644 --- a/dlls/dpnet/lobbiedapp.c +++ b/dlls/dpnet/lobbiedapp.c @@ -89,9 +89,19 @@ static HRESULT WINAPI IDirectPlay8LobbiedApplicationImpl_Initialize(IDirectPlay8 void * const pvUserContext, const PFNDPNMESSAGEHANDLER pfn, DPNHANDLE * const pdpnhConnection, const DWORD dwFlags) { - IDirectPlay8LobbiedApplicationImpl *This = impl_from_IDirectPlay8LobbiedApplication(iface); - FIXME("(%p): stub\n", This); - return DPN_OK; + IDirectPlay8LobbiedApplicationImpl *This = impl_from_IDirectPlay8LobbiedApplication(iface); + + TRACE("(%p)->(%p %p %p %x)\n", This, pvUserContext, pfn, pdpnhConnection, dwFlags); + + if(!pfn) + return DPNERR_INVALIDPOINTER; + + This->msghandler = pfn; + This->flags = dwFlags; + This->usercontext = pvUserContext; + This->connection = pdpnhConnection; + + return DPN_OK; } static HRESULT WINAPI IDirectPlay8LobbiedApplicationImpl_RegisterProgram(IDirectPlay8LobbiedApplication *iface, diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index bf0d26f..92bed55 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -21,10 +21,12 @@ #include <stdio.h> #include <dplay8.h> +#include <dplobby8.h> #include "wine/test.h" static IDirectPlay8Client* client = NULL; +static IDirectPlay8LobbiedApplication* lobbied = NULL; static const GUID appguid = { 0xcd0c3d4b, 0xe15e, 0x4cf2, { 0x9e, 0xa8, 0x6e, 0x1d, 0x65, 0x48, 0xc5, 0xa5 } }; static HRESULT WINAPI DirectPlayMessageHandler(PVOID context, DWORD message_id, PVOID buffer) @@ -33,10 +35,17 @@ static HRESULT WINAPI DirectPlayMessageHandler(PVOID context, DWORD message_id, return S_OK; } +static HRESULT WINAPI DirectPlayLobbyMessageHandler(PVOID context, DWORD message_id, PVOID buffer) +{ + trace("DirectPlayLobbyMessageHandler: 0x%08x\n", message_id); + return S_OK; +} + static BOOL test_init_dp(void) { HRESULT hr; DPN_SP_CAPS caps; + DPNHANDLE lobbyConnection; hr = CoInitialize(0); ok(hr == S_OK, "CoInitialize failed with %x\n", hr); @@ -56,6 +65,14 @@ static BOOL test_init_dp(void) hr = IDirectPlay8Client_Initialize(client, NULL, DirectPlayMessageHandler, 0); ok(hr == S_OK, "IDirectPlay8Client_Initialize failed with %x\n", hr); + hr = CoCreateInstance(&CLSID_DirectPlay8LobbiedApplication, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectPlay8LobbiedApplication, (void **)&lobbied); + ok(hr == S_OK, "CoCreateInstance failed with 0x%x\n", hr); + + hr = IDirectPlay8LobbiedApplication_Initialize(lobbied, NULL, DirectPlayLobbyMessageHandler, + &lobbyConnection, 0); + ok(hr == S_OK, "IDirectPlay8LobbiedApplication_Initialize failed with %x\n", hr); + return client != NULL; } @@ -195,8 +212,15 @@ static void test_cleanup_dp(void) hr = IDirectPlay8Client_Close(client, 0); ok(hr == S_OK, "IDirectPlay8Client_Close failed with %x\n", hr); - hr = IDirectPlay8Client_Release(client); - ok(hr == S_OK, "IDirectPlay8Client_Release failed with %x\n", hr); + if(lobbied) + { + hr = IDirectPlay8LobbiedApplication_Close(lobbied, 0); + ok(hr == S_OK, "IDirectPlay8LobbiedApplication_Close failed with %x\n", hr); + + IDirectPlay8LobbiedApplication_Release(lobbied); + } + + IDirectPlay8Client_Release(client); CoUninitialize(); } diff --git a/dlls/dpnet/tests/peer.c b/dlls/dpnet/tests/peer.c index 670b843..1fec1f2 100644 --- a/dlls/dpnet/tests/peer.c +++ b/dlls/dpnet/tests/peer.c @@ -20,10 +20,12 @@ #include <stdio.h> #include <dplay8.h> +#include <dplobby8.h> #include "wine/test.h" static IDirectPlay8Peer* peer = NULL; +static IDirectPlay8LobbiedApplication* lobbied = NULL; static HRESULT WINAPI DirectPlayMessageHandler(PVOID context, DWORD message_id, PVOID buffer) { @@ -31,10 +33,17 @@ static HRESULT WINAPI DirectPlayMessageHandler(PVOID context, DWORD message_id, return S_OK; } +static HRESULT WINAPI DirectPlayLobbyMessageHandler(PVOID context, DWORD message_id, PVOID buffer) +{ + trace("DirectPlayLobbyMessageHandler: 0x%08x\n", message_id); + return S_OK; +} + static void test_init_dp(void) { HRESULT hr; DPN_SP_CAPS caps; + DPNHANDLE lobbyConnection; hr = CoInitialize(0); ok(hr == S_OK, "CoInitialize failed with %x\n", hr); @@ -53,6 +62,18 @@ static void test_init_dp(void) hr = IDirectPlay8Peer_Initialize(peer, NULL, DirectPlayMessageHandler, 0); ok(hr == S_OK, "IDirectPlay8Peer_Initialize failed with %x\n", hr); + + hr = CoCreateInstance(&CLSID_DirectPlay8LobbiedApplication, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectPlay8LobbiedApplication, (void **)&lobbied); + ok(hr == S_OK, "CoCreateInstance failed with 0x%x\n", hr); + + hr = IDirectPlay8LobbiedApplication_Initialize(lobbied, NULL, NULL, + &lobbyConnection, 0); + ok(hr == DPNERR_INVALIDPOINTER, "Failed with %x\n", hr); + + hr = IDirectPlay8LobbiedApplication_Initialize(lobbied, NULL, DirectPlayLobbyMessageHandler, + &lobbyConnection, 0); + ok(hr == S_OK, "IDirectPlay8LobbiedApplication_Initialize failed with %x\n", hr); } static void test_enum_service_providers(void) @@ -198,8 +219,15 @@ static void test_cleanup_dp(void) hr = IDirectPlay8Peer_Close(peer, 0); ok(hr == S_OK, "IDirectPlay8Peer_Close failed with %x\n", hr); - hr = IDirectPlay8Peer_Release(peer); - ok(hr == S_OK, "IDirectPlay8Peer_Release failed with %x\n", hr); + if(lobbied) + { + hr = IDirectPlay8LobbiedApplication_Close(lobbied, 0); + ok(hr == S_OK, "IDirectPlay8LobbiedApplication_Close failed with %x\n", hr); + + IDirectPlay8LobbiedApplication_Release(lobbied); + } + + IDirectPlay8Peer_Release(peer); CoUninitialize(); }

1 0

Alexandre Julliard : ntdll: Determine the mapping type automatically from the WRITECOPY flag.
by Alexandre Julliard 13 May '14

13 May '14

Module: wine Branch: master Commit: 2cef8dbcc29739278037e6409e0a00a4fa8dc0d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cef8dbcc29739278037e6409… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 13 12:28:58 2014 +0200 ntdll: Determine the mapping type automatically from the WRITECOPY flag. --- dlls/ntdll/virtual.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 70dea5a..4819d2d 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -854,10 +854,11 @@ done: * The csVirtual section must be held by caller. */ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start, size_t size, - off_t offset, unsigned int vprot, int flags, BOOL removable ) + off_t offset, unsigned int vprot, BOOL removable ) { void *ptr; int prot = VIRTUAL_GetUnixProt( vprot | VPROT_COMMITTED /* make sure it is accessible */ ); + unsigned int flags = MAP_FIXED | ((vprot & VPROT_WRITECOPY) ? MAP_PRIVATE : MAP_SHARED); assert( start < view->size ); assert( start + size <= view->size ); @@ -872,7 +873,7 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start /* only try mmap if media is not removable (or if we require write access) */ if (!removable || (flags & MAP_SHARED)) { - if (mmap( (char *)view->base + start, size, prot, flags | MAP_FIXED, fd, offset ) != (void *)-1) + if (mmap( (char *)view->base + start, size, prot, flags, fd, offset ) != (void *)-1) goto done; if ((errno == EPERM) && (prot & PROT_EXEC)) @@ -1094,7 +1095,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz if (!st.st_size) goto error; header_size = min( header_size, st.st_size ); if (map_file_into_view( view, fd, 0, header_size, 0, VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, - MAP_PRIVATE, !dup_mapping ) != STATUS_SUCCESS) goto error; + !dup_mapping ) != STATUS_SUCCESS) goto error; dos = (IMAGE_DOS_HEADER *)ptr; nt = (IMAGE_NT_HEADERS *)(ptr + dos->e_lfanew); header_end = ptr + ROUND_SIZE( 0, header_size ); @@ -1118,8 +1119,8 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz /* unaligned sections, this happens for native subsystem binaries */ /* in that case Windows simply maps in the whole file */ - if (map_file_into_view( view, fd, 0, total_size, 0, VPROT_COMMITTED | VPROT_READ, - MAP_PRIVATE, !dup_mapping ) != STATUS_SUCCESS) goto error; + if (map_file_into_view( view, fd, 0, total_size, 0, VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, + !dup_mapping ) != STATUS_SUCCESS) goto error; /* check that all sections are loaded at the right offset */ if (nt->OptionalHeader.FileAlignment != nt->OptionalHeader.SectionAlignment) goto error; @@ -1172,8 +1173,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz sec->PointerToRawData, (int)pos, file_size, map_size, sec->Characteristics ); if (map_file_into_view( view, shared_fd, sec->VirtualAddress, map_size, pos, - VPROT_COMMITTED | VPROT_READ | VPROT_WRITE, - MAP_SHARED, FALSE ) != STATUS_SUCCESS) + VPROT_COMMITTED | VPROT_READ | VPROT_WRITE, FALSE ) != STATUS_SUCCESS) { ERR_(module)( "Could not map shared section %.8s\n", sec->Name ); goto error; @@ -1189,8 +1189,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz if (end > base) map_file_into_view( view, shared_fd, base, end - base, pos + (base - sec->VirtualAddress), - VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, - MAP_PRIVATE, FALSE ); + VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, FALSE ); } pos += map_size; continue; @@ -1212,7 +1211,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz end < file_start || map_file_into_view( view, fd, sec->VirtualAddress, file_size, file_start, VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, - MAP_PRIVATE, !dup_mapping ) != STATUS_SUCCESS) + !dup_mapping ) != STATUS_SUCCESS) { ERR_(module)( "Could not map section %.8s, file probably truncated\n", sec->Name ); goto error; @@ -2627,8 +2626,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p TRACE("handle=%p size=%lx offset=%x%08x\n", handle, size, offset.u.HighPart, offset.u.LowPart ); - res = map_file_into_view( view, unix_handle, 0, size, offset.QuadPart, vprot, - (vprot & VPROT_WRITECOPY) ? MAP_PRIVATE : MAP_SHARED, !dup_mapping ); + res = map_file_into_view( view, unix_handle, 0, size, offset.QuadPart, vprot, !dup_mapping ); if (res == STATUS_SUCCESS) { *addr_ptr = view->base;

1 0

Jacek Caban : ntdll: Use MAP_PRIVATE for copy on write mappings.
by Alexandre Julliard 13 May '14

13 May '14

Module: wine Branch: master Commit: 5ceb22714e965692acf2b0ec9af0dabc5dfc8b4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ceb22714e965692acf2b0ec9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 13 12:02:48 2014 +0200 ntdll: Use MAP_PRIVATE for copy on write mappings. --- dlls/kernel32/tests/virtual.c | 17 +++++++++++------ dlls/ntdll/virtual.c | 3 ++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 174d422..0955d30 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -2489,7 +2489,7 @@ static void test_shared_memory(BOOL is_child) CloseHandle(mapping); } -static void test_shared_memory_ro(BOOL is_child) +static void test_shared_memory_ro(BOOL is_child, DWORD child_access) { HANDLE mapping; LONG *p; @@ -2501,7 +2501,7 @@ static void test_shared_memory_ro(BOOL is_child) ok(GetLastError() == ERROR_ALREADY_EXISTS, "expected ERROR_ALREADY_EXISTS, got %d\n", GetLastError()); SetLastError(0xdeadbef); - p = MapViewOfFile(mapping, FILE_MAP_READ | (is_child ? FILE_MAP_WRITE : 0), 0, 0, 4096); + p = MapViewOfFile(mapping, is_child ? child_access : FILE_MAP_READ, 0, 0, 4096); ok(p != NULL, "MapViewOfFile error %d\n", GetLastError()); if (is_child) @@ -2517,14 +2517,17 @@ static void test_shared_memory_ro(BOOL is_child) DWORD ret; winetest_get_mainargs(&argv); - sprintf(cmdline, "\"%s\" virtual sharedmemro", argv[0]); + sprintf(cmdline, "\"%s\" virtual sharedmemro %x", argv[0], child_access); ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); winetest_wait_child_process(pi.hProcess); CloseHandle(pi.hThread); CloseHandle(pi.hProcess); - ok(*p == 0xdeadbeef, "*p = %x, expected 0xdeadbeef\n", *p); + if(child_access & FILE_MAP_WRITE) + ok(*p == 0xdeadbeef, "*p = %x, expected 0xdeadbeef\n", *p); + else + ok(!*p, "*p = %x, expected 0\n", *p); } UnmapViewOfFile(p); @@ -2551,7 +2554,7 @@ START_TEST(virtual) } if (!strcmp(argv[2], "sharedmemro")) { - test_shared_memory_ro(TRUE); + test_shared_memory_ro(TRUE, strtol(argv[3], NULL, 16)); return; } while (1) @@ -2580,7 +2583,9 @@ START_TEST(virtual) pNtUnmapViewOfSection = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtUnmapViewOfSection"); test_shared_memory(FALSE); - test_shared_memory_ro(FALSE); + test_shared_memory_ro(FALSE, FILE_MAP_READ|FILE_MAP_WRITE); + test_shared_memory_ro(FALSE, FILE_MAP_COPY); + test_shared_memory_ro(FALSE, FILE_MAP_COPY|FILE_MAP_WRITE); test_mapping(); test_CreateFileMapping_protection(); test_VirtualAlloc_protection(); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index d9acac6..70dea5a 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2627,7 +2627,8 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p TRACE("handle=%p size=%lx offset=%x%08x\n", handle, size, offset.u.HighPart, offset.u.LowPart ); - res = map_file_into_view( view, unix_handle, 0, size, offset.QuadPart, vprot, MAP_SHARED, !dup_mapping ); + res = map_file_into_view( view, unix_handle, 0, size, offset.QuadPart, vprot, + (vprot & VPROT_WRITECOPY) ? MAP_PRIVATE : MAP_SHARED, !dup_mapping ); if (res == STATUS_SUCCESS) { *addr_ptr = view->base;

1 0

Nikolay Sivov : msxml3: Implement empty tagname case of getElementsByTagName() for document.
by Alexandre Julliard 13 May '14

13 May '14

Module: wine Branch: master Commit: 82bb4f51c160fe0aabe25765478757481ee5ed81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82bb4f51c160fe0aabe257654… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 13 12:49:05 2014 +0400 msxml3: Implement empty tagname case of getElementsByTagName() for document. --- dlls/msxml3/domdoc.c | 6 +++++ dlls/msxml3/tests/domdoc.c | 63 ++++++++++++++++++++------------------------ 2 files changed, 34 insertions(+), 35 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index e981b94..2244172 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1846,12 +1846,18 @@ static HRESULT WINAPI domdoc_createEntityReference( xmlChar* tagName_to_XPath(const BSTR tagName) { xmlChar *query, *tmp; + static const xmlChar everything[] = "/descendant::node()"; static const xmlChar mod_pre[] = "*[local-name()='"; static const xmlChar mod_post[] = "']"; static const xmlChar prefix[] = "descendant::"; const WCHAR *tokBegin, *tokEnd; int len; + /* Special case - empty tagname - means select all nodes, + except document itself. */ + if (!*tagName) + return xmlStrdup(everything); + query = xmlStrdup(prefix); tokBegin = tagName; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index b028996..2b877a7 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3013,8 +3013,24 @@ static void test_create(void) IXMLDOMDocument_Release( doc ); } +struct queryresult_t { + const char *query; + const char *result; + int len; +}; + +static const struct queryresult_t elementsbytagname[] = { + { "", "P1.D1 E2.D1 E1.E2.D1 T1.E1.E2.D1 E2.E2.D1 T1.E2.E2.D1 E3.E2.D1 E4.E2.D1 E1.E4.E2.D1 T1.E1.E4.E2.D1", 10 }, + { "*", "E2.D1 E1.E2.D1 E2.E2.D1 E3.E2.D1 E4.E2.D1 E1.E4.E2.D1", 6 }, + { "bs", "E1.E2.D1", 1 }, + { "dl", "", 0 }, + { "str1","", 0 }, + { NULL } +}; + static void test_getElementsByTagName(void) { + const struct queryresult_t *ptr = elementsbytagname; IXMLDOMNodeList *node_list; IXMLDOMDocument *doc; IXMLDOMElement *elem; @@ -3035,17 +3051,21 @@ static void test_getElementsByTagName(void) /* null arguments cases */ r = IXMLDOMDocument_getElementsByTagName(doc, NULL, &node_list); ok( r == E_INVALIDARG, "ret %08x\n", r ); - r = IXMLDOMDocument_getElementsByTagName(doc, str, NULL); + r = IXMLDOMDocument_getElementsByTagName(doc, _bstr_("*"), NULL); ok( r == E_INVALIDARG, "ret %08x\n", r ); - r = IXMLDOMDocument_getElementsByTagName(doc, str, &node_list); - ok( r == S_OK, "ret %08x\n", r ); - r = IXMLDOMNodeList_get_length( node_list, &len ); - ok( r == S_OK, "ret %08x\n", r ); - ok( len == 6, "len %d\n", len ); + while (ptr->query) + { + r = IXMLDOMDocument_getElementsByTagName(doc, _bstr_(ptr->query), &node_list); + ok(r == S_OK, "ret %08x\n", r); + r = IXMLDOMNodeList_get_length(node_list, &len); + ok(r == S_OK, "ret %08x\n", r); + ok(len == ptr->len, "%s: got len %d, expected %d\n", ptr->query, len, ptr->len); + expect_list_and_release(node_list, ptr->result); - IXMLDOMNodeList_Release( node_list ); - SysFreeString( str ); + free_bstrs(); + ptr++; + } /* broken query BSTR */ memcpy(&buff[2], szstar, sizeof(szstar)); @@ -3058,33 +3078,6 @@ static void test_getElementsByTagName(void) ok( len == 6, "len %d\n", len ); IXMLDOMNodeList_Release( node_list ); - str = SysAllocString( szbs ); - r = IXMLDOMDocument_getElementsByTagName(doc, str, &node_list); - ok( r == S_OK, "ret %08x\n", r ); - r = IXMLDOMNodeList_get_length( node_list, &len ); - ok( r == S_OK, "ret %08x\n", r ); - ok( len == 1, "len %d\n", len ); - IXMLDOMNodeList_Release( node_list ); - SysFreeString( str ); - - str = SysAllocString( szdl ); - r = IXMLDOMDocument_getElementsByTagName(doc, str, &node_list); - ok( r == S_OK, "ret %08x\n", r ); - r = IXMLDOMNodeList_get_length( node_list, &len ); - ok( r == S_OK, "ret %08x\n", r ); - ok( len == 0, "len %d\n", len ); - IXMLDOMNodeList_Release( node_list ); - SysFreeString( str ); - - str = SysAllocString( szstr1 ); - r = IXMLDOMDocument_getElementsByTagName(doc, str, &node_list); - ok( r == S_OK, "ret %08x\n", r ); - r = IXMLDOMNodeList_get_length( node_list, &len ); - ok( r == S_OK, "ret %08x\n", r ); - ok( len == 0, "len %d\n", len ); - IXMLDOMNodeList_Release( node_list ); - SysFreeString( str ); - /* test for element */ r = IXMLDOMDocument_get_documentElement(doc, &elem); ok( r == S_OK, "ret %08x\n", r );

1 0

Nikolay Sivov : msxml3: Support 'any attribute' selection [@*] in XSLPattern predicates.
by Alexandre Julliard 13 May '14

13 May '14

Module: wine Branch: master Commit: 239d8077db6e9ebf9f2b3eda31e1733e30d40143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=239d8077db6e9ebf9f2b3eda3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 13 00:20:21 2014 +0400 msxml3: Support 'any attribute' selection [@*] in XSLPattern predicates. --- dlls/msxml3/tests/domdoc.c | 27 ++++++++++++++++++++------- dlls/msxml3/xslpattern.y | 5 +++++ 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 19b2951..b028996 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -494,7 +494,7 @@ static const char szExampleXML[] = " </description>\n" " </elem>\n" "\n" -" <elem>\n" +" <elem a='a'>\n" " <a>A2 field</a>\n" " <b>B2 field</b>\n" " <c type=\"old\">C2 field</c>\n" @@ -1074,14 +1074,16 @@ static char *list_to_string(IXMLDOMNodeList *list) static char buf[4096]; char *pos = buf; LONG len = 0; + HRESULT hr; int i; if (list == NULL) { - lstrcpyA(buf, "(null)"); + strcpy(buf, "(null)"); return buf; } - ole_check(IXMLDOMNodeList_get_length(list, &len)); + hr = IXMLDOMNodeList_get_length(list, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); for (i = 0; i < len; i++) { IXMLDOMNode *node; @@ -4449,12 +4451,13 @@ static const xpath_test_t xpath_test[] = { { "child::node()", "E1.E2.D1 E2.E2.D1 E3.E2.D1 E4.E2.D1" }, { "child::text()", "" }, { "child::*/..", "E2.D1" }, - { "child::*//@*/..", "E2.E5.E1.E2.D1 E3.E2.E2.D1" }, + { "child::*//@*/..", "E2.E5.E1.E2.D1 E2.E2.D1 E3.E2.E2.D1" }, { "self::node()", "E2.D1" }, { "ancestor::node()", "D1" }, { "elem[c][last()]/a", "E1.E2.E2.D1"}, { "ancestor-or-self::node()[1]", "E2.D1" }, { "((//a)[1])[last()]", "E1.E1.E2.D1" }, + { "//elem[@*]", "E2.E2.D1" }, { NULL } }; @@ -4517,7 +4520,7 @@ static void test_XPath(void) str = list_to_string(list); - ok(strcmp(str, xptest->list)==0, "query=%s, invalid node list: %s, expected %s\n", + ok(!strcmp(str, xptest->list), "query=%s, invalid node list: \"%s\", expected \"%s\"\n", xptest->query, str, xptest->list); if (list) @@ -6838,6 +6841,7 @@ static void test_default_properties(void) typedef struct { const char *query; const char *list; + BOOL todo; } xslpattern_test_t; static const xslpattern_test_t xslpattern_test[] = { @@ -6900,6 +6904,7 @@ static const xslpattern_test_t xslpattern_test[] = { { "root/elem[index()>0 $and$ $not$ end()]", "E2.E2.D1 E3.E2.D1" }, { "root/elem[index()>0 && $not$ end()]", "E2.E2.D1 E3.E2.D1" }, { "root/elem[d]", "E1.E2.D1 E2.E2.D1 E4.E2.D1" }, + { "root/elem[@*]", "E2.E2.D1 E3.E2.D1", TRUE }, { NULL } }; @@ -6977,8 +6982,16 @@ static void test_XSLPattern(void) len = 0; hr = IXMLDOMNodeList_get_length(list, &len); ok(len != 0, "query=%s, empty list\n", ptr->query); - if (len) - expect_list_and_release(list, ptr->list); + if (len) { + if (ptr->todo) { + char *str = list_to_string(list); + todo_wine + ok(!strcmp(str, ptr->list), "Invalid node list: %s, expected %s\n", str, ptr->list); + IXMLDOMNodeList_Release(list); + } + else + expect_list_and_release(list, ptr->list); + } ptr++; } diff --git a/dlls/msxml3/xslpattern.y b/dlls/msxml3/xslpattern.y index 4e3b699..9adb318 100644 --- a/dlls/msxml3/xslpattern.y +++ b/dlls/msxml3/xslpattern.y @@ -186,6 +186,11 @@ static void xslpattern_error(parser_param* param, void const* scanner, char cons $$=xmlStrcat($$,$2); xmlFree($2); } + | '@' '*' + { + TRACE("Got All attributes pattern: \"@*\"\n"); + $$=xmlStrdup(U("@*")); + } ; /* [2.3] Node Tests */

1 0

Huw Davies : msxml3/tests: Don' t test the variant payload for the VT_EMPTY type.
by Alexandre Julliard 13 May '14

13 May '14

Module: wine Branch: master Commit: 9e3d103dcbe76038bcdb708e299639c3446b851f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e3d103dcbe76038bcdb708e2… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 13 09:20:51 2014 +0100 msxml3/tests: Don't test the variant payload for the VT_EMPTY type. --- dlls/msxml3/tests/httpreq.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index b82de03..68de61e 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -1457,14 +1457,12 @@ static void test_XMLHTTP(void) hr = IXMLHttpRequest_get_responseBody(xhr, &varbody); EXPECT_HR(hr, E_PENDING); ok(V_VT(&varbody) == VT_EMPTY, "got type %d\n", V_VT(&varbody)); - ok(V_I2(&varbody) == 1, "got %d\n", V_I2(&varbody)); V_VT(&varbody) = VT_I2; V_I2(&varbody) = 1; hr = IXMLHttpRequest_get_responseStream(xhr, &varbody); EXPECT_HR(hr, E_PENDING); ok(V_VT(&varbody) == VT_EMPTY, "got type %d\n", V_VT(&varbody)); - ok(V_I2(&varbody) == 1, "got %d\n", V_I2(&varbody)); /* send before open */ hr = IXMLHttpRequest_send(xhr, dummy);

1 0

Huw Davies : msxml3/tests: Fix a failing test on win 8.
by Alexandre Julliard 13 May '14

13 May '14

Module: wine Branch: master Commit: 8335335c1d4e1974064603573fe2e253135510cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8335335c1d4e1974064603573… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 13 09:20:50 2014 +0100 msxml3/tests: Fix a failing test on win 8. --- dlls/msxml3/tests/schema.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 1145bd5..484be86 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -1522,7 +1522,7 @@ static void test_get(void) EXPECT_HR(hr, E_NOTIMPL); hr = IXMLDOMSchemaCollection2_get(cache, _bstr_("uri"), &node); - EXPECT_HR(hr, E_NOTIMPL); + ok(hr == E_NOTIMPL || hr == E_POINTER /* win8 */, "got %08x\n", hr); IXMLDOMSchemaCollection2_Release(cache);

1 0

Huw Davies : msxml3/tests: Don' t test the values of alignment holes in the variant structure.
by Alexandre Julliard 13 May '14

13 May '14

Module: wine Branch: master Commit: 25e5daf87232c041bdb991fea5f4c17f9ca7bb04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25e5daf87232c041bdb991fea… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 13 09:20:49 2014 +0100 msxml3/tests: Don't test the values of alignment holes in the variant structure. --- dlls/msxml3/tests/schema.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 658b0d7..1145bd5 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -1275,24 +1275,20 @@ static void test_XDR_datatypes(void) while (ptr->query) { IXMLDOMNode* node = NULL; - VARIANT type, testv; + VARIANT type; /* check data types without the schema */ - memset(&testv, -1, sizeof(VARIANT)); - V_VT(&testv) = VT_NULL; - V_BSTR(&testv) = NULL; - hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_(ptr->query), &node); EXPECT_HR(hr, S_OK); ok(node != NULL, "expected node\n"); - memset(&type, -1, sizeof(VARIANT)); V_VT(&type) = VT_EMPTY; + V_BSTR(&type) = (void*)-1; hr = IXMLDOMNode_get_dataType(node, &type); EXPECT_HR(hr, S_FALSE); ok(V_VT(&type) == VT_NULL, "got type %i\n", V_VT(&type)); /* when returning VT_NULL, the pointer is set to NULL */ - ok(!memcmp(&testv, &type, sizeof(VARIANT)), "got %p\n", V_BSTR(&type)); + ok(V_BSTR(&type) == NULL, "got %p\n", V_BSTR(&type)); VariantClear(&type); hr = IXMLDOMNode_get_nodeTypedValue(node, &type);

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
41
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 May 2014