July 2016 - Wine-Devel - list.winehq.org

Re: [PATCH 02/15] mshtml: Rewrite navigation tests using new HTTP emulation framework.
by Marvin July 5, 2016

July 5, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24000 Your paranoid android. === build (build) === Make failed

2 1

Re: [PATCH 14/15] mshtml: Reimplement IHTMLDocument5::get_compatMode based on document mode.
by Marvin July 5, 2016

July 5, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24002 Your paranoid android. === build (build) === Make failed

1 0

Re: [PATCH 13/15] mshtml: Added document.documentMode tests.
by Marvin July 5, 2016

July 5, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24001 Your paranoid android. === build (build) === Make failed

1 0

Re: [PATCH] ws2_32: Allow user to enable IP dual stack (v3)
by Bruno Jesus July 5, 2016

July 5, 2016

On Tue, Jul 5, 2016 at 10:33 AM, Matthieu Nottale <matthieu.nottale(a)infinit.io> wrote: > IP dual stack (v4+v6) should be disabled by default, but previous code > was setting IPV6_V6ONLY in bind() which prevented user to override it. > This patch moves setting IPV6_V6ONLY to socket creation time. It still looks like there is a formatting problem with the patch, please attach it in a new attempt or use git send-email, also see the comments below. > Signed-off-by: Matthieu Nottale <matthieu.nottale(a)infinit.io> > --- > dlls/ws2_32/socket.c | 22 ++++++++------------- > dlls/ws2_32/tests/sock.c | 51 > ++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 59 insertions(+), 14 deletions(-) > > + enabled = 2; > + len = sizeof(enabled); > + ret = getsockopt(v6, IPPROTO_IPV6, IPV6_V6ONLY, &enabled, &len); > + if (ret) { > + ok(!ret, "Failed to check IPV6_V6ONLY ((LastError: %d).\n", > WSAGetLastError()); > + goto end; > + } If the ok() is supposed to always fail use ok(0, ...). But according to msdn this option is not present in 2003/XP, so you would end up with an error. Better to use win_skip then to avoid this problem. The testbot will test against many different Windows versions so we need to ensure it works everywhere, before resending it would be useful to do a manual run at https://testbot.winehq.org/ to check the patch. > + ok(enabled == 1, "IPV6_V6ONLY is not enabled by default.\n"); > + ret = setsockopt(v6, IPPROTO_IPV6, IPV6_V6ONLY, &enabled, len); > + if (ret) { > + ok(!ret, "Failed to disable IPV6_V6ONLY (LastError: %d).\n", > WSAGetLastError()); > + goto end; > + } This should never fail as the previous test already took care of checking for IPV6_V6ONLY support, so drop the if and goto. > + enabled = 2; > + len = sizeof(enabled); > + ret = getsockopt(v6, IPPROTO_IPV6, IPV6_V6ONLY, &enabled, &len); > + if (ret) { > + ok(!ret, "Failed to check IPV6_V6ONLY (LastError: %d).\n", > WSAGetLastError()); > + goto end; > + } Again I think getsockopt must always work at this point. > + ok(!enabled, "IPV6_V6ONLY is enabled after bind.\n"); > + v4 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); > + if (v4 == INVALID_SOCKET) { > + skip("Could not create IPv4 socket (LastError: %d).\n", > + WSAGetLastError()); > + goto end; > + } > + WSASetLastError(0xdeadbeef); > + ret = bind(v4, (struct sockaddr*)&sin4, sizeof(sin4)); Please also test ok(ret,...); Best wishes, Bruno

1 0

Re: [PATCH v2 3/5] shell32/tests: Add tests for FolderItems.
by Nikolay Sivov July 5, 2016

July 5, 2016

On 05.07.2016 8:47, Alex Henrie wrote: > + if (0) /* crashes on all versions of Windows */ > + { > + r = FolderItems_get_Count(items, NULL); > +todo_wine > + ok(r == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", r); > + } Why do you want to handle this case if it crashes consistently on Windows? And todo_wine is not going to do anything in commented block obviously.

2 6

Re: [PATCH 6/7] d3drm: Implement IDirect3DRMViewport*::Init. (v3)
by Henri Verbeet July 5, 2016

July 5, 2016

On 27 June 2016 at 23:54, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > static HRESULT WINAPI d3drm_viewport1_Init(IDirect3DRMViewport *iface, IDirect3DRMDevice *device, > IDirect3DRMFrame *camera, DWORD x, DWORD y, DWORD width, DWORD height) > { > - FIXME("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u stub!\n", > - iface, device, camera, x, y, width, height); > + struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface); > + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame(camera); Using impl_from_IDirect3DRMFrame() here is unusual. > + if (!device || !camera) > + return D3DRMERR_BADOBJECT; And note that this only works because of the d3drm_frame structure layout. You'll want to use unsafe_impl_from_IDirect3DRMFrame() if "camera" can be NULL.

1 0

Re: ntdll: Add RtlRestoreContext implementation
by Sebastian Lackner July 5, 2016

July 5, 2016

On 04.07.2016 10:55, Piotr Caban wrote: > Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> > --- > dlls/kernel32/kernel32.spec | 2 +- > dlls/ntdll/ntdll.spec | 1 + > dlls/ntdll/signal_x86_64.c | 73 +++++++++++++++++++++++++-------------------- > 3 files changed, 42 insertions(+), 34 deletions(-) > Your patch also changes unwinding behavior in case of MSVCRT_JUMP_BUFFER. Previously the instruction pointer stored in the jump buffer was ignored, now it will overwrite the value passed as target_ip. Is that intentional?

2 1

Re: [PATCH] ws2_32: Allow user to enable IP dual stack (v3)
by Marvin July 5, 2016

July 5, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=23992 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: krnl386.exe16: Fix a typo in comment.
by Huw Davies July 5, 2016

July 5, 2016

On Tue, Jul 05, 2016 at 03:36:30PM +0300, Andrey Gusev wrote: > diff --git a/dlls/krnl386.exe16/file.c b/dlls/krnl386.exe16/file.c > index 4e7f7c4..44b1e75 100644 > --- a/dlls/krnl386.exe16/file.c > +++ b/dlls/krnl386.exe16/file.c > @@ -549,7 +549,7 @@ INT16 WINAPI GetPrivateProfileString16( LPCSTR section, LPCSTR entry, > if (!entry) > { > /* We have to return the list of keys in the section but without the values > - * so we need to massage the results of GetPrivateProfileSectionA. > + * so we need to message the results of GetPrivateProfileSectionA. > */ > UINT ret, oldlen = len, size = min( len, 1024 ); > LPSTR data, src; No, again the original is correct. Huw.

1 0

Re: gdi32/dibdrv: Fix a typo in comment.
by Huw Davies July 5, 2016

July 5, 2016

On Tue, Jul 05, 2016 at 03:33:39PM +0300, Andrey Gusev wrote: > diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c > index bfb3451..ca357b2 100644 > --- a/dlls/gdi32/dibdrv/graphics.c > +++ b/dlls/gdi32/dibdrv/graphics.c > @@ -1567,7 +1567,7 @@ COLORREF dibdrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) > rect.bottom = rect.top + 1; > add_clipped_bounds( pdev, &rect, pdev->clip ); > > - /* SetPixel doesn't do the 1bpp massaging like other fg colors */ > + /* SetPixel doesn't do the 1bpp messaging like other fg colors */ > pixel = get_pixel_color( dev->hdc, &pdev->dib, color, FALSE ); > color = pdev->dib.funcs->pixel_to_colorref( &pdev->dib, pixel ); No, the original is correct. Huw.

1 0

Re: [PATCH 2/5] shell32: Stub out FolderItems.
by Sebastian Lackner July 5, 2016

July 5, 2016

On 04.07.2016 07:25, Alex Henrie wrote: > Cc: Christian Costa <titan.costa(a)gmail.com> > Cc: Sebastian Lackner <sebastian(a)fds-team.de> > > Wine Staging has included a similar patch since 1.7.51, however this > patch is not based on theirs. Actually the patch looks very similar, but this is probably caused by the fact that you both wrote it based on existing code. > > FolderItems2 worked in Windows 2000, but it was removed when > FolderItems3 was introduced in Windows XP. However, it doesn't hurt us > to provide this interface anyway for any old applications that might > want it. > > Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> > --- > dlls/shell32/shell32_main.h | 1 + > dlls/shell32/shelldispatch.c | 207 ++++++++++++++++++++++++++++++++++++++++++- > 2 files changed, 206 insertions(+), 2 deletions(-) > Some of the variable names (for example ppTInfo, rgszNames, rgDispId) sound a bit odd. Usually variable names without ugly prefix are preferred for new code (except we want to keep it for compatibility with old code here?). > +static HRESULT WINAPI FolderItemsImpl_Item(FolderItems3 *iface, VARIANT index, FolderItem **ppid) > +{ > + FIXME("(%p,%p)\n", iface, ppid); You forgot to trace the index parameter here. > + > + return E_NOTIMPL; > +} [...] > @@ -1093,8 +1297,7 @@ static HRESULT WINAPI FolderImpl_Items(Folder3 *iface, FolderItems **ppid) > { > FIXME("(%p,%p)\n", iface, ppid); You forgot to change the FIXME to a TRACE. > > - *ppid = NULL; > - return E_NOTIMPL; > + return FolderItems_Constructor(ppid); > } > > static HRESULT WINAPI FolderImpl_ParseName(Folder3 *iface, BSTR name, FolderItem **item) >

3 3

Re: [PATCH v2 2/5] shell32: Stub out FolderItems.
by Nikolay Sivov July 5, 2016

July 5, 2016

On 05.07.2016 8:47, Alex Henrie wrote: > Cc: Christian Costa <titan.costa(a)gmail.com> > Cc: Sebastian Lackner <sebastian(a)fds-team.de> > > Wine Staging has included a similar patch since 1.7.51, however this > patch is not based on theirs. > > FolderItems2 worked in Windows 2000, but it was removed when > FolderItems3 was introduced in Windows XP. However, it doesn't hurt us > to provide this interface anyway for any old applications that might > want it. > > Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> > --- > dlls/shell32/shell32_main.h | 1 + > dlls/shell32/shelldispatch.c | 207 ++++++++++++++++++++++++++++++++++++++++++- > 2 files changed, 206 insertions(+), 2 deletions(-) > > diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h > index 492f79f..64a26bb 100644 > --- a/dlls/shell32/shell32_main.h > +++ b/dlls/shell32/shell32_main.h > @@ -234,6 +234,7 @@ enum tid_t { > IShellDispatch6_tid, > IShellFolderViewDual3_tid, > Folder3_tid, > + FolderItems3_tid, > FolderItem2_tid, > FolderItemVerb_tid, > FolderItemVerbs_tid, That's not going to work, you have to update tid_ids[] too. Also please keep it sorted. > diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c > index 6dece6d..3661430 100644 > --- a/dlls/shell32/shelldispatch.c > +++ b/dlls/shell32/shelldispatch.c > @@ -65,6 +65,11 @@ typedef struct { > } FolderImpl; > > typedef struct { > + FolderItems3 FolderItems3_iface; > + LONG ref; > +} FolderItemsImpl; > + > +typedef struct { > FolderItem2 FolderItem2_iface; > LONG ref; > VARIANT dir; > @@ -97,6 +102,11 @@ static inline FolderImpl *impl_from_Folder(Folder3 *iface) > return CONTAINING_RECORD(iface, FolderImpl, Folder3_iface); > } > > +static inline FolderItemsImpl *impl_from_FolderItems(FolderItems3 *iface) > +{ > + return CONTAINING_RECORD(iface, FolderItemsImpl, FolderItems3_iface); > +} > + > static inline FolderItemImpl *impl_from_FolderItem(FolderItem2 *iface) > { > return CONTAINING_RECORD(iface, FolderItemImpl, FolderItem2_iface); > @@ -939,6 +949,200 @@ static HRESULT FolderItem_Constructor(VARIANT *dir, FolderItem **ppfi) > return ret; > } > > +static HRESULT WINAPI FolderItemsImpl_QueryInterface(FolderItems3 *iface, > + REFIID riid, LPVOID *ppv) > +{ > + FolderItemsImpl *This = impl_from_FolderItems(iface); > + > + TRACE("(%p,%p,%p)\n", iface, riid, ppv); Usually we trace riid. > + > + if (!ppv) return E_INVALIDARG; This is unusual, do we have a test for that?

1 0

Re: PATCH] ws2_32: Allow user to enable IP dual stack.
by Bruno Jesus July 4, 2016

July 4, 2016

On Mon, Jul 4, 2016 at 6:35 AM, Matthieu Nottale <matthieu.nottale(a)infinit.io> wrote: > IP dual stack (v4+v6) should be disabled by default, but previous code > was setting IPV6_V6ONLY in bind() which prevented user to override it. > This patch moves setting IPV6_V6ONLY to socket creation time. Hi, thanks for the updated version. I believe the patch failed to apply because you added text after it and also an attachment which is inlined while the email is being parsed. The result you can see at [1]. The subject should show how many attempts the patch was sent to, so next subject should be: [PATCH] ws2_32: Allow user to enable IP dual stack (v3) Please see some nitpicks below. [1] http://source.winehq.org/patches/data/123921 > Signed-off-by: Matthieu Nottale <matthieu.nottale(a)infinit.io> > --- > dlls/ws2_32/socket.c | 22 ++++++++-------------- > dlls/ws2_32/tests/sock.c | 40 ++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 48 insertions(+), 14 deletions(-) > > diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c > index b0af3d7..c29bd2b 100644 > --- a/dlls/ws2_32/socket.c > +++ b/dlls/ws2_32/socket.c > @@ -3240,20 +3240,6 @@ int WINAPI WS_bind(SOCKET s, const struct > WS_sockaddr* name, int namelen) > } > else > { > -#ifdef IPV6_V6ONLY > - const struct sockaddr_in6 *in6 = (const struct > sockaddr_in6*) &uaddr; > - if (name->sa_family == WS_AF_INET6 && > - !memcmp(&in6->sin6_addr, &in6addr_any, sizeof(struct > in6_addr))) > - { > - int enable = 1; > - if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &enable, > sizeof(enable)) == -1) > - { > - release_sock_fd( s, fd ); > - SetLastError(WSAEAFNOSUPPORT); > - return SOCKET_ERROR; > - } > - } > -#endif > if (name->sa_family == WS_AF_INET) > { > struct sockaddr_in *in4 = (struct sockaddr_in*) &uaddr; > @@ -7163,6 +7149,14 @@ SOCKET WINAPI WSASocketW(int af, int type, int > protocol, > TRACE("\tcreated %04lx\n", ret ); > if (ipxptype > 0) > set_ipx_packettype(ret, ipxptype); > +#ifdef IPV6_V6ONLY > + if (unixaf == AF_INET6) > + { > + /* Winsock documentation stipulates that IPV6_V6ONLY is enabled > by default*/ The documentation is not always useful (and sometimes wrong) and now we should have a test to back this up, I believe a better comment to be: /* AF_INET6 sockets have IPV6_V6ONLY enabled by default. */ Watch out for missing space between the last comment word and the */ > + int enable = 1; > + WS_setsockopt(ret, WS_IPPROTO_IPV6, WS_IPV6_V6ONLY, &enable, > sizeof(enable)); > + } > +#endif > return ret; > } > > diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c > index 6853279..7c8d834 100644 > --- a/dlls/ws2_32/tests/sock.c > +++ b/dlls/ws2_32/tests/sock.c > @@ -6114,6 +6114,46 @@ static void test_ipv6only(void) > ok(!ret, "Could not bind IPv4 address (LastError: %d; %d expected if > IPv6 binds to IPv4 as well).\n", > WSAGetLastError(), WSAEADDRINUSE); > > + if (v4 != INVALID_SOCKET) > + closesocket(v4); > + if (v6 != INVALID_SOCKET) > + closesocket(v6); > + > + /* Test again, this time disabling V6ONLY*/ > + v6 = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP); > + if (v6 == INVALID_SOCKET) { > + skip("Could not create IPv6 socket (LastError: %d; %d expected if > IPv6 not available).\n", > + WSAGetLastError(), WSAEAFNOSUPPORT); > + goto end; > + } Do a getsockopt at this point to check what is the default enabled value. Set enabled to the opposite of what you expected before the call and test its value after. > + DWORD enabled = 0; > + int len = sizeof(enabled); You cannot declare variables like this in C89 (?) so do it in the function beginning. > + ret = setsockopt(v6, IPPROTO_IPV6, IPV6_V6ONLY, &enabled, len); > + if (ret) { > + ok(!ret, "Failed to disable IPV6_V6ONLY (LastError: %d).\n", > WSAGetLastError()); > + goto end; > + } I understand that you are trying to skip when IPV6_V6ONLY is not present. It will be better if you catch the explicit error case and bail out, something like: WSASetLastError(0xdeadbeef); ret = setsockopt(v6, IPPROTO_IPV6, IPV6_V6ONLY, &enabled, len); error = WSAGetLastError(); if (ret) { ok(error == EXPECTED_ERROR, "Failed to disable IPV6_V6ONLY (LastError %d, %d expected).\n", error, EXPECTED_ERROR); goto end; } > ... Best wishes, Bruno

1 0

Re: [PATCH v2 05/11] d3d11/tests: Add test for creating unordered access views.
by Henri Verbeet July 4, 2016

July 4, 2016

On 4 July 2016 at 12:26, Józef Kucia <jkucia(a)codeweavers.com> wrote: > +static void test_create_unordered_access_view(void) > +{ > + static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_11_0; > + D3D11_UNORDERED_ACCESS_VIEW_DESC uav_desc; > + D3D11_TEXTURE3D_DESC texture3d_desc; > + D3D11_TEXTURE2D_DESC texture2d_desc; > + ULONG refcount, expected_refcount; > + D3D11_SUBRESOURCE_DATA data = {0}; > + ID3D11UnorderedAccessView *uav; > + struct device_desc device_desc; > + D3D11_BUFFER_DESC buffer_desc; > + ID3D11Device *device, *tmp; > + ID3D11Texture3D *texture3d; > + ID3D11Texture2D *texture2d; > + ID3D11Resource *texture; > + ID3D11Buffer *buffer; > + IUnknown *iface; This is unused.

1 0

Re: PATCH] ws2_32: Allow user to enable IP dual stack.
by Marvin July 4, 2016

July 4, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=23959 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 1/2] msvcr120: Add fegetenv implementation
by Marvin July 4, 2016

July 4, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=23946 Your paranoid android. === w2008s64 (32 bit msvcr120) === msvcr120.c:706: Test failed: env.status = 0 === w2008s64 (64 bit msvcr120) === msvcr120.c:706: Test failed: env.status = 10

1 0

Re: [PATCH] advapi32: Add some tests for StartTrace(). (v2)
by Marvin July 4, 2016

July 4, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=23944 Your paranoid android. === wxppro (32 bit eventlog) === eventlog.c:1224: Test failed: Expected ERROR_INVALID_PARAMETER, got 161 eventlog.c:1235: Test failed: Expected ERROR_INVALID_PARAMETER, got 161 eventlog.c:1264: Test failed: Expected success eventlog.c:1272: Test failed: Expected ERROR_ALREADY_EXISTS, got 161 === w2003std (32 bit eventlog) === eventlog.c:1224: Test failed: Expected ERROR_INVALID_PARAMETER, got 161 eventlog.c:1235: Test failed: Expected ERROR_INVALID_PARAMETER, got 161 eventlog.c:1264: Test failed: Expected success eventlog.c:1272: Test failed: Expected ERROR_ALREADY_EXISTS, got 161 === wvistau64 (32 bit eventlog) === eventlog.c:1224: Test failed: Expected ERROR_INVALID_PARAMETER, got 161 eventlog.c:1235: Test failed: Expected ERROR_INVALID_PARAMETER, got 161 eventlog.c:1264: Test failed: Expected success eventlog.c:1272: Test failed: Expected ERROR_ALREADY_EXISTS, got 161 === w2008s64 (32 bit eventlog) === eventlog.c:1224: Test failed: Expected ERROR_INVALID_PARAMETER, got 161 eventlog.c:1235: Test failed: Expected ERROR_INVALID_PARAMETER, got 161 eventlog.c:1264: Test failed: Expected success eventlog.c:1272: Test failed: Expected ERROR_ALREADY_EXISTS, got 161 === w7u (32 bit eventlog) === eventlog.c:1224: Test failed: Expected ERROR_INVALID_PARAMETER, got 161 eventlog.c:1235: Test failed: Expected ERROR_INVALID_PARAMETER, got 161 eventlog.c:1264: Test failed: Expected success eventlog.c:1272: Test failed: Expected ERROR_ALREADY_EXISTS, got 161 === w7pro64 (32 bit eventlog) === eventlog.c:1224: Test failed: Expected ERROR_INVALID_PARAMETER, got 161 eventlog.c:1235: Test failed: Expected ERROR_INVALID_PARAMETER, got 161 eventlog.c:1264: Test failed: Expected success eventlog.c:1272: Test failed: Expected ERROR_ALREADY_EXISTS, got 161 === w8 (32 bit eventlog) === eventlog.c:1224: Test failed: Expected ERROR_INVALID_PARAMETER, got 161 eventlog.c:1235: Test failed: Expected ERROR_INVALID_PARAMETER, got 161 eventlog.c:1264: Test failed: Expected success eventlog.c:1272: Test failed: Expected ERROR_ALREADY_EXISTS, got 161 === w864 (32 bit eventlog) === eventlog.c:1224: Test failed: Expected ERROR_INVALID_PARAMETER, got 161 eventlog.c:1235: Test failed: Expected ERROR_INVALID_PARAMETER, got 161 eventlog.c:1264: Test failed: Expected success eventlog.c:1272: Test failed: Expected ERROR_ALREADY_EXISTS, got 161 === w1064 (32 bit eventlog) === eventlog.c:1224: Test failed: Expected ERROR_INVALID_PARAMETER, got 161 eventlog.c:1235: Test failed: Expected ERROR_INVALID_PARAMETER, got 161 eventlog.c:1264: Test failed: Expected success eventlog.c:1272: Test failed: Expected ERROR_ALREADY_EXISTS, got 161

1 0

Re: [PATCH] advapi32: Add some tests for StartTrace(). (v2)
by Austin English July 4, 2016

July 4, 2016

On Jul 4, 2016 1:25 AM, "Zebediah Figura" <z.figura12(a)gmail.com> wrote: > > --- > dlls/advapi32/tests/eventlog.c | 139 +++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 139 insertions(+) > > diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c > index 3ca59c3..5163537 100644 > --- a/dlls/advapi32/tests/eventlog.c > +++ b/dlls/advapi32/tests/eventlog.c > @@ -20,12 +20,15 @@ > > #include <stdarg.h> > > +#include "initguid.h" > #include "windef.h" > #include "winbase.h" > #include "winerror.h" > #include "winnt.h" > #include "winreg.h" > #include "sddl.h" > +#include "wmistr.h" > +#include "evntrace.h" > > #include "wine/test.h" > > @@ -1142,6 +1145,141 @@ static void cleanup_eventlog(void) > ok(bret, "Expected MoveFileEx to succeed: %d\n", GetLastError()); > } > > +static void test_trace(void) > +{ > + const char sessionname[] = "Wine"; > + const char filepath[] = "wine.etl"; > + const LONG lnoffset = ((sizeof(EVENT_TRACE_PROPERTIES) >> 3) + 1) << 3; //pad to 8 bytes > + const LONG lfnoffset = (((lnoffset + sizeof(sessionname)) >> 3) + 1) << 3; //pad to 8 bytes Please avoid C++ style comments, use /* this instead */

1 0

Re: [PATCH signed-off] secur32 : add and fix some algids
by Jacek Caban July 3, 2016

July 3, 2016

Hi Max, On 27.06.2016 05:29, Max Qian wrote: > Signed-off-by: Max Qian <public(a)maxqia.com> > --- > dlls/secur32/schannel_gnutls.c | 13 +++++++++---- > 1 file changed, 9 insertions(+), 4 deletions(-) > > diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c > index bcadd47..9d6af60 100644 > --- a/dlls/secur32/schannel_gnutls.c > +++ b/dlls/secur32/schannel_gnutls.c > @@ -316,10 +316,11 @@ static ALG_ID schannel_get_mac_algid(gnutls_mac_algorithm_t mac) > case GNUTLS_MAC_UNKNOWN: > case GNUTLS_MAC_NULL: return 0; > case GNUTLS_MAC_MD5: return CALG_MD5; > - case GNUTLS_MAC_SHA1: > - case GNUTLS_MAC_SHA256: > - case GNUTLS_MAC_SHA384: > - case GNUTLS_MAC_SHA512: return CALG_SHA; > + case GNUTLS_MAC_SHA1: return CALG_SHA1; > + case GNUTLS_MAC_MD2: return CALG_MD2; > + case GNUTLS_MAC_SHA256: return CALG_SHA_256; > + case GNUTLS_MAC_SHA384: return CALG_SHA_384; > + case GNUTLS_MAC_SHA512: return CALG_SHA_512; > default: > FIXME("unknown algorithm %d\n", mac); > return 0; > @@ -331,8 +332,12 @@ static ALG_ID schannel_get_kx_algid(gnutls_kx_algorithm_t kx) > switch (kx) > { > case GNUTLS_KX_RSA: return CALG_RSA_KEYX; > + case GNUTLS_KX_DHE_PSK: > case GNUTLS_KX_DHE_DSS: > case GNUTLS_KX_DHE_RSA: return CALG_DH_EPHEM; > + case GNUTLS_KX_ECDHE_RSA: > + case GNUTLS_KX_ECDHE_PSK: return CALG_ECDH; MSDN mentions CALG_ECDH_EPHEM, which would fit better, but it seems to be missing in headers. Returning CALG_ECDH is fine with me, but please add a comment about CALG_ECDH_EPHEM. > + case GNUTLS_KX_ECDHE_ECDSA: return CALG_ECDSA; You're mixing tabs and spaces. Please avoid using tabs. Thanks, Jacek

3 2

Re: [PATCH] wined3d/resource: Performance improvement
by Patrick Rudolph July 3, 2016

July 3, 2016

On 2016-07-03 11:55 AM, Stefan Dösinger wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA256 > > Am 2016-07-03 um 10:04 schrieb Henri Verbeet: >> Finally, there the possibility that Windows filters invalid flag >> combinations like Wine currently does, and picking either DISCARD >> or NOOVERWRITE will break an application that depends on that. > When I originally added support for dynamic buffers in 2010 or so I > just forwarded the flags to the driver. That did break some > applications. I'll try to find out which one it was, I believe I put > some details in the patch description. > > It's also possible that there are some differences between textures > and buffers. In d3d <= 9, D3DLOCK_NOOVERWRITE is not supported on > textures. So it might be filtered out, and DISCARD prevails. But my > understanding is that Unigine uses the questionable combination on > buffers, not textures. > It uses both flags on buffers in d3d9 mode. I'm going to add tests for it. Regards, Patrick > > > > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v2 > > iQIcBAEBCAAGBQJXeOEWAAoJEN0/YqbEcdMwBRQP/jsjUZXuKbUeoh3iaorwY02B > qZXhtc2IbQlZt2989jAGIjuZoCtE2sP8oRkmtbGI3nfIthOxFKrwcPKnqYiz40aF > JqCqYiwMNSpcqDKEhC92w8ad4F8AMBIG/4IUVBtU/uL0W2fBKNJ0rKE4v2sNefo1 > OTa0ZCtUSCbvErO9xgen43KparIRNK1juxlkE7CVHkWwK3oBl8GO+IzJ6ZKSN54A > ftz48C7if3y0ul2Xs/HVC/J3UqnksgL1sRnxUeDrFC6MRsNQZaf0D3Gn9vUdqukt > t+hxArnt6DEgMiPlbh3Zhoso4lNzoJJxPpldmWYAgEiU5l6BqVnvSuDUzZZGjLqz > 8dg0QEzjDbta5rLwMi6NnZxTYinx8F61YMOUSfMIkKofz4Xc7v2TnEsgMRI9XuoV > f9KZVssvpYoBuQHI0qEpK4eEBqlU/ZtFh39O+j13980Z6wNtnCQVYUtMcY8hU8Nv > kf5iN/eOuMVrMV6EKqZswJe1CHfAfhVhLfD9kOMRREb5MjrAVyreigbHR/RXG3BH > K9bWwCnnaVfQDtJzUw9ab+e+uSbkkiymjrkWY8JKI3E0d8YBnupxS8GcwJTT0y0t > x5K/Fzp/a2U+x4FV8MZewIhT4azA+DEsgHi/6dviRi6/8ct6J4TTZZqCRKtgWFBy > O8waYy1TvNoBQETnhMaC > =7Pmz > -----END PGP SIGNATURE-----

1 0

Re: Re: [PATCH] wined3d/resource: Performance improvement
by Patrick Rudolph July 3, 2016

July 3, 2016

> It makes logical sense to me that mapping a buffer with both DISCARD and > NOOVERWRITE would effectively ignore NOOVERWRITE. I've noticed that at > least some engines will map a part of a buffer with NOOVERWRITE and draw > with that part, map the next part of the buffer with NOOVERWRITE and > draw with that part, etc, then after the last part of the buffer it maps > with DISCARD to get new memory and keep going while the previous buffer > memory is handled asynchronously by the driver or card. > > I notice that wined3d has some parts where it ignores/removes DISCARD, > so it may not be a good idea to leave both DISCARD and NOOVERWRITE set. > In such a case, the driver will get NOOVERWRITE for a part of the buffer > that's still in use. It would probably be better to remove NOOVERWRITE > when both DISCARD and NOOVERWRITE are set. Both flags are independent of each other and provide useful information to the OpenGL driver. The driver knows best how to map the resource. By passing NOOVERWRITE and DISCARD it's likely going to use NOOVERWRITE, as it's even less overhead than DISCARD. I don't think that WINE should drop flags, except there's a driver bug that can't be fixed (in the near future). Regards, Patrick

3 2

Re: [PATCH 3/3] kernel32/tests/thread: Add tests for fiber-local storage.
by Marvin July 2, 2016

July 2, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=23919 Your paranoid android. === w1064 (32 bit thread) === thread.c:1086: Test failed: got 0 with 5 (expected FALSE with ERROR_GEN_FAILURE)

1 0

Re: [PATCH 2/3] kernel32/tests/loader: Add tests for fiber-local storage.
by Marvin July 2, 2016

July 2, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=23918 Your paranoid android. === w2003std (32 bit loader) === loader.c:1772: Test failed: FlsGetValue returned 00031415, expected NULL loader.c:1545: Test failed: FlsGetValue returned 00031415, expected NULL loader.c:1550: Test failed: wrong FLS callback count 1, expected 2 loader.c:1774: Test failed: FlsGetValue failed with error 87 loader.c:1774: Test failed: FlsGetValue failed with error 87 loader.c:1545: Test failed: FlsGetValue returned 00031415, expected NULL loader.c:1550: Test failed: wrong FLS callback count 0, expected 1 loader.c:1774: Test failed: FlsGetValue failed with error 87 loader.c:1774: Test failed: FlsGetValue failed with error 87 loader.c:1772: Test failed: FlsGetValue returned 00031415, expected NULL loader.c:1772: Test failed: FlsGetValue returned 00031415, expected NULL loader.c:1545: Test failed: FlsGetValue returned 00031415, expected NULL loader.c:1550: Test failed: wrong FLS callback count 2, expected 3 loader.c:1774: Test failed: FlsGetValue failed with error 87 loader.c:1774: Test failed: FlsGetValue failed with error 87 === w864 (32 bit loader) === loader.c:1917: Test failed: expected STILL_ACTIVE, got 195 loader.c:1952: Test failed: expected STILL_ACTIVE, got 195 === w1064 (32 bit loader) === loader.c:2830: Test failed: Test 0: ResolveDelayLoadedAPI failed loader.c:2831: Test failed: Test 0: expected 74374550, got 00000000 loader.c:2830: Test failed: Test 1: ResolveDelayLoadedAPI failed loader.c:2831: Test failed: Test 1: expected 72BC2CF0, got 00000000 loader.c:2830: Test failed: Test 2: ResolveDelayLoadedAPI failed loader.c:2831: Test failed: Test 2: expected 74372DC0, got 00000000 loader.c:2838: Test failed: Test 3: ResolveDelayLoadedAPI succeeded with 00000000 loader.c:2839: Test failed: Test 3: Wrong callback count: 0 loader.c:2838: Test failed: Test 4: ResolveDelayLoadedAPI succeeded with 00000000 loader.c:2839: Test failed: Test 4: Wrong callback count: 0 loader.c:1917: Test failed: expected STILL_ACTIVE, got 195 loader.c:1952: Test failed: expected STILL_ACTIVE, got 195 === w1064 (64 bit loader) === loader.c:2830: Test failed: Test 0: ResolveDelayLoadedAPI failed loader.c:2831: Test failed: Test 0: expected 00007FFC76DA5510, got 0000000000000000 loader.c:2830: Test failed: Test 1: ResolveDelayLoadedAPI failed loader.c:2831: Test failed: Test 1: expected 00007FFC6EFE1B00, got 0000000000000000 loader.c:2830: Test failed: Test 2: ResolveDelayLoadedAPI failed loader.c:2831: Test failed: Test 2: expected 00007FFC76DA2390, got 0000000000000000 loader.c:2838: Test failed: Test 3: ResolveDelayLoadedAPI succeeded with 0000000000000000 loader.c:2839: Test failed: Test 3: Wrong callback count: 0 loader.c:2838: Test failed: Test 4: ResolveDelayLoadedAPI succeeded with 0000000000000000 loader.c:2839: Test failed: Test 4: Wrong callback count: 0 loader.c:1917: Test failed: expected STILL_ACTIVE, got 195 loader.c:1952: Test failed: expected STILL_ACTIVE, got 195

1 0

Re: [PATCH 1/3] kernel32/tests/fiber: Add tests for fiber-local storage.
by Marvin July 2, 2016

July 2, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=23917 Your paranoid android. === w2003std (32 bit fiber) === fiber: unhandled exception c0000005 at 77E61897

1 0

Re: mmdevapi/tests: Fix typos in a few ok() messages.
by Marvin July 2, 2016

July 2, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=23913 Your paranoid android. === w8 (32 bit capture) === capture.c:181: Test failed: Position 1015 expected 0 capture.c:231: Test failed: Position 2167 expected 1463 capture.c:263: Test failed: Position 2167 expected 1463 capture.c:325: Test failed: Position 3255 gap 1344 capture.c:349: Test failed: Position 4343 expected 3703 capture.c:374: Test failed: Position 4791 expected 4151 === w864 (32 bit capture) === capture.c:181: Test failed: Position 1015 expected 0 capture.c:231: Test failed: Position 2167 expected 1463 capture.c:263: Test failed: Position 2167 expected 1463 capture.c:325: Test failed: Position 3255 gap 1344 capture.c:329: Test failed: GCP 13888 vs. BufferSize 21996 capture.c:349: Test failed: Position 4343 expected 3703 capture.c:350: Test failed: flags 1 capture.c:374: Test failed: Position 4791 expected 4151 === w1064 (32 bit capture) === capture.c:181: Test failed: Position 1079 expected 0 capture.c:231: Test failed: Position 2167 expected 1527 capture.c:263: Test failed: Position 2167 expected 1527 capture.c:325: Test failed: Position 4151 gap 2176 capture.c:329: Test failed: GCP 11648 vs. BufferSize 21996 capture.c:349: Test failed: Position 5239 expected 4599 capture.c:350: Test failed: flags 1 capture.c:374: Test failed: Position 5687 expected 5047 === w864 (64 bit capture) === capture.c:181: Test failed: Position 119 expected 0 capture.c:231: Test failed: Position 2167 expected 567 capture.c:263: Test failed: Position 2167 expected 567 capture.c:325: Test failed: Position 3191 gap 2176 === w1064 (64 bit capture) === capture.c:181: Test failed: Position 1079 expected 0 capture.c:231: Test failed: Position 2167 expected 1527 capture.c:263: Test failed: Position 2167 expected 1527 capture.c:325: Test failed: Position 4151 gap 2176 capture.c:329: Test failed: GCP 12992 vs. BufferSize 21996 capture.c:349: Test failed: Position 5303 expected 4599 capture.c:350: Test failed: flags 1 capture.c:374: Test failed: Position 5751 expected 5047

1 0

Re: [PATCH] winspool.drv: Support cups 2.2 header update
by Bruno Jesus July 1, 2016

July 1, 2016

On Fri, Jul 1, 2016 at 6:32 PM, Michael Cronenworth <mike(a)cchtml.com> wrote: > Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> > --- > dlls/winspool.drv/info.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c > index 3ba94cd..5468066 100644 > --- a/dlls/winspool.drv/info.c > +++ b/dlls/winspool.drv/info.c > @@ -43,6 +43,9 @@ > #include <signal.h> > #ifdef HAVE_CUPS_CUPS_H > # include <cups/cups.h> > +# if CUPS_VERSION_MAJOR > 2 || (CUPS_VERSION_MAJOR == 2 && CUPS_VERSION_MINOR > 1) > +# include <cups/ppd.h> > +# endif > #endif Hi, AFAICS this other patch from Ken Thomases in the queue will do the same: http://source.winehq.org/patches/data/123755 Best wishes, Bruno

1 0

Re: [PATCH] ws2_32: Allow user to enable IP dual stack.
by Bruno Jesus July 1, 2016

July 1, 2016

On Thu, Jun 30, 2016 at 5:57 AM, Matthieu Nottale <matthieu.nottale(a)infinit.io> wrote: > > IP dual stack (v4+v6) should be disabled by default, but previous code > was setting IPV6_V6ONLY in bind() which prevented user to override it. > This patch moves setting IPV6_V6ONLY to socket creation time. Hi, can you explain more about what is the problem? Is there any application affected? > @@ -7163,6 +7149,14 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, > TRACE("\tcreated %04lx\n", ret ); > if (ipxptype > 0) > set_ipx_packettype(ret, ipxptype); > +#ifdef IPV6_V6ONLY > + if (af == WS_AF_INET6) > + { > + // dual stack (v4+v6) should be disabled by default > + int enable = 1; > + WS_setsockopt(ret, WS_IPPROTO_IPV6, WS_IPV6_V6ONLY, &enable, sizeof(enable)); > + } > +#endif > return ret; > } // comments are not allowed, use /* */. Please use unixaf == AF_INET6 as the code uses that as the af var was already parsed by this point in the code. And please write tests to prove this behavior, create the AF_INET6 socket and getsockopt(IPV6_V6ONLY) in order to determine the default on Windows and then bind and read again to prove it does not change automagically (like Wine is doind). Since in Wine the operation is only done when binding to anyaddr it should be useful to also try a specific address bind and check too. Best wishes, Bruno

1 0