wine-commits October 2014

wine-commits@winehq.org

2 participants
397 discussions

Alexandre Julliard : Import of upstream bugzilla release 4.4.6.
by Alexandre Julliard 07 Oct '14

07 Oct '14

1 0

Alexandre Julliard : Merge branch 'upstream'.
by Alexandre Julliard 07 Oct '14

07 Oct '14

Module: bugzilla Branch: master Commit: 4aa9cb17e1cb97fcef476441f57687ca7c0a67ca URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=4aa9cb17e1cb97fcef476… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 7 17:14:08 2014 +0200 Merge branch 'upstream'. ---

1 0

Alexandre Julliard : Import of upstream bugzilla release 4.4.6.
by Alexandre Julliard 07 Oct '14

07 Oct '14

1 0

Henri Verbeet : ws2_32: Return WSAEINVAL if "out_size" is smaller than the minimum size for SIO_ADDRESS_LIST_QUERY.
by Alexandre Julliard 06 Oct '14

06 Oct '14

Module: wine Branch: master Commit: b914a6461b7700374f4f49ec16c556bfc1bda8f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b914a6461b7700374f4f49ec1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 3 09:19:22 2014 +0200 ws2_32: Return WSAEINVAL if "out_size" is smaller than the minimum size for SIO_ADDRESS_LIST_QUERY. --- dlls/ws2_32/socket.c | 7 +++++++ dlls/ws2_32/tests/sock.c | 12 ++++++++++++ 2 files changed, 19 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 75cf0f0..98ed686 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3937,6 +3937,13 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID return SOCKET_ERROR; } + if (out_size && out_size < FIELD_OFFSET(SOCKET_ADDRESS_LIST, Address[0])) + { + *ret_size = 0; + WSASetLastError(WSAEINVAL); + return SOCKET_ERROR; + } + if (GetAdaptersInfo(NULL, &size) == ERROR_BUFFER_OVERFLOW) { IP_ADAPTER_INFO *p, *table = HeapAlloc(GetProcessHeap(), 0, size); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 4c93358..1d61f9a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7498,6 +7498,18 @@ static void test_address_list_query(void) ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); ok(WSAGetLastError() == WSAEFAULT, "Got unexpected error %d.\n", WSAGetLastError()); + bytes_returned = 0xdeadbeef; + ret = WSAIoctl(s, SIO_ADDRESS_LIST_QUERY, NULL, 0, address_list, 1, &bytes_returned, NULL, NULL); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + ok(WSAGetLastError() == WSAEINVAL, "Got unexpected error %d.\n", WSAGetLastError()); + ok(bytes_returned == 0, "Got unexpected bytes_returned %u.\n", bytes_returned); + + ret = WSAIoctl(s, SIO_ADDRESS_LIST_QUERY, NULL, 0, address_list, + FIELD_OFFSET(SOCKET_ADDRESS_LIST, Address[0]), &bytes_returned, NULL, NULL); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + ok(WSAGetLastError() == WSAEFAULT, "Got unexpected error %d.\n", WSAGetLastError()); + ok(bytes_returned == size, "Got unexpected bytes_returned %u, expected %u.\n", bytes_returned, size); + HeapFree(GetProcessHeap(), 0, address_list); closesocket(s); }

1 0

Henri Verbeet : ws2_32: Return the needed buffer size for SIO_ADDRESS_LIST_QUERY.
by Alexandre Julliard 06 Oct '14

06 Oct '14

Module: wine Branch: master Commit: 4e6ebd633ac19d8ffcfdf3452a86b711d49a134c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e6ebd633ac19d8ffcfdf3452… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 3 09:19:21 2014 +0200 ws2_32: Return the needed buffer size for SIO_ADDRESS_LIST_QUERY. --- dlls/ws2_32/socket.c | 1 + dlls/ws2_32/tests/sock.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d78d9cd..75cf0f0 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3957,6 +3957,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID if (total > out_size) { + *ret_size = total; HeapFree(GetProcessHeap(), 0, table); status = WSAEFAULT; break; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8a9cbba..4c93358 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7462,6 +7462,46 @@ static void test_completion_port(void) CloseHandle(previous_port); } +static void test_address_list_query(void) +{ + SOCKET_ADDRESS_LIST *address_list; + DWORD bytes_returned, size; + unsigned int i; + SOCKET s; + int ret; + + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(s != INVALID_SOCKET, "Failed to create socket, error %d.\n", WSAGetLastError()); + + bytes_returned = 0; + ret = WSAIoctl(s, SIO_ADDRESS_LIST_QUERY, NULL, 0, NULL, 0, &bytes_returned, NULL, NULL); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + ok(WSAGetLastError() == WSAEFAULT, "Got unexpected error %d.\n", WSAGetLastError()); + ok(bytes_returned >= FIELD_OFFSET(SOCKET_ADDRESS_LIST, Address[0]), + "Got unexpected bytes_returned %u.\n", bytes_returned); + + size = bytes_returned; + bytes_returned = 0; + address_list = HeapAlloc(GetProcessHeap(), 0, size * 2); + ret = WSAIoctl(s, SIO_ADDRESS_LIST_QUERY, NULL, 0, address_list, size * 2, &bytes_returned, NULL, NULL); + ok(!ret, "Got unexpected ret %d, error %d.\n", ret, WSAGetLastError()); + ok(bytes_returned == size, "Got unexpected bytes_returned %u, expected %u.\n", bytes_returned, size); + + bytes_returned = FIELD_OFFSET(SOCKET_ADDRESS_LIST, Address[address_list->iAddressCount]); + for (i = 0; i < address_list->iAddressCount; ++i) + { + bytes_returned += address_list->Address[i].iSockaddrLength; + } + ok(size == bytes_returned, "Got unexpected size %u, expected %u.\n", size, bytes_returned); + + ret = WSAIoctl(s, SIO_ADDRESS_LIST_QUERY, NULL, 0, address_list, size, NULL, NULL, NULL); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + ok(WSAGetLastError() == WSAEFAULT, "Got unexpected error %d.\n", WSAGetLastError()); + + HeapFree(GetProcessHeap(), 0, address_list); + closesocket(s); +} + static DWORD WINAPI inet_ntoa_thread_proc(void *param) { ULONG addr; @@ -7739,6 +7779,7 @@ START_TEST( sock ) test_WSAAsyncGetServByName(); test_completion_port(); + test_address_list_query(); /* this is an io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send();

1 0

Jacek Caban : ieframe: Return some verbs in IEnumOLEVERB:Next.
by Alexandre Julliard 06 Oct '14

06 Oct '14

Module: wine Branch: master Commit: 2bcbbea53428ffb64295641175701900a911b756 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bcbbea53428ffb6429564117… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 6 15:26:53 2014 +0200 ieframe: Return some verbs in IEnumOLEVERB:Next. --- dlls/ieframe/oleobject.c | 16 +++++++++++++- dlls/ieframe/tests/webbrowser.c | 49 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 62 insertions(+), 3 deletions(-) diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 0bcf163..d611231 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -292,8 +292,8 @@ static void release_client_site(WebBrowser *This) typedef struct { IEnumOLEVERB IEnumOLEVERB_iface; - LONG ref; + LONG iter; } EnumOLEVERB; static inline EnumOLEVERB *impl_from_IEnumOLEVERB(IEnumOLEVERB *iface) @@ -348,10 +348,20 @@ static HRESULT WINAPI EnumOLEVERB_Next(IEnumOLEVERB *iface, ULONG celt, OLEVERB { EnumOLEVERB *This = impl_from_IEnumOLEVERB(iface); + static const OLEVERB verbs[] = + {{OLEIVERB_PRIMARY},{OLEIVERB_INPLACEACTIVATE},{OLEIVERB_UIACTIVATE},{OLEIVERB_SHOW},{OLEIVERB_HIDE}}; + TRACE("(%p)->(%u %p %p)\n", This, celt, rgelt, pceltFetched); + /* There are a few problems with this implementation, but that's how it seems to work in native. See tests. */ if(pceltFetched) *pceltFetched = 0; + + if(This->iter == sizeof(verbs)/sizeof(*verbs)) + return S_FALSE; + + if(celt) + *rgelt = verbs[This->iter++]; return S_OK; } @@ -365,7 +375,10 @@ static HRESULT WINAPI EnumOLEVERB_Skip(IEnumOLEVERB *iface, ULONG celt) static HRESULT WINAPI EnumOLEVERB_Reset(IEnumOLEVERB *iface) { EnumOLEVERB *This = impl_from_IEnumOLEVERB(iface); + TRACE("(%p)\n", This); + + This->iter = 0; return S_OK; } @@ -599,6 +612,7 @@ static HRESULT WINAPI OleObject_EnumVerbs(IOleObject *iface, IEnumOLEVERB **ppEn ret->IEnumOLEVERB_iface.lpVtbl = &EnumOLEVERBVtbl; ret->ref = 1; + ret->iter = 0; *ppEnumOleVerb = &ret->IEnumOLEVERB_iface; return S_OK; diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 27598cf..5973900 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -1997,6 +1997,30 @@ static void test_ClassInfo(IWebBrowser2 *unk) IProvideClassInfo2_Release(class_info); } +#define expect_oleverb(a,b) _expect_oleverb(__LINE__,a,b) +static void _expect_oleverb(unsigned line, const OLEVERB *verb, LONG exverb) +{ + ok_(__FILE__,line)(verb->lVerb == exverb, "verb->lVerb = %d, expected %d\n", verb->lVerb, exverb); + ok_(__FILE__,line)(!verb->lpszVerbName, "verb->lpszVerbName = %s\n", wine_dbgstr_w(verb->lpszVerbName)); + ok_(__FILE__,line)(!verb->fuFlags, "verb->fuFlags = %x\n", verb->fuFlags); + ok_(__FILE__,line)(!verb->grfAttribs, "verb->grfAttribs = %x\n", verb->grfAttribs); +} + +#define test_next_oleverb(a,b) _test_next_oleverb(__LINE__,a,b) +static void _test_next_oleverb(unsigned line, IEnumOLEVERB *enum_verbs, LONG exverb) +{ + ULONG fetched = 0xdeadbeef; + OLEVERB verb; + HRESULT hres; + + fetched = 0xdeadbeef; + memset(&verb, 0xa, sizeof(verb)); + hres = IEnumOLEVERB_Next(enum_verbs, 1, &verb, &fetched); + ok_(__FILE__,line)(hres == S_OK, "Next failed: %08x\n", hres); + ok_(__FILE__,line)(!fetched, "fetched = %d\n", fetched); + _expect_oleverb(line, &verb, exverb); +} + static void test_EnumVerbs(IWebBrowser2 *wb) { IEnumOLEVERB *enum_verbs; @@ -2014,13 +2038,32 @@ static void test_EnumVerbs(IWebBrowser2 *wb) ok(enum_verbs != NULL, "enum_verbs == NULL\n"); fetched = 0xdeadbeef; + memset(verbs, 0xa, sizeof(verbs)); + verbs[1].lVerb = 0xdeadbeef; hres = IEnumOLEVERB_Next(enum_verbs, sizeof(verbs)/sizeof(*verbs), verbs, &fetched); ok(hres == S_OK, "Next failed: %08x\n", hres); ok(!fetched, "fetched = %d\n", fetched); + /* Although fetched==0, an element is returned. */ + expect_oleverb(verbs, OLEIVERB_PRIMARY); + /* The first argument is ignorred and always one element is returned. */ + ok(verbs[1].lVerb == 0xdeadbeef, "verbs[1].lVerb = %x\n", verbs[1].lVerb); + + test_next_oleverb(enum_verbs, OLEIVERB_INPLACEACTIVATE); + test_next_oleverb(enum_verbs, OLEIVERB_UIACTIVATE); + test_next_oleverb(enum_verbs, OLEIVERB_SHOW); + test_next_oleverb(enum_verbs, OLEIVERB_HIDE); + /* There is anouther verb, returned correctly. */ fetched = 0xdeadbeef; - hres = IEnumOLEVERB_Next(enum_verbs, 1, verbs, &fetched); - ok(hres == S_OK, "Next failed: %08x\n", hres); + memset(verbs, 0xa, sizeof(verbs)); + verbs[0].lVerb = 0xdeadbeef; + hres = IEnumOLEVERB_Next(enum_verbs, sizeof(verbs)/sizeof(*verbs), verbs, &fetched); + todo_wine ok(hres == S_OK, "Next failed: %08x\n", hres); + todo_wine ok(fetched == 1, "fetched = %d\n", fetched); + todo_wine ok(verbs[0].lVerb != 0xdeadbeef, "verbs[0].lVerb = %x\n", verbs[0].lVerb); + + hres = IEnumOLEVERB_Next(enum_verbs, sizeof(verbs)/sizeof(*verbs), verbs, &fetched); + ok(hres == S_FALSE, "Next failed: %08x\n", hres); ok(!fetched, "fetched = %d\n", fetched); hres = IEnumOLEVERB_Reset(enum_verbs); @@ -2042,6 +2085,8 @@ static void test_EnumVerbs(IWebBrowser2 *wb) ok(hres == S_OK, "Next failed: %08x\n", hres); ok(!fetched, "fetched = %d\n", fetched); + test_next_oleverb(enum_verbs, OLEIVERB_SHOW); + IEnumOLEVERB_Release(enum_verbs); }

1 0

Jacek Caban : ieframe: Fixed tests on updated IE11.
by Alexandre Julliard 06 Oct '14

06 Oct '14

Module: wine Branch: master Commit: 66cbef438bcf36f55858512aba1da82e4b5a1264 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66cbef438bcf36f55858512ab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 6 15:26:39 2014 +0200 ieframe: Fixed tests on updated IE11. --- dlls/ieframe/tests/webbrowser.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 0ddd360..27598cf 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -456,6 +456,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case 144: /* TODO */ case 178: /* IE11 */ case 179: /* IE11 */ + case 180: /* IE11 */ + case 181: /* IE11 */ return E_FAIL; default: ok(0, "unexpected nCmdID %d\n", nCmdID);

1 0

Piotr Caban : ieframe: Correctly set pfNoRedraw in InPlaceSite_OnInPlaceActivateEx.
by Alexandre Julliard 06 Oct '14

06 Oct '14

Module: wine Branch: master Commit: f85a94f577ecc3e7a3cf77060015bfa51274c034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f85a94f577ecc3e7a3cf77060… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 6 10:58:14 2014 +0200 ieframe: Correctly set pfNoRedraw in InPlaceSite_OnInPlaceActivateEx. --- dlls/ieframe/client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/client.c b/dlls/ieframe/client.c index c8fee31..dadbe13 100644 --- a/dlls/ieframe/client.c +++ b/dlls/ieframe/client.c @@ -297,7 +297,7 @@ static HRESULT WINAPI InPlaceSite_OnInPlaceActivateEx(IOleInPlaceSiteEx *iface, TRACE("(%p)->(%p, %x)\n", This, pfNoRedraw, dwFlags); /* FIXME: Avoid redraw, when possible */ - pfNoRedraw = FALSE; + *pfNoRedraw = FALSE; if (dwFlags) { FIXME("dwFlags not supported (%x)\n", dwFlags);

1 0

Piotr Caban : oleacc: Fix allocation error handling in ObjectFromLresult.
by Alexandre Julliard 06 Oct '14

06 Oct '14

Module: wine Branch: master Commit: 964ab4b6f22fa7930024b8d0475605b0c57a840c URL: http://source.winehq.org/git/wine.git/?a=commit;h=964ab4b6f22fa7930024b8d04… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 6 10:57:49 2014 +0200 oleacc: Fix allocation error handling in ObjectFromLresult. --- dlls/oleacc/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 18a43fb..e5fe6cd 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -219,10 +219,10 @@ HRESULT WINAPI ObjectFromLresult( LRESULT result, REFIID riid, WPARAM wParam, vo return E_FAIL; data = GlobalAlloc(GMEM_FIXED, size); - memcpy(data, view, size); - UnmapViewOfFile(view); if(!data) return E_OUTOFMEMORY; + memcpy(data, view, size); + UnmapViewOfFile(view); hr = CreateStreamOnHGlobal(data, TRUE, &stream); if(FAILED(hr)) {

1 0

Nikolay Sivov : dwrite: Mirror characters in case of RTL direction.
by Alexandre Julliard 06 Oct '14

06 Oct '14

Module: wine Branch: master Commit: 370407291111af7a8d4032b57bdb6c285cec6162 URL: http://source.winehq.org/git/wine.git/?a=commit;h=370407291111af7a8d4032b57… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 5 17:16:49 2014 +0400 dwrite: Mirror characters in case of RTL direction. --- dlls/dwrite/Makefile.in | 1 + dlls/dwrite/analyzer.c | 3 +- dlls/dwrite/bidi.c | 6 + dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/mirror.c | 437 +++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/tests/analyzer.c | 15 ++ tools/make_unicode | 1 + 7 files changed, 462 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=370407291111af7a8d403…

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
40
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 October 2014