April 2014 - Wine-Devel - list.winehq.org

Re: typo fixes - rebased

by Marvin

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=6332 Your paranoid android. === w2000pro (32 bit msg) === Failure running script in VM: network read timed out (wait2:ListSize:0/4)

April 16, 2014

Re: typo fixes - rebased

by Marvin

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=6325 Your paranoid android. === w2000pro (32 bit shlfileop) === Failure running script in VM: network read timed out (wait2:ListSize:0/4)

April 16, 2014

Re: typo fixes - rebased

by Marvin

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=6332 Your paranoid android. === w2000pro (32 bit msg) === Failure running script in VM: network read timed out (wait2:ListSize:0/4)

April 16, 2014

Re: user32: Fix DrawMenuBar test failures (try2)

by Marvin

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=6341 Your paranoid android. === build (build) === Patch failed to apply

April 16, 2014

Re: [3/3] ole32: PropVariantClear should always reset contents of the passed in PROPVARIANT.

by Marvin

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=6360 Your paranoid android. === w2000pro (32 bit propvariant) === propvariant: unhandled exception c0000005 at 779DB8A8 === w8 (32 bit propvariant) === propvariant: unhandled exception c0000005 at 7527DF57

April 16, 2014

Re: [2/3] ole32/tests: Add more tests for PropVariantClear.

by Marvin

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=6359 Your paranoid android. === w2000pro (32 bit propvariant) === propvariant: unhandled exception c0000005 at 779DB8A8 === w8 (32 bit propvariant) === propvariant: unhandled exception c0000005 at 7527DF57

April 16, 2014

Re: kernel32: Add a workaround for broken apps that pass negative values to ReadConsole. Take 2.

by Marvin

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=6357 Your paranoid android. === w8 (32 bit console) === console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1445: Test failed: [13] Expected output count to be 0, got 2359244 console.c:1445: Test failed: [15] Expected output count to be 0, got 2359244 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2359244 console.c:1689: Test failed: [13] Expected output count to be 0, got 2359244 console.c:1689: Test failed: [15] Expected output count to be 0, got 2359244 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2359244

April 16, 2014

Re: user32: Fix DrawMenuBar test failures (try2)

by Marvin

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=6341 Your paranoid android. === w2000pro (32 bit msg) === Failure running script in VM: network read timed out (wait2:ListSize:0/4)

April 16, 2014

Re: [PATCH 2/2] msvcr90: Share the source code with msvcrt

by Alexandre Julliard

Piotr Caban <piotr(a)codeweavers.com> writes: > --- > dlls/msvcr90/Makefile.in | 32 +- > dlls/msvcr90/msvcr90.c | 199 ---- > dlls/msvcr90/msvcr90.spec | 2418 > ++++++++++++++++++++++----------------------- > dlls/msvcrt/Makefile.in | 2 +- > dlls/msvcrt/main.c | 4 + > dlls/msvcrt/msvcrt.h | 1 + > 6 files changed, 1245 insertions(+), 1411 deletions(-) > delete mode 100644 dlls/msvcr90/msvcr90.c It doesn't build on Mingw: In file included from ../../../wine/dlls/msvcr90/../msvcrt/cpp.c:34:0: ../../../wine/dlls/msvcr90/../msvcrt/cxx.h:23:0: warning: "__thiscall" redefined [enabled by default] <built-in>:0:0: note: this is the location of the previous definition ../../../wine/dlls/msvcr90/../msvcrt/data.c:144:33: warning: ‘__p___argc’ redeclared without dllimport attribute: previous dllimport ignored [-Wattributes] ../../../wine/dlls/msvcr90/../msvcrt/data.c:155:35: warning: ‘__p__pgmptr’ redeclared without dllimport attribute: previous dllimport ignored [-Wattributes] ../../../wine/dlls/msvcr90/../msvcrt/data.c:160:36: warning: ‘__p__wpgmptr’ redeclared without dllimport attribute: previous dllimport ignored [-Wattributes] ../../../wine/dlls/msvcr90/../msvcrt/data.c:191:32: warning: ‘_set_fmode’ redeclared without dllimport attribute: previous dllimport ignored [-Wattributes] ../../../wine/dlls/msvcr90/../msvcrt/data.c:204:32: warning: ‘_get_fmode’ redeclared without dllimport attribute: previous dllimport ignored [-Wattributes] ../../../wine/dlls/msvcr90/../msvcrt/data.c:246:36: warning: ‘__p___argv’ redeclared without dllimport attribute: previous dllimport ignored [-Wattributes] ../../../wine/dlls/msvcr90/../msvcrt/data.c:251:46: warning: ‘__p___wargv’ redeclared without dllimport attribute: previous dllimport ignored [-Wattributes] In file included from ../../../wine/dlls/msvcr90/../msvcrt/exit.c:21:0: ../../../wine/dlls/msvcr90/../msvcrt/msvcrt.h:993:41: warning: ‘_get_output_format’ redeclared without dllimport attribute: previous dllimport ignored [-Wattributes] ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1026:32: error: conflicting types for ‘_splitpath_s’ /usr/lib/gcc/i686-w64-mingw32/4.6/../../../../i686-w64-mingw32/include/sec_api/stdlib_s.h:48:70: note: previous declaration of ‘_splitpath_s’ was here ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1114:33: warning: ‘_splitpath’ redeclared without dllimport attribute: previous dllimport ignored [-Wattributes] ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1126:32: error: conflicting types for ‘_wsplitpath_s’ /usr/lib/gcc/i686-w64-mingw32/4.6/../../../../i686-w64-mingw32/include/sec_api/stdlib_s.h:57:70: note: previous declaration of ‘_wsplitpath_s’ was here ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1208:33: warning: ‘_wsplitpath’ redeclared without dllimport attribute: previous dllimport ignored [-Wattributes] ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1220:45: error: conflicting types for ‘_wfullpath’ /usr/lib/gcc/i686-w64-mingw32/4.6/../../../../i686-w64-mingw32/include/stdlib.h:572:71: note: previous declaration of ‘_wfullpath’ was here ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1274:35: warning: ‘_fullpath’ redeclared without dllimport attribute: previous dllimport ignored [-Wattributes] ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1329:33: warning: ‘_makepath’ redeclared without dllimport attribute: previous dllimport ignored [-Wattributes] ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1376:33: warning: ‘_wmakepath’ redeclared without dllimport attribute: previous dllimport ignored [-Wattributes] ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1423:32: error: conflicting types for ‘_makepath_s’ /usr/lib/gcc/i686-w64-mingw32/4.6/../../../../i686-w64-mingw32/include/sec_api/stdlib_s.h:44:70: note: previous declaration of ‘_makepath_s’ was here ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1527:32: error: conflicting types for ‘_wmakepath_s’ /usr/lib/gcc/i686-w64-mingw32/4.6/../../../../i686-w64-mingw32/include/sec_api/stdlib_s.h:53:70: note: previous declaration of ‘_wmakepath_s’ was here ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1701:32: error: conflicting types for ‘_searchenv_s’ /usr/lib/gcc/i686-w64-mingw32/4.6/../../../../i686-w64-mingw32/include/sec_api/stdlib_s.h:46:70: note: previous declaration of ‘_searchenv_s’ was here ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1832:32: error: conflicting types for ‘_wsearchenv_s’ /usr/lib/gcc/i686-w64-mingw32/4.6/../../../../i686-w64-mingw32/include/sec_api/stdlib_s.h:55:70: note: previous declaration of ‘_wsearchenv_s’ was here make[1]: *** [dir.o] Error 1 -- Alexandre Julliard julliard(a)winehq.org

April 16, 2014

Re: typo fixes - rebased

by Marvin

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=6332 Your paranoid android. === w2000pro (32 bit msg) === Failure running script in VM: network read timed out (wait2:ListSize:0/4)

April 16, 2014

Re: typo fixes - rebased

by Marvin

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=6325 Your paranoid android. === w2000pro (32 bit shlfileop) === Failure running script in VM: network read timed out (wait2:ListSize:0/4)

April 16, 2014

Re: user32: Fix DrawMenuBar test failures

by Marvin

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=6320 Your paranoid android. === build (build) === Patch failed to apply

April 16, 2014

Re: typo fixes - rebased

by Marvin

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=6325 Your paranoid android. === w2000pro (32 bit shlfileop) === Failure running script in VM: network read timed out (wait2:ListSize:0/4)

April 16, 2014

Re: user32: Fix DrawMenuBar test failures

by Marvin

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=6320 Your paranoid android. === w2000pro (32 bit msg) === Failure running script in VM: network read timed out (wait2:ListSize:0/4)

April 16, 2014

Re: riched20: Avoid releasing a non-existent interface.

by Nikolay Sivov

> - This->txtSel->reOle = NULL; > - ITextSelection_Release(&This->txtSel->ITextSelection_iface); > - IOleClientSite_Release(&This->clientSite->IOleClientSite_iface); > + if(This->txtSel) > + { > + This->txtSel->reOle = NULL; > + ITextSelection_Release(&This->txtSel->ITextSelection_iface); > + } > + if(This->clientSite) > + { > + This->clientSite->reOle = NULL; > + IOleClientSite_Release(&This->clientSite->IOleClientSite_iface); > + } > heap_fr This can't happen. > IOleClientSiteImpl *This = impl_from_IOleClientSite(iface); > ULONG ref = InterlockedDecrement(&This->ref); > if (ref == 0) > + { > + if(This->reOle) > + This->reOle->clientSite = NULL; > heap_free(This); > + } > return ref; Why do you need this?

April 16, 2014

msvcp90/msvcp90.h: right-hand operand of comma expression has no effect

by Gerald Pfeifer

Building git head with GCC development sources (soon to be GCC 4.9.0) gives me the following warnings ../msvcp90/msvcp90.h:529:75: warning: right-hand operand of comma expression has no effect [-Wunused-value] ../msvcp90/msvcp90.h:530:77: warning: right-hand operand of comma expression has no effect [-Wunused-value] several times. Digging into this in more detail I see ../msvcp90/ios.c: In function 'basic_streambuf_char__Xsgetn_s': ../msvcp90/msvcp90.h:529:75: warning: right-hand operand of comma expression has no effect [-Wunused-value] #define memcpy_s( dst, size, src, count ) (memcpy( (dst), (src), (count) ), 0) ^ ../msvcp90/ios.c:1218:13: note: in expansion of macro 'memcpy_s' memcpy_s(ptr+copied, size, *this->prpos, chunk); ^ Someone must have written that code intentionally, so I am wondering how to best address this. Gerald

April 15, 2014

Re: [2/2] kernel32: Add a workaround for broken apps that pass negative values to ReadConsole.

by Alexandre Julliard

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > --- > dlls/kernel32/console.c | 7 +++++++ > dlls/kernel32/tests/console.c | 6 ------ > 2 files changed, 7 insertions(+), 6 deletions(-) Still no good I'm afraid: ../../../../wine/tools/runtest -q -P wine -T ../../.. -M kernel32.dll -p kernel32_test.exe.so console && touch console.ok console.c:2581: Test failed: expected 0xdeadbeef, 0 make: *** [console.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

April 15, 2014

Re: Application for GSoC 2014 - riched20: implement ITextDocument::Range and ITextRange

by Jactry Zeng

Hello folks, I began to work on ITextRange and ITextSelction in the past two weeks. I have implemented the ITextRange interface and some functions of it. And fixed some other bugs in dlls/riched20/richole.c. 1. Stub implementation of ITextRange interface https://github.com/Jactry/wine/commit/0c79f0e0f6aba886b366e424608a74135cb88… This is just an initial implementation. In order to implement all the functions of ITextRange, more members will be added to ITextRangeImpl struct. For example, according this test[0] we knew when some text in an ITextRange instance was deleted, range of ITextRange in the same RichEdit should adjust for this change. (MSDN[1] also has some description about this.) So we should add something to let all ITextRange instance know each other and adjust others range after deleting or appending some text. 2. Initial implementation of ITextRange::GetText https://github.com/Jactry/wine/commit/90dcce8bea58c789dcc82bde1ebd321205dad… This is also an initial implementation, because I found range of all the ITextRange instances in an RichEdit would be reseted to (0, 0) and ITextRange::GetText would return a NULL BSTR[2] when the content in this RichEdit was changed by WM_SETTEXT. I think we may need to add a member to ME_TextEditor to let it know about all ITextRange of it, so it can reset the range of all ITextRange in it when the content was changed by WM_SETTEXT or any other functions. Linked list may will be a good choice for the first problem. Or anyone have a better way? Any feedback will be appreciate! Thank you! :) [0] https://github.com/Jactry/wine/commit/95e43da329dde420138bbf3b2e5c608c2a2ba… [1] http://msdn.microsoft.com/en-us/library/windows/desktop/bb774058(v=vs.85).a… [2] https://github.com/Jactry/wine/commit/90dcce8bea58c789dcc82bde1ebd321205dad… -- Regards, Jactry Zeng

April 15, 2014

Re: user32: Fix DrawMenuBar test failures

by Alexandre Julliard

Piotr Caban <piotr(a)codeweavers.com> writes: > @@ -4819,6 +4819,8 @@ static void test_messages(void) > after_end_dialog = FALSE; > test_def_id = FALSE; > > + ok(SetCursorPos(109, 109), "SetCursorPos failed\n"); > + Please try to restore the cursor position after the test. -- Alexandre Julliard julliard(a)winehq.org

April 15, 2014

Re: [PATCH 1/5] d3d9/tests: Add a test for timestamp queries. (try 2)

by Henri Verbeet

On 14 April 2014 22:51, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > + hr = IDirect3DDevice9_CreateQuery(device, D3DQUERYTYPE_TIMESTAMPDISJOINT, &disjoint_query); > + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); > + data_size = IDirect3DQuery9_GetDataSize(disjoint_query); ... > + hr = IDirect3DDevice9_CreateQuery(device, D3DQUERYTYPE_TIMESTAMP, &query); > + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); > + data_size = IDirect3DQuery9_GetDataSize(query); I don't think this really works. Either creating these queries can legitimately fail and you need to handle those failures, or TIMESTAMPDISJOINT and TIMESTAMP are always supported if TIMESTAMPFREQ is, and D3DERR_NOTAVAILABLE is not a legitimate return value.

April 15, 2014

Re: [PATCH 3/5] wined3d: Add support for timestamp queries. (try 2)

by Henri Verbeet

On 14 April 2014 22:52, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > + D3DQUERYTYPE type; ... > + type = wined3d_query_get_type(query->wined3d_query); > + if (type == D3DQUERYTYPE_TIMESTAMPDISJOINT) > + ret = sizeof(BOOL); > + else > + ret = wined3d_query_get_data_size(query->wined3d_query); Strictly speaking wined3d_query_get_type() returns an enum wined3d_query_type. > + if (type == D3DQUERYTYPE_TIMESTAMPDISJOINT && data && size == sizeof(BOOL)) > + { > + struct wined3d_query_data_timestamp_disjoint data_disjoint; > + > + hr = wined3d_query_get_data(query->wined3d_query, &data_disjoint, sizeof(data_disjoint), flags); > + *(BOOL *)data = data_disjoint.disjoint; > + } > + else > + { > + hr = wined3d_query_get_data(query->wined3d_query, data, size, flags); > + } Does this do the right thing if an application were to pass sizeof(data_disjoint) as size? > + if (gl_info->supported[ARB_TIMER_QUERY]) > + { > + GL_EXTCALL(glGenQueriesARB(1, &query->id)); > + checkGLcall("glGenQueriesARB"); > + > + TRACE("Allocated timestamp query %u in context %p.\n", query->id, context); > + } > + else > + { > + WARN("Timestamp queries not supported, not allocating query id.\n"); > + query->id = 0; > + } This should never happen, so this should either be an ERR(), or just be removed. Though I'll grant that e.g. the occlusion query code has some room for improvement as well in that regard. > @@ -969,6 +1024,9 @@ static void context_destroy_gl_resources(struct wined3d_context *context) > GL_EXTCALL(glDeleteProgramsARB(1, &context->dummy_arbfp_prog)); > } > > + if (gl_info->supported[ARB_TIMER_QUERY]) > + GL_EXTCALL(glDeleteQueriesARB(context->free_timestamp_query_count, context->free_timestamp_queries)); > + What about queries that are still on the context->timestamp_queries list? > +static HRESULT wined3d_timestamp_query_ops_get_data(struct wined3d_query *query, ... > + if (!gl_info->supported[ARB_TIMER_QUERY]) > + { > + WARN("%p timestamp queries not supported. Returning 0.\n", query); > + if (u64data) > + *u64data = 0; > + return S_OK; > + } ... > +static HRESULT wined3d_timestamp_query_ops_issue(struct wined3d_query *query, DWORD flags) ... > + if (gl_info->supported[ARB_TIMER_QUERY]) > + { ... > + } > + else > + { > + FIXME("%p timestamp queries not supported.\n", query); > + } Similar to above, the query should never have been created in these cases.

April 15, 2014

Re: typo fixes - rebased

by Nikolay Sivov

> diff --git a/ANNOUNCE b/ANNOUNCE It's generated, I don't think it makes sense to fix it. > ref = IHTMLLocation_Release(location); > - ok(!ref, "location chould be destroyed here\n"); > + ok(!ref, "location could be destroyed here\n"); Not exactly what it's supposed to mean. > -# @ stub RtlGetLengthWithoutTrailingPathSeperators > +# @ stub RtlGetLengthWithoutTrailingPathSeparators This is wrong. > -static void test_Mod( int line, VARIANT *left, VARIANT *right, VARIANT *expected, HRESULT expres ) > +static void test_Mod( int line, VARIANT *left, VARIANT *right, VARIANT *expected, HRESULT express ) Wrong too. > -#define NETWORKPLACESSHELLVIEWCOLUMNS sizeof(networkplaces_header)/sizeof(shvheader) > +#define NETWORKPLACCESSHELLVIEWCOLUMNS sizeof(networkplaces_header)/sizeof(shvheader) Network placcess hell view columns.

April 14, 2014

Re: wined3d: Add NVIDIA Geforce GTX 750 to device list. (try 2)

by Bruno Jesus

While you are at it, please if possible take a look at bugs: http://bugs.winehq.org/show_bug.cgi?id=35847 http://bugs.winehq.org/show_bug.cgi?id=32694 Best regards, Bruno

April 14, 2014

Re: [2/2] kernel32: Handle memory allocation failure in ReadConsoleA.

by Alexandre Julliard

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > @@ -2566,8 +2566,6 @@ static void test_ReadConsole(void) > ok(ret == INVALID_FILE_SIZE, "expected INVALID_FILE_SIZE, got %#x\n", ret); > ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); > > -if (0) /* FIXME: uncomment once Wine doesn't hang forever */ > -{ It still hangs here on 64-bit. -- Alexandre Julliard julliard(a)winehq.org

April 14, 2014

Re: [PATCH 4/5] d3dx9: Copy the entire vector at once if there is no need of type conversions.

by Henri Verbeet

On 14 April 2014 19:32, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > @@ -740,6 +740,12 @@ static void set_vector(struct d3dx_parameter *param, const D3DXVECTOR4 *vector) > { > UINT i; > > + if (param->type == D3DXPT_FLOAT) > + { > + memcpy(param->data, vector, param->columns * sizeof(float)); > + return; > + } > + When called from d3dx9_base_effect_set_vector_array(), this is not quite optimal either.

April 14, 2014