March 2015 - Wine-Commits - list.winehq.org

Bruno Jesus : ws2_32/tests: Add more select() tests related to OOB handling.
by Alexandre Julliard March 12, 2015

March 12, 2015

Module: wine Branch: master Commit: 04154074049bac07c687d1d84211aeb55d2feb99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04154074049bac07c687d1d84… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Mar 12 03:44:22 2015 -0300 ws2_32/tests: Add more select() tests related to OOB handling. --- dlls/ws2_32/tests/sock.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 4abf7d5..ec4b563 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3614,7 +3614,7 @@ static void test_select(void) /* When OOB data is received the socket is set in the except descriptor */ ret = send(fdWrite, "A", 1, MSG_OOB); - ok(ret == 1, "expected 4, got %d\n", ret); + ok(ret == 1, "expected 1, got %d\n", ret); FD_ZERO_ALL(); FD_SET_ALL(fdListen); FD_SET(fdRead, &readfds); @@ -3629,6 +3629,28 @@ todo_wine ok(ret == 1, "expected 1, got %d\n", ret); ok(tmp_buf[0] == 'A', "expected 'A', got 0x%02X\n", tmp_buf[0]); + /* If the socket is OOBINLINED it will not receive the OOB in except fds */ + ret = 1; + ret = setsockopt(fdRead, SOL_SOCKET, SO_OOBINLINE, (char*) &ret, sizeof(ret)); + ok(ret == 0, "expected 0, got %d\n", ret); + ret = send(fdWrite, "A", 1, MSG_OOB); + ok(ret == 1, "expected 1, got %d\n", ret); + FD_ZERO_ALL(); + FD_SET_ALL(fdListen); + FD_SET(fdRead, &readfds); + FD_SET(fdRead, &exceptfds); + ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); + ok(ret == 1, "expected 1, got %d\n", ret); + ok(FD_ISSET(fdRead, &readfds), "fdRead socket is not in the set\n"); + tmp_buf[0] = 0xAF; + SetLastError(0xdeadbeef); + ret = recv(fdRead, tmp_buf, sizeof(tmp_buf), MSG_OOB); + ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret); /* can't recv with MSG_OOB if OOBINLINED */ + ok(GetLastError() == WSAEINVAL, "expected 10022, got %d\n", GetLastError()); + ret = recv(fdRead, tmp_buf, sizeof(tmp_buf), 0); + ok(ret == 1, "expected 1, got %d\n", ret); + ok(tmp_buf[0] == 'A', "expected 'A', got 0x%02X\n", tmp_buf[0]); + /* When the connection is closed the socket is set in the read descriptor */ ret = closesocket(fdRead); ok(ret == 0, "expected 0, got %d\n", ret);

1 0

Henri Verbeet : d3d10core: Implement d3d10_depthstencil_view_GetPrivateData().
by Alexandre Julliard March 12, 2015

March 12, 2015

Module: wine Branch: master Commit: c81446a7cc46eedfdb2c3acdbe08f3ccbe4e9590 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c81446a7cc46eedfdb2c3acdb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 12 10:08:33 2015 +0100 d3d10core: Implement d3d10_depthstencil_view_GetPrivateData(). --- dlls/d3d10core/view.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index d261d79..97fd495 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -429,10 +429,12 @@ static void STDMETHODCALLTYPE d3d10_depthstencil_view_GetDevice(ID3D10DepthStenc static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_view_GetPrivateData(ID3D10DepthStencilView *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + struct d3d10_depthstencil_view *view = impl_from_ID3D10DepthStencilView(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_get_private_data(&view->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_view_SetPrivateData(ID3D10DepthStencilView *iface,

1 0

Henri Verbeet : d3d10core: Implement d3d10_rendertarget_view_GetPrivateData().
by Alexandre Julliard March 12, 2015

March 12, 2015

Module: wine Branch: master Commit: 57c76e10e0cc07316eb614500de344bc6d0ecbc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57c76e10e0cc07316eb614500… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 12 10:08:36 2015 +0100 d3d10core: Implement d3d10_rendertarget_view_GetPrivateData(). --- dlls/d3d10core/view.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index 2b85161..3576e4a 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -676,10 +676,12 @@ static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetDevice(ID3D10RenderTarg static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_GetPrivateData(ID3D10RenderTargetView *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + struct d3d10_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_get_private_data(&view->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_SetPrivateData(ID3D10RenderTargetView *iface,

1 0

Francois Gouget : hhctrl.ocx: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard March 12, 2015

March 12, 2015

Module: wine Branch: master Commit: e96ab17ec1ff356564f558589b0353866ab7a830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e96ab17ec1ff356564f558589… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 12 10:38:59 2015 +0100 hhctrl.ocx: Remove unneeded NONAMELESSXXX directives. --- dlls/hhctrl.ocx/content.c | 1 - dlls/hhctrl.ocx/index.c | 3 --- dlls/hhctrl.ocx/search.c | 3 --- 3 files changed, 7 deletions(-) diff --git a/dlls/hhctrl.ocx/content.c b/dlls/hhctrl.ocx/content.c index 28bda11..6a7c8f8 100644 --- a/dlls/hhctrl.ocx/content.c +++ b/dlls/hhctrl.ocx/content.c @@ -18,7 +18,6 @@ */ #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "hhctrl.h" #include "stream.h" diff --git a/dlls/hhctrl.ocx/index.c b/dlls/hhctrl.ocx/index.c index af1efb8..8b80ce2 100644 --- a/dlls/hhctrl.ocx/index.c +++ b/dlls/hhctrl.ocx/index.c @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "hhctrl.h" #include "stream.h" diff --git a/dlls/hhctrl.ocx/search.c b/dlls/hhctrl.ocx/search.c index 571cdd6..287e6d0 100644 --- a/dlls/hhctrl.ocx/search.c +++ b/dlls/hhctrl.ocx/search.c @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "hhctrl.h" #include "stream.h"

1 0

Francois Gouget : krnl386.exe16: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard March 12, 2015

March 12, 2015

Module: wine Branch: master Commit: bc68822c09b7125572d4a08b9784a86a81ab7954 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc68822c09b7125572d4a08b9… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 12 10:40:57 2015 +0100 krnl386.exe16: Remove unneeded NONAMELESSXXX directives. --- dlls/krnl386.exe16/file.c | 2 -- dlls/krnl386.exe16/int2f.c | 3 +-- dlls/krnl386.exe16/local.c | 2 +- dlls/krnl386.exe16/vga.c | 2 +- dlls/krnl386.exe16/vxd.c | 3 +-- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/krnl386.exe16/file.c b/dlls/krnl386.exe16/file.c index 37c401a..1386fe1 100644 --- a/dlls/krnl386.exe16/file.c +++ b/dlls/krnl386.exe16/file.c @@ -30,8 +30,6 @@ #include <stdio.h> #include <assert.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h" #include "winbase.h" diff --git a/dlls/krnl386.exe16/int2f.c b/dlls/krnl386.exe16/int2f.c index 046410f..f5b5aaa 100644 --- a/dlls/krnl386.exe16/int2f.c +++ b/dlls/krnl386.exe16/int2f.c @@ -25,10 +25,9 @@ #include <string.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "wine/winbase16.h" #include "wine/debug.h" #include "winternl.h" diff --git a/dlls/krnl386.exe16/local.c b/dlls/krnl386.exe16/local.c index 3eaa6ec..4e69a90 100644 --- a/dlls/krnl386.exe16/local.c +++ b/dlls/krnl386.exe16/local.c @@ -30,7 +30,7 @@ #include "config.h" #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include <stdlib.h> #include <string.h> #include "wine/winbase16.h" diff --git a/dlls/krnl386.exe16/vga.c b/dlls/krnl386.exe16/vga.c index ade19f7..c7745d4 100644 --- a/dlls/krnl386.exe16/vga.c +++ b/dlls/krnl386.exe16/vga.c @@ -22,7 +22,7 @@ #include <string.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/dlls/krnl386.exe16/vxd.c b/dlls/krnl386.exe16/vxd.c index a3ff9ee..d140964 100644 --- a/dlls/krnl386.exe16/vxd.c +++ b/dlls/krnl386.exe16/vxd.c @@ -34,10 +34,9 @@ #include <string.h> #include <stdarg.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "winerror.h"

1 0

Francois Gouget : ieframe: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard March 12, 2015

March 12, 2015

Module: wine Branch: master Commit: 6ddd8795154a80731f1697633bc58e729729d5bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ddd8795154a80731f1697633… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 12 11:11:10 2015 +0100 ieframe: Remove unneeded NONAMELESSXXX directives. Move a NONAMELESSUNION directive to the one C file that needs it. --- dlls/ieframe/ieframe.h | 1 - dlls/ieframe/intshcut.c | 2 ++ dlls/ieframe/navigate.c | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index cdfdf21..f8c204c 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -21,7 +21,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c index a780fea..b2d3ba9 100644 --- a/dlls/ieframe/intshcut.c +++ b/dlls/ieframe/intshcut.c @@ -29,6 +29,8 @@ #include <stdio.h> +#define NONAMELESSUNION + #include "ieframe.h" #include "shlobj.h" diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index d1a9a50..9c5b88a 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -17,7 +17,6 @@ */ #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ieframe.h"

1 0

Nikolay Sivov : dwrite: Make a deep copy of family name string (Valgrind).
by Alexandre Julliard March 12, 2015

March 12, 2015

Module: wine Branch: master Commit: c1ecf862a4bdfd704e9c472f5dfdf9b14b7a8e6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1ecf862a4bdfd704e9c472f5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 11 20:46:11 2015 +0300 dwrite: Make a deep copy of family name string (Valgrind). --- dlls/dwrite/layout.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 88a83cc..b4833c2 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -703,6 +703,12 @@ static struct layout_range *alloc_layout_range_from(struct layout_range *from, c *range = *from; range->range = *r; + range->fontfamily = heap_strdupW(from->fontfamily); + if (!range->fontfamily) { + heap_free(range); + return NULL; + } + /* update refcounts */ if (range->object) IDWriteInlineObject_AddRef(range->object);

1 0

Andrew Eikum : shell32/tests: Fix win8 knownfolders relative and parsed paths.
by Alexandre Julliard March 12, 2015

March 12, 2015

Module: wine Branch: master Commit: dd275615db9294e18c59675d8e1a21d4cd1bbdb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd275615db9294e18c59675d8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Mar 11 12:11:48 2015 -0500 shell32/tests: Fix win8 knownfolders relative and parsed paths. --- dlls/shell32/tests/shellpath.c | 196 ++++++++++++++++++++--------------------- 1 file changed, 95 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dd275615db9294e18c596…

1 0

Nikolay Sivov : dwrite: Fix excessive refcount increment when setting interface pointers as range attributes.
by Alexandre Julliard March 12, 2015

March 12, 2015

Module: wine Branch: master Commit: 985bff76be11799a1317e8195318ef31a6162e2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=985bff76be11799a1317e8195… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 11 22:20:34 2015 +0300 dwrite: Fix excessive refcount increment when setting interface pointers as range attributes. --- dlls/dwrite/layout.c | 34 ++++++++++++++++------------------ dlls/dwrite/tests/layout.c | 26 ++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 18 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index b4833c2..2665664 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -775,6 +775,19 @@ static struct layout_range *get_layout_range_by_pos(struct dwrite_textlayout *la return NULL; } +static inline BOOL set_layout_range_iface_attr(IUnknown **dest, IUnknown *value) +{ + if (*dest == value) return FALSE; + + if (*dest) + IUnknown_Release(*dest); + *dest = value; + if (*dest) + IUnknown_AddRef(*dest); + + return TRUE; +} + static BOOL set_layout_range_attrval(struct layout_range *dest, enum layout_range_attr_kind attr, struct layout_range_attr_value *value) { BOOL changed = FALSE; @@ -797,20 +810,10 @@ static BOOL set_layout_range_attrval(struct layout_range *dest, enum layout_rang dest->fontsize = value->u.fontsize; break; case LAYOUT_RANGE_ATTR_INLINE: - changed = dest->object != value->u.object; - if (changed && dest->object) - IDWriteInlineObject_Release(dest->object); - dest->object = value->u.object; - if (dest->object) - IDWriteInlineObject_AddRef(dest->object); + changed = set_layout_range_iface_attr((IUnknown**)&dest->object, (IUnknown*)value->u.object); break; case LAYOUT_RANGE_ATTR_EFFECT: - changed = dest->effect != value->u.effect; - if (changed && dest->effect) - IUnknown_Release(dest->effect); - dest->effect = value->u.effect; - if (dest->effect) - IUnknown_AddRef(dest->effect); + changed = set_layout_range_iface_attr((IUnknown**)&dest->effect, (IUnknown*)value->u.effect); break; case LAYOUT_RANGE_ATTR_UNDERLINE: changed = dest->underline != value->u.underline; @@ -821,12 +824,7 @@ static BOOL set_layout_range_attrval(struct layout_range *dest, enum layout_rang dest->strikethrough = value->u.strikethrough; break; case LAYOUT_RANGE_ATTR_FONTCOLL: - changed = dest->collection != value->u.collection; - if (changed && dest->collection) - IDWriteFontCollection_Release(dest->collection); - dest->collection = value->u.collection; - if (dest->collection) - IDWriteFontCollection_AddRef(dest->collection); + changed = set_layout_range_iface_attr((IUnknown**)&dest->collection, (IUnknown*)value->u.collection); break; case LAYOUT_RANGE_ATTR_LOCALE: changed = strcmpW(dest->locale, value->u.locale) != 0; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 98358a4..89c96e4 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -691,6 +691,9 @@ static void test_SetInlineObject(void) hr = IDWriteFactory_CreateEllipsisTrimmingSign(factory, format, &inlineobj2); ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(inlineobj, 1); + EXPECT_REF(inlineobj2, 1); + inlinetest = (void*)0x1; hr = IDWriteTextLayout_GetInlineObject(layout, 0, &inlinetest, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -701,6 +704,8 @@ static void test_SetInlineObject(void) hr = IDWriteTextLayout_SetInlineObject(layout, inlineobj, range); ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(inlineobj, 2); + inlinetest = (void*)0x1; hr = IDWriteTextLayout_GetInlineObject(layout, 2, &inlinetest, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -714,6 +719,8 @@ static void test_SetInlineObject(void) ok(r2.startPosition == 0 && r2.length == 2, "got %d, %d\n", r2.startPosition, r2.length); IDWriteInlineObject_Release(inlinetest); + EXPECT_REF(inlineobj, 2); + /* get from somewhere inside a range */ inlinetest = NULL; r2.startPosition = r2.length = 100; @@ -723,6 +730,8 @@ static void test_SetInlineObject(void) ok(r2.startPosition == 0 && r2.length == 2, "got %d, %d\n", r2.startPosition, r2.length); IDWriteInlineObject_Release(inlinetest); + EXPECT_REF(inlineobj, 2); + range.startPosition = 1; range.length = 1; hr = IDWriteTextLayout_SetInlineObject(layout, inlineobj2, range); @@ -736,6 +745,9 @@ static void test_SetInlineObject(void) ok(r2.startPosition == 1 && r2.length == 1, "got %d, %d\n", r2.startPosition, r2.length); IDWriteInlineObject_Release(inlinetest); + EXPECT_REF(inlineobj, 2); + EXPECT_REF(inlineobj2, 2); + inlinetest = NULL; r2.startPosition = r2.length = 100; hr = IDWriteTextLayout_GetInlineObject(layout, 0, &inlinetest, &r2); @@ -744,6 +756,8 @@ static void test_SetInlineObject(void) ok(r2.startPosition == 0 && r2.length == 1, "got %d, %d\n", r2.startPosition, r2.length); IDWriteInlineObject_Release(inlinetest); + EXPECT_REF(inlineobj, 2); + range.startPosition = 1; range.length = 1; hr = IDWriteTextLayout_SetInlineObject(layout, inlineobj, range); @@ -756,11 +770,15 @@ static void test_SetInlineObject(void) ok(r2.startPosition == 0 && r2.length == 2, "got %d, %d\n", r2.startPosition, r2.length); IDWriteInlineObject_Release(inlinetest); + EXPECT_REF(inlineobj, 2); + range.startPosition = 1; range.length = 2; hr = IDWriteTextLayout_SetInlineObject(layout, inlineobj, range); ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(inlineobj, 2); + r2.startPosition = r2.length = 100; hr = IDWriteTextLayout_GetInlineObject(layout, 0, &inlinetest, &r2); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -768,7 +786,15 @@ static void test_SetInlineObject(void) ok(r2.startPosition == 0 && r2.length == 3, "got %d, %d\n", r2.startPosition, r2.length); IDWriteInlineObject_Release(inlinetest); + EXPECT_REF(inlineobj, 2); + EXPECT_REF(inlineobj2, 1); + IDWriteTextLayout_Release(layout); + + EXPECT_REF(inlineobj, 1); + + IDWriteInlineObject_Release(inlineobj); + IDWriteInlineObject_Release(inlineobj2); IDWriteTextFormat_Release(format); }

1 0

Andrew Eikum : shell32/tests: Support alternate parent folders.
by Alexandre Julliard March 12, 2015

March 12, 2015

Module: wine Branch: master Commit: fdbdad03f35fc0771effacc20565c5cff4aaa58c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdbdad03f35fc0771effacc20… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Mar 11 12:12:54 2015 -0500 shell32/tests: Support alternate parent folders. --- dlls/shell32/tests/shellpath.c | 228 ++++++++++++++++++++--------------------- 1 file changed, 114 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fdbdad03f35fc0771effa…

1 0