May 2017 - Wine-Devel - list.winehq.org

Re: [APPDB] query.php: implement query_affected_rows()
by Sebastian Lackner May 14, 2017

May 14, 2017

On 15.05.2017 03:13, Rosanne DiMesio wrote: > +function query_affected_rows(); Does this change work as expected? The ";" at the end of the function definition looks suspicious.

2 1

Re: [PATCH] dwrite/tests: Fix rendering mode variable type (Coverity)
by Sebastian Lackner May 14, 2017

May 14, 2017

On 14.05.2017 22:49, Nikolay Sivov wrote: > - mode1 = IDWriteRenderingParams3_GetRenderingMode(params3); > - ok(mode1 == DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC, "got %d\n", mode1); > + mode = IDWriteRenderingParams3_GetRenderingMode(params3); > + ok(mode == DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC, "got %d\n", mode1); ^^^^^ What about the remaining occurrence of mode1?

1 0

Re: [v7 PATCH] oleaut32: Improve support for IDispatch in VarCat
by Marvin May 11, 2017

May 11, 2017

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=30935 Your paranoid android. === wxppro (32 bit vartest) === vartest.c:6153: Test failed: got 0x8007000e === w2003std (32 bit vartest) === vartest.c:6153: Test failed: got 0x8007000e === wvistau64 (32 bit vartest) === vartest.c:6153: Test failed: got 0x8007000e === w2008s64 (32 bit vartest) === vartest.c:6153: Test failed: got 0x8007000e === w7u (32 bit vartest) === vartest.c:6153: Test failed: got 0x8007000e === w7pro64 (32 bit vartest) === vartest.c:6153: Test failed: got 0x8007000e === w8 (32 bit vartest) === vartest.c:6153: Test failed: got 0x8007000e === w864 (32 bit vartest) === vartest.c:6153: Test failed: got 0x8007000e === w1064 (32 bit vartest) === vartest.c:6153: Test failed: got 0x8007000e === wvistau64 (64 bit vartest) === vartest.c:6153: Test failed: got 0x8007000e === w2008s64 (64 bit vartest) === vartest.c:6153: Test failed: got 0x8007000e === w7pro64 (64 bit vartest) === vartest.c:6153: Test failed: got 0x8007000e === w864 (64 bit vartest) === vartest.c:6153: Test failed: got 0x8007000e === w1064 (64 bit vartest) === vartest.c:6153: Test failed: got 0x8007000e

1 0

Re: [v6 PATCH] oleaut32: Improve support for IDispatch in VarCat
by Sebastian Lackner May 11, 2017

May 11, 2017

On 12.05.2017 02:11, Alistair Leslie-Hughes wrote: > +static HRESULT WINAPI DummyDispatch_Invoke(IDispatch *iface, > + DISPID dispid, REFIID riid, > + LCID lcid, WORD wFlags, > + DISPPARAMS *params, > + VARIANT *res, > + EXCEPINFO *ei, > + UINT *arg_err) > +{ [...] > + if (FAILED(This->result)) > + return FAILED(This->result); I didn't review the whole patch, but this return value looks suspicious for a HRESULT function.

1 0

Re: [PATCH 8/9] d3dx9: Add test for 'cmp' preshader opcode.
by Matteo Bruni May 11, 2017

May 11, 2017

2017-05-08 17:39 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/tests/effect.c | 33 +++++++++++++++++++++++++++++---- > 1 file changed, 29 insertions(+), 4 deletions(-) > > diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c > index 015b505..dfc3f5b 100644 > --- a/dlls/d3dx9_36/tests/effect.c > +++ b/dlls/d3dx9_36/tests/effect.c > @@ -4490,7 +4490,8 @@ static void test_preshader_op(IDirect3DDevice9 *device, const DWORD *sample_effe > { > {0, 0, 0}, > {5549, 0, 4}, > - {5400, 2, 1} > + {5400, 2, 1}, > + {4121, 0, 1} > }; You could add a ',' after the new array element so that, if we ever need to add another test, that line doesn't need to be changed. Just mentioning it since you have to resend anyway. > DWORD *test_effect_blob; > HRESULT hr; > @@ -4506,8 +4507,30 @@ static void test_preshader_op(IDirect3DDevice9 *device, const DWORD *sample_effe > > test_effect_blob = HeapAlloc(GetProcessHeap(), 0, sample_effect_blob_size); > memcpy(test_effect_blob, sample_effect_blob, sample_effect_blob_size); > - for (i = 0; i < blob_position[test->args_count].ins_count; ++i) > - test_effect_blob[op_pos + i * op_step] = test->opcode; > + > + if (test->args_count == 3) > + { > + DWORD *pos; > + > + pos = &test_effect_blob[op_pos - 1]; > + *pos++ = 1; > + *pos++ = test->opcode; > + *pos++ = test->args_count; > + for (i = 0; i < 3; ++i) > + { > + *pos++ = 0; > + *pos++ = 2; > + *pos++ = i == 2 ? 4 : 0; > + } > + *pos++ = 0; > + *pos++ = 4; > + *pos++ = 0; > + } > + else > + { > + for (i = 0; i < blob_position[test->args_count].ins_count; ++i) > + test_effect_blob[op_pos + i * op_step] = test->opcode; > + } I think this is getting more and more ugly. What about writing an effect with those 3 preshaders by hand instead? You could start with those edited effect fragments, fixing them up and putting them together in a new effect blob. Sprinkle over some comments as necessary. I'm not going to block the patch for this reason but I think it's something worth exploring.

2 15

Re: [APPDB] admin.php: fix incorrect call to query_affected_rows
by Bruno Jesus May 11, 2017

May 11, 2017

On Thu, May 11, 2017 at 3:27 PM, Rosanne DiMesio <dimesio(a)earthlink.net> wrote: > Should be query_num_rows. > > Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> > --- > admin.php | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/admin.php b/admin.php > index 09c0aca..fe1ccc6 100644 > --- a/admin.php > +++ b/admin.php > @@ -199,7 +199,7 @@ function fixNoteLinks() > > echo " Deleting note links "; > $hResult = query_parameters("DELETE FROM appNotes WHERE linkedWith != '0'"); > - echo "Deleted ".query_affected_rows()." links "; > + echo "Deleted ".query_num_rows()." links "; Is this some particularity of the wrapper database function? I say that because for example both mysql and postgresql have the 2 distinct functions where affected_rows is used for delete/update and num_rows is used for select queries.

1 0

Re: [APPDB] admin.php: fix incorrect call to query_affected_rows
by Michael Müller May 11, 2017

May 11, 2017

Am 11.05.2017 um 20:27 schrieb Rosanne DiMesio: > $hResult = query_parameters("DELETE FROM appNotes WHERE linkedWith != '0'"); > - echo "Deleted ".query_affected_rows()." links "; > + echo "Deleted ".query_num_rows()." links "; I suspect the new code is as broken as the old one. The function query_num_rows returns the number of query results, which is always zero for a DELETE query. The correct solution would be to implement query_affected_rows() based on the corresponding php function [1]. [1]: http://php.net/manual/de/mysqli.affected-rows.php

1 0

Re: [PATCH] winemac.drv: Implement systray version 1-3 notifications.
by Ken Thomases May 11, 2017

May 11, 2017

On May 11, 2017, at 6:15 AM, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > > Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> > > --- > > I am not sure how to handle NOTIFY_VERSION_4. The click events do not contain > a coordinate and I don't know how to read the position of the icon. The first > issue is probably trivial to handle by assuming a fixed coordinate because the > icon isn't all that big anyway. The latter is a larger problem because a wrong > coordinate could cause an app to show a popup in the wrong place. Also on dual > screen setups there are two copies of the status bar and two icon copies. Pick > the wrong one and things go bad as well. Thanks. I've sent a modified version that properly handles version 4. The internal events that you were looking at didn't contain the position, but can be made to. :) -Ken

1 0

Re: [PATCH] oleaut32: Improve support for IDispatch in VarCat
by Jacek Caban May 11, 2017

May 11, 2017

Hi Alistair, On 17.04.2017 05:43, Alistair Leslie-Hughes wrote: > diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c > index 17f753af70..6f695c3f37 100644 > --- a/dlls/oleaut32/variant.c > +++ b/dlls/oleaut32/variant.c > @@ -2611,6 +2611,13 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) > V_VT(&bstrvar_left) = VT_BSTR; > V_BSTR(&bstrvar_left) = SysAllocString(sz_empty); > } > + else if (rightvt == VT_DISPATCH) > + { > + /* The returned Dispatch Value, may not be able to be coerced, ie. VT_NULL */ > + hres = VariantChangeTypeEx(&bstrvar_left,left,0,0,VT_BSTR); > + if (hres != S_OK && hres != DISP_E_TYPEMISMATCH) > + return hres; > + } > else > { > hres = VariantChangeTypeEx(&bstrvar_left,left,0,0,VT_BSTR); > @@ -2651,6 +2658,13 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) > V_VT(&bstrvar_right) = VT_BSTR; > V_BSTR(&bstrvar_right) = SysAllocString(sz_empty); > } > + else if (rightvt == VT_DISPATCH) > + { > + /* The returned Dispatch Value, may not be able to be coerced, ie. VT_NULL */ > + hres = VariantChangeTypeEx(&bstrvar_right,right,0,0,VT_BSTR); > + if (hres != S_OK && hres != DISP_E_TYPEMISMATCH) > + return hres; > + } > else > { > hres = VariantChangeTypeEx(&bstrvar_right,right,0,0,VT_BSTR); While this change may do the right thing in the case you're fixing, the whole surrounding code looks just wrong and I don't like the idea of making it even more complicated to work around problem in this single case. For example take a look at if() statement in line 2620. It's never executed, because it requires leftvt to be VT_NULL, which is handled elsewhere (line 2609). If you remove that if(), this call is almost identical to what you add here as a special case. The only difference is DISP_E_TYPEMISMATCH handling. Did you investigate what happens in such case? Maybe we should handle VariantChangeTypeEx failures like you do in the patch? Thanks, Jacek

1 0

Re: [PATCH 3/9] d3dx9: Add 'asin' preshader opcode.
by Matteo Bruni May 11, 2017

May 11, 2017

2017-05-08 17:39 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > +/* is_nan() does not work (by design) if compiled with gcc -ffinite-math-only option which is implied by > + * -ffast_math. */ > +static BOOL pres_is_nan(double v) > +{ > + return (*(ULONG64 *)&v & 0x7ff8000000000000) == 0x7ff8000000000000; > +} I don't think we care about people compiling Wine with broken CFLAGS. We should just trust the isnan() library function. FWIW we already do so in other places in Wine.

2 3

Re: [PATCH 7/7] wined3d: Add support for patch constant signatures.
by Henri Verbeet May 11, 2017

May 11, 2017

On 10 May 2017 at 15:54, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + if (FAILED(hr = shader_signature_calculate_strings_length(&desc->input_signature, &len))) > + return hr; > + total = len; > + if (FAILED(hr = shader_signature_calculate_strings_length(&desc->output_signature, &len))) > + return hr; > + total += len; > + if (FAILED(hr = shader_signature_calculate_strings_length(&desc->patch_constant_signature, &len))) > + return hr; > + total += len; It's perhaps a fairly theoretical concern, but I think you can still make "total" overflow here.

1 0

Re: [PATCH 3/6 v2] dmusic: Implement IDirectMusic8::SetDirectSound()
by Sebastian Lackner May 10, 2017

May 10, 2017

On 10.05.2017 15:13, Michael Stefaniuc wrote: > + > + if (This->dsound) > + IDirectSound_Release(This->dsound); > + > + if (!dsound) { > + hr = DirectSoundCreate8(NULL, (IDirectSound8 **)&This->dsound, NULL); > + if (FAILED(hr)) > + return hr; > + hr = IDirectSound_SetCooperativeLevel(This->dsound, hwnd ? hwnd : GetForegroundWindow(), > + DSSCL_PRIORITY); > + if (FAILED(hr)) > + IDirectSound_Release(This->dsound); > + return hr; > + } > Shouldn't you unset This->dsound in the error paths (especially the last one)?

2 1

Re: [PATCH 3/6] d3d11/tests: Port test_clear_state() from d3d10core.
by Henri Verbeet May 10, 2017

May 10, 2017

On 9 May 2017 at 12:51, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + refcount = ID3D11Device_Release(device); > + ok(!refcount, "Device has %u references left.\n", refcount); > +} This test hangs for me on Windows. Specifically, the issue seems to be the final release of the device.

2 1

Wine native fps overlay
by CARLOS RODRIGUEZ May 10, 2017

May 10, 2017

>The big picture answer to your feature requests is that Wine is a tool to run Windows apps and all these things are side features that can be added with other tools and partially exist in drivers.If we add code for that it needs to be maintained, taking away attention from our main goal. I once tried to make FRAPS run in Wine, which would give you an option to add an FPS overlay to pretty much all d3d or GL apps. Unfortunately its DLL injection code doesn't work, and fixing it would require changes to the linker and/or dynamic loader, which is rather tricky. Likewise you can write a more generic FPS limiting or vsync forcing tool with LD_PRELOAD. That way it would also work with non-wine apps.>Unfortunate but for now nikolay suggestion (WINEDEBUG=-all,+fps) works without issues (only shows fps information and seems improve performance in some apps too)

1 0

Re: [PATCH] ws2_32: Use unsigned interface index on interface_bind_check
by Alexandre Julliard May 10, 2017

May 10, 2017

Bruno Jesus <bjesus(a)codeweavers.com> writes: > The exotic interface indexes used by linux for tun/ppp connections may > cause problems resulting in interface_bind_check not finding the > expected interface during loop. > > Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> > --- > dlls/ws2_32/socket.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) The error checking would need to be adapted then, checking ifindex > 0 no longer makes much sense. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [v4 PATCH 2/3] include/wmsdkidl.idl: Add more interfaces
by Alex Henrie May 10, 2017

May 10, 2017

Getting closer. + HRESULT GetPriorityRecords( + [out] WM_STREAM_PRIORITY_RECORD *arrray, + [in, out] WORD *records); + + HRESULT SetPriorityRecords( + [in] WM_STREAM_PRIORITY_RECORD *arrray, + [in] WORD records); "array" is spelled with two R's. + HRESULT ResetLoggingUrlList( ); None of the other zero-argument functions in this file have a space between the parentheses. + HRESULT SetMaxPacketSize([in] DWORD size); + HRESULT SetMinPacketSize([in] DWORD size); None of the other functions in this file have two spaces between [in] and the variable type. + HRESULT GetPlayOutputLevels( + [out, size_is( *length )] DRM_PLAY_OPL *play, + [in, out] DWORD *length, + [out] DWORD *level); + + HRESULT GetCopyOutputLevels( + [out, size_is( *length )] DRM_COPY_OPL *copy, + [in, out] DWORD *length, + [out] DWORD *compliance); Why did you name the variable "level" in the first function and "compliance" in the second? It seems like they should be the same. -Alex

1 0

Re: [v3 PATCH 2/3] include/wmsdkidl.idl: Add more interfaces
by Alex Henrie May 10, 2017

May 10, 2017

These functions have formatting inconsistencies: + HRESULT GetPriorityRecords( + [out] WM_STREAM_PRIORITY_RECORD *arrray, + [in, out] WORD *records); + HRESULT SetPriorityRecords( + [in] WM_STREAM_PRIORITY_RECORD *arrray, + [in] WORD records); + HRESULT ResetLoggingUrlList( ); + HRESULT SetMaxPacketSize([in] DWORD size); + HRESULT SetMinPacketSize([in] DWORD size); + HRESULT GetDRMProperty( + [in] const WCHAR *name, + [out] WMT_ATTR_DATATYPE* type, + [out, size_is( *length )] BYTE *value, + [in, out] WORD *length); These functions have naming inconsistencies: + HRESULT GetPlayOutputLevels( + [out, size_is( *length )] DRM_PLAY_OPL *play, + [in, out] DWORD *length, + [out] DWORD *pdwMinAppComplianceLevel); + HRESULT GetTimecodeRangeBounds( + [in] WORD stream, + [in] WORD Range, + [out] DWORD *start_timecode, + [out] DWORD *end_timecode); Please spend some time double and triple checking before submitting again. -Alex

1 0

Re: [v2 PATCH 2/3] include/wmsdkidl.idl: Add more interfaces
by Alex Henrie May 10, 2017

May 10, 2017

The formatting is a little better now, but it's still all over the place. Please make every function declaration match the existing code in this file. For example, for a function with one argument: HRESULT GetType([out] GUID *guid); And for a function with multiple arguments: HRESULT GetProxyPort( [in] LPCWSTR protocol, [out] DWORD *port); -Alex

1 0

Re: [PATCH 2/3] include/wmsdkidl.idl: Add more interfaces
by Alex Henrie May 10, 2017

May 10, 2017

- WMT_CODECINFO_UNKNOWN = 0xFFFFFFFF, + WMT_CODECINFO_UNKNOWN = 0xffffffff, I think this qualifies as a gratuitous formatting change. + HRESULT GetBandwidth( [out] DWORD *bitrate, + [out] DWORD *buffer ); + + HRESULT SetBandwidth( [in] DWORD bitrate, + [in] DWORD buffer ); The extra spaces after the left parentheses look like a mistake; they don't match the format in the rest of the file. + HRESULT GetBandwidthSharing( [in] DWORD index, + [out] IWMBandwidthSharing **bandwidth ); + HRESULT GetExpectedPacketCount( [in] QWORD duration, + [out] QWORD *packets ); + HRESULT SetDRMProperty( [in] const WCHAR *name, [in] WMT_ATTR_DATATYPE type, + [in, size_is( length )] const BYTE *value, + [in] WORD length ); + HRESULT GetDRMProperty( [in] const WCHAR *name, [out] WMT_ATTR_DATATYPE* type, + [out, size_is( *length )] BYTE *value, + [in, out] WORD *length ); Again, pick a whitespace style and stick to it. In particular, decide whether you want to break the line after each variable or after reaching 80, 100, or 120 characters. -Alex

3 3

Re: [RFC] README: Update Linux version requirement to 2.3.31.
by wylda＠volny.cz May 9, 2017

May 9, 2017

>>If winecfg runs, that should be good enough. Optional packages can be >>backported if necessary. >> > >OK, then I will concentrate on min kernel version :) > Currently blocked by Bug 42986.

1 0

Wine native fps overlay
by CARLOS RODRIGUEZ May 9, 2017

May 9, 2017

>You suppress the rest of traces, like -all,+fps. >Many thanks i dont know this option can be used at same time, i thinking -all can disable +fpsAlmost forget will be posible wine can add some fps limiter, this will be usefull in many older titles when vsync dont workThanks again

3 2

Re: [PATCH 3/3] mshtml: Use IE version dependent on compatibility mode for conditional comments.
by Marvin May 9, 2017

May 9, 2017

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=30879 Your paranoid android. === w7u (32 bit htmldoc) === htmldoc.c:2671: Test failed: unexpected call GetOverrideKeyPath

1 0

Re: [PATCH 1/3] mshtml: Don't expose doScroll in IE11 document mode.
by Marvin May 9, 2017

May 9, 2017

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=30878 Your paranoid android. === w7u (32 bit htmldoc) === htmldoc.c:2671: Test failed: unexpected call GetOverrideKeyPath

1 0

Re: [PATCH] ws2_32: Don't post completion packet if receiving fails with error immediately.
by Bruno Jesus May 9, 2017

May 9, 2017

On Mon, May 8, 2017 at 4:41 PM, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > This fixes bug 38980. > > This patch is the equivalent to 1bbe92e7 for receiving operations. > Application in bug 38980 uses libtorrent, which in turn uses boost's > async IO classes. Boost starts IO operations and waits for their results > via IOCP. If the operation fails right away it enqueues a completion > status itself. By failing and enquing a status we broke Boost's > receiving logic - after the first status was read the internal data was > reused elsewhere (though the pointer was not freed). The second IOCP > result caused boost to call libtorrent's callback function with bad > parameters, ultimately causing a segfault or assertion violation in > libtorrent. Awesome work, thanks ;-) Some unused SetLastError calls and since I'm sending an email why not complain more? > Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> > --- > dlls/ws2_32/socket.c | 2 - > dlls/ws2_32/tests/sock.c | 127 +++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 127 insertions(+), 2 deletions(-) > > diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c > index 9d27fab..0950754 100644 > --- a/dlls/ws2_32/socket.c > +++ b/dlls/ws2_32/socket.c > @@ -7744,9 +7744,7 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, > > if (errno != EAGAIN) > { > - int loc_errno = errno; > err = wsaErrno(); > - if (cvalue) WS_AddCompletion( s, cvalue, sock_get_ntstatus(loc_errno), 0 ); > goto error; > } > } > diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c > index 023eb42..7fefff5 100644 > --- a/dlls/ws2_32/tests/sock.c > +++ b/dlls/ws2_32/tests/sock.c > @@ -9299,6 +9299,133 @@ static void test_completion_port(void) > if (dest != INVALID_SOCKET) > closesocket(dest); > > + /* Test IOCP response on successful immediate read. */ > + tcp_socketpair(&src, &dest); > + if (src == INVALID_SOCKET || dest == INVALID_SOCKET) > + { > + skip("failed to create sockets\n"); > + goto end; > + } > + > + bufs.len = sizeof(buf); > + bufs.buf = buf; > + flags = 0; > + > + iret = WSASend(src, &bufs, 1, &num_bytes, 0, &ov, NULL); > + ok(!iret, "WSASend failed - %d\n", iret); Some winsock functions are basically boolean where 0 is true and SOCKET_ERROR is false, so (I believe) in most other places we use "WSASend failed with error %d", GetLastError()). This would require a previous SetLastError. > + ok(num_bytes == sizeof(buf), "Managed to send %d\n", num_bytes); I believe most code in ws2_32 prefer "Expected X, got Y\n". > + > + io_port = CreateIoCompletionPort((HANDLE)dest, previous_port, 125, 0); > + ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); > + > + set_blocking(dest, FALSE); > + > + Sleep(100); Better to remove the extra new empty line as in the other use of Sleep there is no empty line. Besides it makes it harder for AJ to see you are adding sleep to tests :-) > + > + num_bytes = 0xdeadbeef; > + SetLastError(0xdeadbeef); SetLastError forever alone, no GetLastError. Maybe reuse the format from above? > + flags = 0; > + > + iret = WSARecv(dest, &bufs, 1, &num_bytes, &flags, &ov, NULL); > + ok(!iret, "WSARecv failed - %d\n", iret); > + ok(num_bytes == sizeof(buf), "Managed to read %d\n", num_bytes); Reuse expected/got message format? > + SetLastError(0xdeadbeef); > + key = 0xdeadbeef; > + num_bytes = 0xdeadbeef; > + olp = (WSAOVERLAPPED *)0xdeadbeef; > + > + bret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 200 ); > + ok(bret == TRUE, "failed to get completion status %u\n", bret); > + ok(GetLastError() == 0xdeadbeef, "Last error was %d\n", GetLastError()); > + ok(key == 125, "Key is %lu\n", key); > + ok(num_bytes == sizeof(buf), "Number of bytes transferred is %u\n", num_bytes); > + ok(olp == &ov, "Overlapped structure is at %p\n", olp); > + > + /* Test IOCP response on graceful shutdown. */ > + closesocket(src); > + Sleep(100); > + > + num_bytes = 0xdeadbeef; > + SetLastError(0xdeadbeef); No GetLastError. > + flags = 0; > + memset(&ov, 0, sizeof(ov)); > + > + iret = WSARecv(dest, &bufs, 1, &num_bytes, &flags, &ov, NULL); > + ok(!iret, "WSARecv failed - %d\n", iret); > + ok(!num_bytes, "Managed to read %d\n", num_bytes); > + > + SetLastError(0xdeadbeef); > + key = 0xdeadbeef; > + num_bytes = 0xdeadbeef; > + olp = (WSAOVERLAPPED *)0xdeadbeef; > + > + bret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 200 ); > + ok(bret == TRUE, "failed to get completion status %u\n", bret); > + ok(GetLastError() == 0xdeadbeef, "Last error was %d\n", GetLastError()); > + ok(key == 125, "Key is %lu\n", key); > + ok(!num_bytes, "Number of bytes transferred is %u\n", num_bytes); > + ok(olp == &ov, "Overlapped structure is at %p\n", olp); > + > + closesocket(src); > + src = INVALID_SOCKET; > + closesocket(dest); > + dest = INVALID_SOCKET; > + > + /* Test IOCP response on hard shutdown. */ > + tcp_socketpair(&src, &dest); > + if (src == INVALID_SOCKET || dest == INVALID_SOCKET) > + { > + skip("failed to create sockets\n"); > + goto end; > + } > + > + bufs.len = sizeof(buf); > + bufs.buf = buf; > + flags = 0; > + memset(&ov, 0, sizeof(ov)); > + > + ling.l_onoff = 1; > + ling.l_linger = 0; > + iret = setsockopt (src, SOL_SOCKET, SO_LINGER, (char *) &ling, sizeof(ling)); > + ok(!iret, "Failed to set linger %d\n", GetLastError()); > + > + io_port = CreateIoCompletionPort((HANDLE)dest, previous_port, 125, 0); > + ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); > + > + set_blocking(dest, FALSE); > + > + closesocket(src); > + src = INVALID_SOCKET; > + > + Sleep(100); > + > + num_bytes = 0xdeadbeef; > + SetLastError(0xdeadbeef); > + > + /* Somehow a hard shutdown doesn't work on my Linux box. It seems SO_LINGER is ignored. */ AFAIR this is not your fault, it is a bug. WSARecv has a particular behavior of not returning a "0 bytes read", instead it returns error with WSAECONNRESET. Wine simply returns success with 0 bytes, which stands for connection reset in the old recv() way. This explains the 3 todo_wine below. > + iret = WSARecv(dest, &bufs, 1, &num_bytes, &flags, &ov, NULL); > + todo_wine ok(iret == SOCKET_ERROR, "WSARecv failed - %d\n", iret); > + todo_wine ok(GetLastError() == WSAECONNRESET, "Last error was %d\n", GetLastError()); > + todo_wine ok(num_bytes == 0xdeadbeef, "Managed to send %d\n", num_bytes); Expected/got format? If not the sentence is wrong: send/recv. > + > + SetLastError(0xdeadbeef); > + key = 0xdeadbeef; > + num_bytes = 0xdeadbeef; > + olp = (WSAOVERLAPPED *)0xdeadbeef; > + > + bret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 200 ); > + todo_wine ok(bret == FALSE, "GetQueuedCompletionStatus returned %u\n", bret ); > + todo_wine ok(GetLastError() == WAIT_TIMEOUT, "Last error was %d\n", GetLastError()); > + todo_wine ok(key == 0xdeadbeef, "Key is %lu\n", key); > + todo_wine ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %u\n", num_bytes); > + todo_wine ok(!olp, "Overlapped structure is at %p\n", olp); > + > + num_bytes = 0xdeadbeef; > + SetLastError(0xdeadbeef); > + > + closesocket(dest); > + > dest = socket(AF_INET, SOCK_STREAM, 0); > if (dest == INVALID_SOCKET) > { > -- > 2.10.2 > > >

3 2

Re: [APPDB] Remove Steam and GOG from licenses
by Bruno Jesus May 8, 2017

May 8, 2017

On Mon, May 8, 2017 at 6:09 PM, Rosanne DiMesio <dimesio(a)earthlink.net> wrote: > Steam and GOG are distribution platforms, not licenses. See bug 42970. Entries already using the mistakenly-added items will have to be manually fixed in the live database. What about changing them into a single LICENSE_DIGITAL which would encompass all online platforms.

2 1