October 2014 - Wine-Commits

Alexandre Julliard : Import of upstream bugzilla release 4.4.6.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

1 0

Alexandre Julliard : Import of upstream bugzilla release 4.4.6.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

1 0

Alexandre Julliard : Merge branch 'upstream'.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

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

Henri Verbeet : ws2_32: Return WSAEINVAL if "out_size" is smaller than the minimum size for SIO_ADDRESS_LIST_QUERY.
by Alexandre Julliard Oct. 6, 2014

Oct. 6, 2014

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 Oct. 6, 2014

Oct. 6, 2014

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

Henri Verbeet : wined3d: Don't check for color-keying for WINED3D_CT_P8.
by Alexandre Julliard Oct. 6, 2014

Oct. 6, 2014

Module: wine Branch: master Commit: fd342cce3eb780567ee3c9278e097bc7a1575d77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd342cce3eb780567ee3c9278… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 6 08:24:21 2014 +0200 wined3d: Don't check for color-keying for WINED3D_CT_P8. We don't support p8 color keying either way. --- dlls/wined3d/surface.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f2be4c9..ee51f6b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1588,7 +1588,6 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alpha_ck, struct wined3d_format *format, enum wined3d_conversion_type *conversion_type) { - BOOL colorkey_active = need_alpha_ck && (texture->color_key_flags & WINEDDSD_CKSRCBLT); const struct wined3d_device *device = texture->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_format *dst_format; @@ -1614,7 +1613,7 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp *conversion_type = WINED3D_CT_NONE; dst_format_id = format->id; - if (colorkey_active) + if (need_alpha_ck && (texture->color_key_flags & WINEDDSD_CKSRCBLT)) { for (i = 0; i < sizeof(color_key_info) / sizeof(*color_key_info); ++i) { @@ -1632,8 +1631,8 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp /* FIXME: This should check if the blitter backend can do P8 conversion, * instead of checking for ARB_fragment_program. */ if (texture->resource.format->id == WINED3DFMT_P8_UINT - && (!(gl_info->supported[ARB_FRAGMENT_PROGRAM] && texture->swapchain - && texture == texture->swapchain->front_buffer) || colorkey_active)) + && !(gl_info->supported[ARB_FRAGMENT_PROGRAM] && texture->swapchain + && texture == texture->swapchain->front_buffer)) { *conversion_type = WINED3D_CT_P8; dst_format_id = WINED3DFMT_B8G8R8A8_UNORM;

1 0

Henri Verbeet : wined3d: Just use glGammaInternal/ rtInternal from the destination format in d3dfmt_get_conv().
by Alexandre Julliard Oct. 6, 2014

Oct. 6, 2014

Module: wine Branch: master Commit: b0ce89d81015fe23ecc4584e1e2dea17960e5c33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0ce89d81015fe23ecc4584e1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 6 08:24:18 2014 +0200 wined3d: Just use glGammaInternal/rtInternal from the destination format in d3dfmt_get_conv(). Using glGammaInternal or rtInternal should do the right thing in principle, although in practice they should never get used either way. --- dlls/wined3d/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a8e0f51..41dc2ac 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1649,8 +1649,8 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp { dst_format = wined3d_get_format(gl_info, dst_format_id); format->glInternal = dst_format->glInternal; - format->glGammaInternal = format->glInternal; - format->rtInternal = format->glInternal; + format->glGammaInternal = dst_format->glGammaInternal; + format->rtInternal = dst_format->rtInternal; format->glFormat = dst_format->glFormat; format->glType = dst_format->glType; format->conv_byte_count = dst_format->byte_count;

1 0

Piotr Caban : ieframe: Correctly set pfNoRedraw in InPlaceSite_OnInPlaceActivateEx.
by Alexandre Julliard Oct. 6, 2014

Oct. 6, 2014

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 Oct. 6, 2014

Oct. 6, 2014

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: Initial implementation of GetGlyphs().
by Alexandre Julliard Oct. 6, 2014

Oct. 6, 2014

Module: wine Branch: master Commit: 1843972e0e223a98e0c815e7e5f6be668d15a347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1843972e0e223a98e0c815e7e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 5 17:07:46 2014 +0400 dwrite: Initial implementation of GetGlyphs(). --- dlls/dwrite/Makefile.in | 3 +- dlls/dwrite/analyzer.c | 116 ++++++++++++++++++++++++++++++++-- dlls/dwrite/dwrite_private.h | 32 ++++++++++ dlls/dwrite/shape.c | 147 +++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/tests/analyzer.c | 112 ++++++++++++++++++++++++++------- 5 files changed, 382 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1843972e0e223a98e0c81…

1 0