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

Re: [PATCH] riched20: Don't create too many IRichEditOle interfaces for a RichEdit. (try 2)
by Huw Davies June 25, 2014

June 25, 2014

On Wed, Jun 25, 2014 at 06:56:00PM +0800, Jactry Zeng wrote: > diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c > index 2af2582..65e70fa 100644 > --- a/dlls/riched20/editor.c > +++ b/dlls/riched20/editor.c > @@ -4468,6 +4468,13 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, > case EM_GETOLEINTERFACE: > { > LPVOID *ppvObj = (LPVOID*) lParam; > + if (editor->reOle) > + { > + *ppvObj = editor->reOle; > + IRichEditOle_AddRef(*ppvObj); > + return 1; > + } > + > return CreateIRichEditOle(editor, ppvObj); > } > case EM_GETPASSWORDCHAR: Better to assign editor->reOle here too. That will be one ref, then every returned iface should add another ref. So the first iface returned will have refcount of 2 and then your tests will pass. You release the final ref in the editor destructor. > diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h > index f139c29..3722c82 100644 > --- a/dlls/riched20/editstr.h > +++ b/dlls/riched20/editstr.h > @@ -388,6 +388,7 @@ typedef struct tagME_TextEditor > { > HWND hWnd, hwndParent; > ITextHost *texthost; > + LPVOID reOle; Needs correct type. Huw.

2 1

Failing tests on test bots
by Jeremy White June 25, 2014

June 25, 2014

Alright, We have a new VM server. We have a new WineHQ server. Things should be stable, or getting better from now on. But we still have 32 failures: http://www.winehq.org/~jwhite/e29fd5429234.html This sucks. Let's fix it. Cheers, Jeremy

1 0

Re: [PATCH 2/4] vbscript: Implemented VarType(try 3)
by Piotr Caban June 25, 2014

June 25, 2014

On 06/25/14 04:19, Shuai Meng wrote: > static HRESULT Global_VarType(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) > { > - FIXME("\n"); > - return E_NOTIMPL; > + TRACE("(%s)\n", debugstr_variant(arg)); > + > + assert(args_cnt == 1); > + > + if(V_VT(arg) & ~VT_TYPEMASK) { > + FIXME("not supported %s\n", debugstr_variant(arg)); > + return E_NOTIMPL; > + } > + > + if(!res) > + return DISP_E_BADVARTYPE; This function should not return error if res is NULL.

2 3

Re: [PATCH] riched20: Don't create too many IRichEditOle interfaces for a RichEdit.
by Huw Davies June 25, 2014

June 25, 2014

On Wed, Jun 25, 2014 at 01:59:42PM +0800, Jactry Zeng wrote: > @@ -1502,6 +1503,13 @@ LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *ppObj) > { > IRichEditOleImpl *reo; > > + if (editor->reOle) > + { > + reo = editor->reOle; > + reo->ref++; > + *ppObj = reo; > + return 1; > + } > reo = heap_alloc(sizeof(IRichEditOleImpl)); > if (!reo) > return 0; This is not the way to do this. You want to be calling AddRef on the interface. You probably want to do the if(editor->reOle) check in the EM_GETOLEINTERFACE handler and only call this constructor when needed. Huw.

2 1

Re: [PATCH 3/4] vbscript: Implemented Sgn(try 3)
by Piotr Caban June 25, 2014

June 25, 2014

On 06/25/14 04:21, Shuai Meng wrote: > + hres = VariantChangeType(&dst, v, VARIANT_LOCALBOOL, VT_R8); There's no need to pass VARIANT_LOCALBOOL flag here. > static HRESULT Global_Sgn(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) > { > - FIXME("\n"); > - return E_NOTIMPL; > + double v; > + HRESULT hres; > + > + TRACE("(%s)\n", debugstr_variant(arg)); > + > + assert(args_cnt == 1); > + > + hres = to_double(arg, &v); > + if (FAILED(hres)) > + return S_OK; > + > + if(!res) > + return DISP_E_BADVARTYPE; This function should not return error if res is NULL. There's similar mistake in Abs implementation. Cheers, Piotr

2 2

Re: [Patch 3/3] regsvr32: Convert char* to WCHAR*
by Vincent Povirk June 25, 2014

June 25, 2014

You should probably combine this with patch 1, so we don't have an intermediate stage where the output is broken. On Tue, Jun 24, 2014 at 7:07 AM, Hugh McMaster <hugh.mcmaster(a)masterindexing.com> wrote: > This patch converts the char* strings of DllRegisterServer, DllUnregisterServer and DllInstall to WCHAR* strings for direct Unicode output. This avoids the need to modify any resource strings. > > >

2 1

Re: [PATCH 4/4] vbscript: Implemented Abs(try 3)
by Marvin June 24, 2014

June 24, 2014

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=7680 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 3/4] vbscript: Implemented Sgn(try 3)
by Marvin June 24, 2014

June 24, 2014

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=7679 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 2/4] vbscript: Implemented VarType(try 3)
by Marvin June 24, 2014

June 24, 2014

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=7678 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 1/4] vbscript: Implemented TypeName(try 3)
by Marvin June 24, 2014

June 24, 2014

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=7677 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 3/4] vbscript: Implemented Sgn(try 2)
by Jacek Caban June 24, 2014

June 24, 2014

On 06/17/14 07:59, Shuai Meng wrote: > diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c > index c2b2edd..d21784d 100644 > --- a/dlls/vbscript/global.c > +++ b/dlls/vbscript/global.c > @@ -1320,8 +1320,24 @@ static HRESULT Global_Int(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA > > static HRESULT Global_Sgn(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) > { > - FIXME("\n"); > - return E_NOTIMPL; > + VARIANT v; > + HRESULT hres; > + > + TRACE("(%s)\n", debugstr_variant(arg)); > + > + assert(args_cnt == 1); > + > + V_VT(&v) = VT_EMPTY; > + hres = VariantChangeType(&v, arg, VARIANT_LOCALBOOL, VT_R8); > + if (FAILED(hres)) > + return S_OK; Please use to_double() instead. to_double may need some fixes (it may require similar changes as you did for to_string first). Jacek

2 4

Re: [5/5] user32: Skip menu loop for empty popup menus.
by Marvin June 24, 2014

June 24, 2014

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=7669 Your paranoid android. === w7u (32 bit msg) === msg.c:12099: Test failed: unexpected hwnd 003D013E msg.c:12121: Test failed: bad time 30e71/30e80

1 0

Re: [3/5] user32: Set capture on the owner of popup menus.
by Marvin June 24, 2014

June 24, 2014

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=7664 Your paranoid android. === w7u (32 bit msg) === msg.c:12098: Test failed: unexpected hwnd 0007013A

1 0

Re: [4/5] user32: Set capture earlier on popup menus.
by Marvin June 24, 2014

June 24, 2014

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=7665 Your paranoid android. === build (build) === Failure running the build script in the VM: network read timed out (Connect:AgentVersion.h:0/9)

1 0

Re: ntdll/nt: Improve NtQuerySystemInformation, cpu_user/cpu_nice already include cpu_guest/cpu_guest_nice
by André Hentschel June 24, 2014

June 24, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 24.06.2014 01:57, schrieb Bernard Ladenthin: Somehow too many comments... Also you just number your patches like e.g. [1/2] in the subject, see other patches -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQGcBAEBAgAGBQJTqdl5AAoJEGm5GZTakYssInAL/j59ymw++Chfn8hfF9TYsGU7 Gg8w1k451vXrezpRHsLrYB72UrLbnlD35TJx3FBV3nCEhuX/LVGj7EyTh6gA+aki p1RmHmqZSvxzuI7RF6a9LbfwjwwSQ392huraBUzmNFOMKMwQ1cZfCfFxA+Xvr/kL bwKcN/+EeSBYDUHIp3ug9ib0SL+d1IMeqQDSstviEKEHfAjbUsAICWBKMU5jmrDt ZEHLrugbfQ15qRITbBbqKvPTSrR1VRglOYwT44kwB4w+xZCJ8u+zgEQhMpg6dN6H JkgG4VjH7ObksiASY0wUAmL+c9KwNcmwyJ7SwG5o+nmgF/kNjzOZhgw80wtrXNCi 659GCVBLFENKSOPWh84nxhRFXKlH6uubqxcRI4WtTNQGfdsI7MqB1qGf9Y45TvyP aHfEd/hBVvNaNRj9Vzax3z3ze2nshEczhpuv8PkTcyLUr/zA+ju+w+FkwUJesjY9 zbGao2AjHszVl9LDvJoKXV6cc+lCTqlIe3BTYa79qw== =8YJ/ -----END PGP SIGNATURE-----

1 0

Re: fix stack corruption and LastError results in shlwapi PathCombine
by Vincent Povirk June 24, 2014

June 24, 2014

The length of the ANSI string doesn't necessarily match the length of the Unicode string after conversion. We should be checking the return value of MultiByteToWideChar to find out whether the converted string fit. Why aren't the 'strlenW(szTemp) + strlenW(lpszFile)' test and uses of lstrcpynW in PathCombineW sufficient to avoid stack corruption?

1 0

Re: wininet/tests: Add more HTTP_QUERY_RAW_HEADERS tests
by Alexandre Julliard June 24, 2014

June 24, 2014

Bruno Jesus <00cpxxx(a)gmail.com> writes: > Related to http://bugs.winehq.org/show_bug.cgi?id=36641 It doesn't work here: ../../../tools/runtest -q -P wine -T ../../.. -M wininet.dll -p wininet_test.exe.so http && touch http.ok http.c:647: Test succeeded inside todo block: HttpQueryInfoA(HTTP_QUERY_RAW_HEADERS) failed with error 122 http.c:649: Test succeeded inside todo block: Expected 0x00, got 00 http.c:652: Test succeeded inside todo block: Value should not have changed: 465 != 465 http.c:647: Test succeeded inside todo block: HttpQueryInfoA(HTTP_QUERY_RAW_HEADERS) failed with error 122 http.c:649: Test succeeded inside todo block: Expected 0x00, got 00 http.c:652: Test succeeded inside todo block: Value should not have changed: 403 != 403 wine: Unhandled page fault on write access to 0x00630065 at address 0x7bc4ef6f (thread 0088), starting debugger... -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: opengl32: glGetString() requires an active GL context (try 2)
by Alexandre Julliard June 24, 2014

June 24, 2014

Bruno Jesus <00cpxxx(a)gmail.com> writes: > try2: > > Add tests. That test will work fine on Wine without code changes, so it's not very convincing. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: gdi32: Avoid compiler warnings in freetype_SelectFont. Simplify logic a bit.
by Alexandre Julliard June 24, 2014

June 24, 2014

Gerald Pfeifer <gerald(a)pfeifer.com> writes: > This is similar to the warning removal patch I submitted yesterday. > > On top of that it replaces > ! something == ! a_0_1_boolean > by > !! something == a_0_1_boolean > since !! reflects the intention (to convert whatever value to one of > 0 or 1) better than the former and may be more efficient, too. That's not an improvement. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: opengl32: glBindTexture() and glDeleteTextures() require an active GL context
by Roderick Colenbrander June 23, 2014

June 23, 2014

Hi Bruno, My initial feeling is that the app is just buggy, since calling functions without a context is very questionable. Assuming we want to any checking on NULL-contexts, please edit the make_opengl script since opengl_norm.c is all auto-generated. Since this code is tricky, I would recommend writing a test case for our test suite. Years ago (pre-wine 1.0) we had code to keep some implicit GL context around, because allegedly some game required it (I think it was Homeland). Though when I tried to reproduce that behavior I didn't see it in the game. I think I wrote some tests for Windows, but don't remember the results. Thanks, Roderick On Sat, Jun 21, 2014 at 11:36 AM, Bruno Jesus <00cpxxx(a)gmail.com> wrote: > Very similar to bug 36506 but for other functions. > > Fixes bug http://bugs.winehq.org/show_bug.cgi?id=34847 > > > >

2 3

Re: user32/tests: Add a missing call to ReleaseActCtx().
by Marvin June 23, 2014

June 23, 2014

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=7654 Your paranoid android. === w7u (32 bit msg) === msg.c:12099: Test failed: unexpected hwnd 0012013E msg.c:12121: Test failed: bad time 30e90/30ea0

1 0

WineHQ Downtime (try 2)
by Jeremy Newman June 23, 2014

June 23, 2014

WineHQ will be going offline starting at 10:00 CDT Monday 2014-06-23 and will be down for up to an hour. We are moving the site and all services (other than the Wiki) to new hardware. This includes: WineHQ.org, Forums, AppDB, Bugzilla, Git, FTP, Mailing lists, and WineTestBot Web Even after the things come back online, some services may need some tweaking. We will be on the issues as fast as we can. -N

2 5

Re: [3/3] ntdll/tests: Add tests for DBG_RIPEXCEPTION debugger events.
by Marvin June 22, 2014

June 22, 2014

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=7645 Your paranoid android. === w2000pro (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00950000/00950001 exception: unhandled exception 80000004 at 00950000 exception.c:484: Test failed: 42: Wrong exception address 7C5C20B0/00950001 === wxppro (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00A30000/00A30001 exception: unhandled exception 80000004 at 00A30000 exception.c:484: Test failed: 42: Wrong exception address 7C80DF3C/00A30001 === wvistau64 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 003C0000/003C0001 exception: unhandled exception 80000004 at 003C0000 exception.c:484: Test failed: 42: Wrong exception address 7751ED97/003C0001 === w2008s64 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 002C0000/002C0001 exception: unhandled exception 80000004 at 002C0000 exception.c:484: Test failed: 42: Wrong exception address 77E5ED97/002C0001 === w7u (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 003C0000/003C0001 exception: unhandled exception 80000004 at 003C0000 exception.c:484: Test failed: 42: Wrong exception address 77CDE34F/003C0001 === w8 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 003F0000/003F0001 exception: unhandled exception 80000004 at 003F0000 exception.c:484: Test failed: 42: Wrong exception address 77174D17/003F0001

1 0

Re: msvcp90/msvcp90.h: right-hand operand of comma expression has no effect (PING)
by Alexandre Julliard June 22, 2014

June 22, 2014

Gerald Pfeifer <gerald(a)pfeifer.com> writes: > On Wed, 16 Apr 2014, Paul Chitescu wrote: >>> 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); >>> ^ >> memcpy_s() returns an errno_t so the author tried to force returning >> zero (no error). > > Since, clearly, the result is never intended to be used, we can as > well simply cast the result away instead of using ", 0". memcpy_s is supposed to return a value, and callers could (and probably should) check it. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: shell32: Fix SHFileOperation when deleting a nonexistent directory. (try 3)
by Marvin June 22, 2014

June 22, 2014

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=7630 Your paranoid android. === wvistau64 (32 bit shlfileop) === shlfileop.c:815: Test failed: Expected ERROR_CANCELLED or DE_DIFFDIR === wvistau64 (64 bit shlfileop) === shlfileop.c:815: Test failed: Expected ERROR_CANCELLED or DE_DIFFDIR

2 1

Re: windowscodecs: Fix interlaced PNG writing.
by Sebastian Lackner June 20, 2014

June 20, 2014

Am 20.06.2014 22:15, schrieb Vincent Povirk: > + row_pointers = HeapAlloc(GetProcessHeap(), 0, This->height * sizeof(png_byte*)); > + if (!row_pointers) > + { > + LeaveCriticalSection(&This->lock); > + return E_OUTOFMEMORY; > + } There should be a corresponding HeapFree( ... ) to release row_pointers again.

1 0

Re: [3/4] server: Process OutputDebugString events like regular exceptions.
by Alexandre Julliard June 20, 2014

June 20, 2014

Sebastian Lackner <sebastian(a)fds-team.de> writes: > As recently mentioned in one of my other patches, Windows internally > processes debug string events the same way as regular exceptions. This > patch removes the output_debug_string wineserver call, and instead uses > always an exception to send debug strings to the debugger. The > wineserver function queue_exception_event is then responsible to > translate exceptions into the corresponding debug events. Make sure to > run ./tools/make_requests after applying this patch. This could probably be done on the client side when retrieving the event, to avoid adding special cases in the server code. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [4/4] ntdll/tests: Add more tests for debug string events.
by Marvin June 20, 2014

June 20, 2014

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=7619 Your paranoid android. === w2000pro (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00950000/00950001 exception: unhandled exception 80000004 at 00950000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 7C5C20B0/00950001 === wxppro (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00A30000/00A30001 exception: unhandled exception 80000004 at 00A30000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 7C80DF3C/00A30001 === wvistau64 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 003C0000/003C0001 exception: unhandled exception 80000004 at 003C0000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 7751ED97/003C0001 === w2008s64 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 002D0000/002D0001 exception: unhandled exception 80000004 at 002D0000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 77E5ED97/002D0001 === w7u (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 003C0000/003C0001 exception: unhandled exception 80000004 at 003C0000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 77CDE34F/003C0001 === w8 (32 bit exception) === exception.c:1127: Test failed: Got exception offset 0x1b, expected 0x19 exception.c:1136: Test failed: Got exception offset 0x19, expected 0x17 exception.c:484: Test failed: 42: Wrong exception address 003E0000/003E0001 exception: unhandled exception 80000004 at 003E0000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 77174D17/003E0001

1 0

Re: [2/4] ntdll/tests: Run crashing i386 exception tests as the last step.
by Marvin June 19, 2014

June 19, 2014

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=7618 Your paranoid android. === w2000pro (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00950000/00950001 exception: unhandled exception 80000004 at 00950000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 7C5C20B0/00950001 === wxppro (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00A30000/00A30001 exception: unhandled exception 80000004 at 00A30000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 7C80DF3C/00A30001 === wvistau64 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 002C0000/002C0001 exception: unhandled exception 80000004 at 002C0000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 7751ED97/002C0001 === w2008s64 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 003D0000/003D0001 exception: unhandled exception 80000004 at 003D0000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 77E5ED97/003D0001 === w7u (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00280000/00280001 exception: unhandled exception 80000004 at 00280000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 77CDE34F/00280001 === w8 (32 bit exception) === exception.c:1102: Test failed: Got exception offset 0x1b, expected 0x19 exception.c:1111: Test failed: Got exception offset 0x19, expected 0x17 exception.c:484: Test failed: 42: Wrong exception address 004F0000/004F0001 exception: unhandled exception 80000004 at 004F0000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 77174D17/004F0001

1 0

Re: [1/4] ntdll/tests: Use an EXCEPTION_REGISTRATION_RECORD array to prevent compiler from reordering variables.
by Marvin June 19, 2014

June 19, 2014

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=7617 Your paranoid android. === w2000pro (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00950000/00950001 exception: unhandled exception 80000004 at 00950000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 7C5C20B0/00950001 === wxppro (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00A30000/00A30001 exception: unhandled exception 80000004 at 00A30000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 7C80DF3C/00A30001 === wvistau64 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 002C0000/002C0001 exception: unhandled exception 80000004 at 002C0000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 7751ED97/002C0001 === w2008s64 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 002C0000/002C0001 exception: unhandled exception 80000004 at 002C0000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 77E5ED97/002C0001 === w7u (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 002F0000/002F0001 exception: unhandled exception 80000004 at 002F0000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 77CDE34F/002F0001 === w8 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 003F0000/003F0001 exception: unhandled exception 80000004 at 003F0000 exception.c:481: Test failed: 42: Wrong exception code c0000027/80000004 exception.c:484: Test failed: 42: Wrong exception address 77174D17/003F0001

1 0

Re: Revert "windowscodecs: Fix leak in test_QueryCapability."
by Marvin June 19, 2014

June 19, 2014

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

1 0

Re: ntdll: Add exception tests for RtlUnwind on i386.
by Marvin June 19, 2014

June 19, 2014

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=7598 Your paranoid android. === w2000pro (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00950000/00950001 exception: unhandled exception 80000004 at 00950000 exception.c:484: Test failed: 42: Wrong exception address 7C5C20B0/00950001 === wxppro (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00A30000/00A30001 exception: unhandled exception 80000004 at 00A30000 exception.c:484: Test failed: 42: Wrong exception address 7C80DF3C/00A30001 === wvistau64 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 002D0000/002D0001 exception: unhandled exception 80000004 at 002D0000 exception.c:484: Test failed: 42: Wrong exception address 7751ED97/002D0001 === w2008s64 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 002D0000/002D0001 exception: unhandled exception 80000004 at 002D0000 exception.c:484: Test failed: 42: Wrong exception address 77E5ED97/002D0001 === w7u (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 003C0000/003C0001 exception: unhandled exception 80000004 at 003C0000 exception.c:484: Test failed: 42: Wrong exception address 77CDE34F/003C0001 === w8 (32 bit exception) === exception.c:484: Test failed: 42: Wrong exception address 00310000/00310001 exception: unhandled exception 80000004 at 00310000 exception.c:484: Test failed: 42: Wrong exception address 77174D17/00310001

1 0

Re: windowscodecs: Fix leak in test_QueryCapability.
by Marvin June 18, 2014

June 18, 2014

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=7580 Your paranoid android. === wvistau64 (32 bit tiffformat) === tiffformat.c:245: Test failed: CreateDecoderFromStream error 0x88982f8b tiffformat: unhandled exception c0000005 at 0EEE3AA7 === w2008s64 (32 bit tiffformat) === tiffformat.c:245: Test failed: CreateDecoderFromStream error 0x88982f8b tiffformat: unhandled exception c0000005 at 0EEE3AA7 === w7u (32 bit tiffformat) === tiffformat.c:245: Test failed: CreateDecoderFromStream error 0x88982f8b tiffformat: unhandled exception c0000005 at 0EEE3AA7 === w8 (32 bit tiffformat) === tiffformat: unhandled exception c0000005 at 0042395C === wvistau64 (64 bit tiffformat) === No test summary line found === w2008s64 (64 bit tiffformat) === No test summary line found

1 0

Re: [PATCH 1/4] packager: Implement IOleObject::SetClientSite
by Marvin June 18, 2014

June 18, 2014

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

1 0

WineHQ Downtime
by Jeremy Newman June 18, 2014

June 18, 2014

WineHQ will be going offline starting at 10:00 CDT tomorrow (Wednesday 2014-06-18) and will be down for up to an hour. We are moving the site and all services (other than the Wiki) to new hardware. This includes: WineHQ.org, Forums, AppDB, Bugzilla, Git, FTP, Mailing lists, and WineTestBot Web Even after the things come back online, some services may need some tweaking. We will be on the issues as fast as we can. -N

4 4

Re: oleaut32: Fix TLB dependencies lookup (retry 3)
by Marvin June 18, 2014

June 18, 2014

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=7567 Your paranoid android. === w2000pro (32 bit typelib) === typelib.c:5491: Test failed: got: 80029c4a

1 0

Re: [2/3] msvcrt: Clear _cnt on buffer flush.
by Piotr Caban June 18, 2014

June 18, 2014

On 06/18/14 02:03, Grazvydas Ignotas wrote: > @@ -3662,6 +3662,7 @@ int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) > if(file->_cnt <= 0) > res = msvcrt_flush_buffer(file); > if(!res) { > + file->_cnt=file->_bufsiz; > *file->_ptr++ = c; > file->_cnt--; > } file->_cnt value should only be set if msvcrt_flush_buffer was called. Cheers, Piotr

1 0

Re: [4/5] msvcrt: Move write flag setting code for reuse.
by Piotr Caban June 17, 2014

June 17, 2014

On 06/14/14 01:23, Grazvydas Ignotas wrote: > --- > dlls/msvcrt/file.c | 27 +++++++++++++++------------ > 1 file changed, 15 insertions(+), 12 deletions(-) > > diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c > index 7523bbb..d6fb9ef 100644 > --- a/dlls/msvcrt/file.c > +++ b/dlls/msvcrt/file.c > @@ -3641,6 +3641,17 @@ MSVCRT_wchar_t * CDECL MSVCRT_fgetws(MSVCRT_wchar_t *s, int size, MSVCRT_FILE* f > return buf_start; > } > > +static inline int msvcrt_set_write_direction(MSVCRT_FILE* file) > +{ > + if(!(file->_flag & MSVCRT__IOWRT)) { > + if(file->_flag & MSVCRT__IORW) > + file->_flag |= MSVCRT__IOWRT; > + else > + return MSVCRT_EOF; > + } > + return 0; > +} I don't see a good reason for making this code reusable. The code is used to inform how the buffer is used (if it's used for writing or reading). This means that it doesn't make sense to set it if buffer is not used. The only valid use of it I can see in wine sources is _flsbuf. I've wrote a test that shows that _IOWRT flag is not set if _bufsiz==0 or in the case you're implementing. You can see it's code and result on windows here: https://testbot.winehq.org/JobDetails.pl?Key=7552

2 1

Re: [PATCH 2/2] packager: Add loading support for Ole10Native storage objects
by Vincent Povirk June 17, 2014

June 17, 2014

+ hr = IStorage_OpenStream(pStg, ole10nativeW, NULL, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &stream); You should probably use STGM_READ here.

1 0

Re: [PATCH 1/5] d2d1: Implement d2d_d3d_render_target_CreateSolidColorBrush().
by Jacek Caban June 17, 2014

June 17, 2014

Hi Henri, On 06/16/14 13:13, Henri Verbeet wrote: > diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h > index 5609db6..9e91728 100644 > --- a/dlls/d2d1/d2d1_private.h > +++ b/dlls/d2d1/d2d1_private.h > @@ -33,4 +33,13 @@ struct d2d_d3d_render_target > void d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, ID2D1Factory *factory, > IDXGISurface *surface, const D2D1_RENDER_TARGET_PROPERTIES *desc) DECLSPEC_HIDDEN; > > +struct d2d_brush > +{ > + ID2D1Brush ID2D1Brush_iface; Given how you use this object, this should be ID2D1SolidColorBrush. I guess you want to somehow reuse this struct for other brush types, but there should be better ways for this. Then: +void d2d_solid_color_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, + const D2D1_COLOR_F *color, const D2D1_BRUSH_PROPERTIES *desc) +{ + FIXME("Ignoring brush properties.\n"); + + brush->ID2D1Brush_iface.lpVtbl = (ID2D1BrushVtbl *)&d2d_solid_color_brush_vtbl; + brush->refcount = 1; +} This cast should not be needed. > + LONG refcount; > +}; > + > +void d2d_solid_color_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, > + const D2D1_COLOR_F *color, const D2D1_BRUSH_PROPERTIES *desc) DECLSPEC_HIDDEN; > + > #endif /* __WINE_D2D1_PRIVATE_H */ > diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c > index be9c1b6..e8c56a0 100644 > --- a/dlls/d2d1/render_target.c > +++ b/dlls/d2d1/render_target.c > @@ -117,9 +117,19 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmapBrush(ID2D1Re > static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateSolidColorBrush(ID2D1RenderTarget *iface, > const D2D1_COLOR_F *color, const D2D1_BRUSH_PROPERTIES *desc, ID2D1SolidColorBrush **brush) > { > - FIXME("iface %p, color %p, desc %p, brush %p stub!\n", iface, color, desc, brush); > + struct d2d_brush *object; > > - return E_NOTIMPL; > + TRACE("iface %p, color %p, desc %p, brush %p.\n", iface, color, desc, brush); > + > + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) > + return E_OUTOFMEMORY; > + > + d2d_solid_color_brush_init(object, iface, color, desc); > + > + TRACE("Created brush %p.\n", object); > + *brush = (ID2D1SolidColorBrush *)&object->ID2D1Brush_iface; Same here, the cast should not be needed. Also allocating memory in brush.c seems more logical to me (although that's a matter of taste). Cheers, Jacek

2 7

Re: [PATCH 1/4] vbscript: Implemented TypeName(try 2)
by Jacek Caban June 17, 2014

June 17, 2014

On 06/17/14 07:58, Shuai Meng wrote: > iff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c > index 5160374..5357df8 100644 > --- a/dlls/vbscript/global.c > +++ b/dlls/vbscript/global.c > @@ -1502,8 +1502,57 @@ static HRESULT Global_DatePart(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, > > static HRESULT Global_TypeName(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) > { > - FIXME("\n"); > - return E_NOTIMPL; > + static const WCHAR ByteW[] = {'B', 'y', 't', 'e', 0}; > + static const WCHAR IntegerW[] = {'I', 'n', 't', 'e', 'g', 'e', 'r', 0}; > + static const WCHAR LongW[] = {'L', 'o', 'n', 'g', 0}; > + static const WCHAR SingleW[] = {'S', 'i', 'n', 'g', 'l', 'e', 0}; > + static const WCHAR DoubleW[] = {'D', 'o', 'u', 'b', 'l', 'e', 0}; > + static const WCHAR CurrencyW[] = {'C', 'u', 'r', 'r', 'e', 'n', 'c', 'y', 0}; > + static const WCHAR DecimalW[] = {'D', 'e', 'c', 'i', 'm', 'a', 'l', 0}; > + static const WCHAR DateW[] = {'D', 'a', 't', 'e', 0}; > + static const WCHAR StringW[] = {'S', 't', 'r', 'i', 'n', 'g', 0}; > + static const WCHAR BooleanW[] = {'B', 'o', 'o', 'l', 'e', 'a', 'n', 0}; > + static const WCHAR EmptyW[] = {'E', 'm', 'p', 't', 'y', 0}; > + static const WCHAR NullW[] = {'N', 'u', 'l', 'l', 0}; > + /*static const WCHAR ObjectW[] = {'O', 'b', 'j', 'e', 'c', 't', 0}; Please don't leave such commented things in the patch. You could remove it, but ideally this should have tests and implementation. > + static const WCHAR NothingW[] = {'N', 'o', 't', 'h', 'i', 'n', 'g', 0};*/ > + > + TRACE("(%s)\n", debugstr_variant(arg)); > + > + assert(args_cnt == 1); > + > + if(res) { This if() is not needed. return_string will take care of NULL res. > + switch(V_VT(arg)) { > + case VT_UI1: Please don't add 8 space indention. I personally prefer no additional indentions for cases, but in any case, if you do indention, use 4 spaces as the rest of file. > + return return_string(res, ByteW); > + case VT_I2: > + return return_string(res, IntegerW); > + case VT_I4: > + return return_string(res, LongW); > + case VT_R4: > + return return_string(res, SingleW); > + case VT_R8: > + return return_string(res, DoubleW); > + case VT_CY: > + return return_string(res, CurrencyW); > + case VT_DECIMAL: > + return return_string(res, DecimalW); > + case VT_DATE: > + return return_string(res, DateW); > + case VT_BSTR: > + return return_string(res, StringW); > + case VT_BOOL: > + return return_string(res, BooleanW); > + case VT_EMPTY: > + return return_string(res, EmptyW); > + case VT_NULL: > + return return_string(res, NullW); > + default: > + FIXME("arg %s not supported\n", debugstr_variant(arg)); > + return E_NOTIMPL; > + } > + } > + return S_OK; > } > > static HRESULT Global_Array(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) > diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs > index 2cf9bb7..32f4dc3 100644 > --- a/dlls/vbscript/tests/api.vbs > +++ b/dlls/vbscript/tests/api.vbs > @@ -845,4 +845,25 @@ MyObject.myval = 0 > Call ok(CSng(MyObject) = 0, "CSng(MyObject) = " & CSng(MyObject)) > Call ok(getVT(CSng(MyObject)) = "VT_R4", "getVT(CSng(MyObject)) = " & getVT(CSng(MyObject))) > > +Call ok(TypeName(CByte(255)) = "Byte", "TypeName(CByte(255)) = " & TypeName(CByte(255))) > +Call ok(getVT(TypeName(CByte(255))) = "VT_BSTR", "getVT(TypeName(CByte(255))) = " & getVT(TypeName(CByte(255)))) > +Call ok(TypeName(255) = "Integer", "TypeName(255) = " & TypeName(255)) > +Call ok(getVT(TypeName(255)) = "VT_BSTR", "getVT(TypeName(255)) = " & getVT(TypeName(255))) > +Call ok(TypeName(32768) = "Long", "TypeName(32768) = " & TypeName(32768)) > +Call ok(getVT(TypeName(32768)) = "VT_BSTR", "getVT(TypeName(32768)) = " & getVT(TypeName(32768))) > +Call ok(TypeName(CSng(0.5)) = "Single", "TypeName(CSng(0.5)) = " & TypeName(CSng(0.5))) > +Call ok(getVT(TypeName(CSng(0.5))) = "VT_BSTR", "getVT(TypeName(CSng(0.5))) = " & getVT(TypeName(CSng(0.5)))) > +Call ok(TypeName(-0.5) = "Double", "TypeName(-0.5) = " & TypeName(-0.5)) > +Call ok(getVT(TypeName(-0.5)) = "VT_BSTR", "getVT(TypeName(-0.5)) = " & getVT(TypeName(-0.5))) > +Call ok(TypeName(CCur(0.5)) = "Currency", "TypeName(CCur(0.5)) = " & TypeName(CCur(0.5))) > +Call ok(getVT(TypeName(CCur(0.5))) = "VT_BSTR", "getVT(TypeName(CCur(0.5))) = " & getVT(TypeName(CCur(0.5)))) > +Call ok(TypeName(CStr(0.5)) = "String", "TypeName(CStr(0.5)) = " & TypeName(CStr(0.5))) > +Call ok(getVT(TypeName(CStr(0.5))) = "VT_BSTR", "getVT(TypeName(CStr(0.5))) = " & getVT(TypeName(CStr(0.5)))) > +Call ok(TypeName(CBool(0.5)) = "Boolean", "TypeName(CBool(0.5)) = " & TypeName(CBool(0.5))) > +Call ok(getVT(TypeName(CBool(0.5))) = "VT_BSTR", "getVT(TypeName(CBool(0.5))) = " & getVT(TypeName(CBool(0.5)))) Using True or False directly instead of CBool() would be cleaner. Jacek

1 0

Re: [PATCH 4/4] vbscript: Implemented Abs(try 2)
by Marvin June 17, 2014

June 17, 2014

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=7551 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 3/4] vbscript: Implemented Sgn(try 2)
by Marvin June 17, 2014

June 17, 2014

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=7550 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 2/4] vbscript: Implemented VarType(try 2)
by Marvin June 17, 2014

June 17, 2014

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=7549 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 1/4] vbscript: Implemented TypeName(try 2)
by Marvin June 17, 2014

June 17, 2014

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=7548 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH 4/4] vbscript: Implemented Abs
by Marvin June 16, 2014

June 16, 2014

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

1 0

Re: [PATCH 3/4] vbscript: Implemented Sgn
by Marvin June 16, 2014

June 16, 2014

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

1 0

Re: [PATCH 2/4] vbscript: Implemented VarType
by Marvin June 16, 2014

June 16, 2014

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

1 0

Re: [PATCH 1/4] vbscript: Implemented TypeName
by Marvin June 16, 2014

June 16, 2014

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

1 0

Fix for PlgBlt, the XFORM matrix was calculated incorrectly
by Alexander Almaleh June 16, 2014

June 16, 2014

I had tried to submit a patch for that 5 years ago<http://www.winehq.org/pipermail/wine-devel/2009-December/080391.html>, but couldn't figure out how to make a patch/test it, and eventually gave up and forgot about it. But recently I remembered about it, and now I want to try again. So, this time I've prepared a test that can prove that the previous implementation does not calculate the XFORM matrix correctly, and that my patch will fix it. The test is a VC6 project, you can find it at https://drive.google.com/file/d/0B9PGUhmmnsm1S2VvZzc3WmhBY3c/edit?usp=shari…. The test is a demo of PlgBlt that I found on CodeProject<http://www.codeproject.com/Articles/17712/The-GDI-magic-Rendering-reflectio…>. You can compare how it works on XP and on Wine. For testing, I directly inserted the original Wine implementation of PlgBlt, as well as my patched version, into the VC6 project, and tested on that. This is because there seems to be an additional problem with MaskBlt, which I'll try tackling next. I have screenshots of what the demo looks using Windows's PlgBlt<http://imgur.com/q8qKGd7>, and Wine's PlgBlt <http://imgur.com/smYEV6z>. To test it, simply look at this function in the VC6 project: BOOL MyPlgBlt( HDC hdcDest, const POINT *lpPoint, HDC hdcSrc, INT nXSrc, INT nYSrc, INT nWidth, INT nHeight, HBITMAP hbmMask, INT xMask, INT yMask) { // return MyPlgBltWinePatched(hdcDest, lpPoint, hdcSrc, nXSrc, nYSrc, nWidth, nHeight, hbmMask, xMask, yMask); return MyPlgBltWineUnpatched(hdcDest, lpPoint, hdcSrc, nXSrc, nYSrc, nWidth, nHeight, hbmMask, xMask, yMask); // return PlgBlt(hdcDest, lpPoint, hdcSrc, nXSrc, nYSrc, nWidth, nHeight, hbmMask, xMask, yMask); } Uncomment the function you want to test. If you need something else (like binaries), just write. And this is the patch itself. I've tried to keep the changes minimal, with respect to white-space, etc. I've removed a "return FALSE", because I don't calculate a determinant explicitly. commit c9ca2cab58fa0cba3d6b24cfb2af507fd1c07227 Author: Alexander Almaleh <sashoalm(a)gmail.com> Date: Tue May 20 18:33:55 2014 +0300 Fix for the calculation of the XFORM matrix in PlgBlt. diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 4750d1b..1de25b9 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -992,22 +992,32 @@ BOOL WINAPI PlgBlt( HDC hdcDest, const POINT *lpPoint, HDC hdcSrc, INT nXSrc, INT nYSrc, INT nWidth, INT nHeight, HBITMAP hbmMask, INT xMask, INT yMask) { + /* we need to use floating-point precision when calculating the + * XFORM matrix to avoid loss of precision due to rounding */ + typedef struct tagPOINTLF + { + double x, y; + } POINTLF; + int oldgMode; /* parallelogram coords */ - POINT plg[3]; + POINTLF plg[3]; /* rect coords */ - POINT rect[3]; + POINTLF rect[3]; XFORM xf; XFORM SrcXf; XFORM oldDestXf; - double det; + int ii; /* save actual mode, set GM_ADVANCED */ oldgMode = SetGraphicsMode(hdcDest,GM_ADVANCED); if (oldgMode == 0) return FALSE; - memcpy(plg,lpPoint,sizeof(POINT)*3); + for (ii = 0; ii < 3; ii++) { + plg[ii].x = lpPoint[ii].x; + plg[ii].y = lpPoint[ii].y; + } rect[0].x = nXSrc; rect[0].y = nYSrc; rect[1].x = nXSrc + nWidth; @@ -1015,33 +1025,39 @@ BOOL WINAPI PlgBlt( HDC hdcDest, const POINT *lpPoint, rect[2].x = nXSrc; rect[2].y = nYSrc + nHeight; /* calc XFORM matrix to transform hdcDest -> hdcSrc (parallelogram to rectangle) */ - /* determinant */ - det = rect[1].x*(rect[2].y - rect[0].y) - rect[2].x*(rect[1].y - rect[0].y) - rect[0].x*(rect[2].y - rect[1].y); - - if (fabs(det) < 1e-5) - { - SetGraphicsMode(hdcDest,oldgMode); - return FALSE; - } TRACE("hdcSrc=%p %d,%d,%dx%d -> hdcDest=%p %d,%d,%d,%d,%d,%d\n", hdcSrc, nXSrc, nYSrc, nWidth, nHeight, hdcDest, plg[0].x, plg[0].y, plg[1].x, plg[1].y, plg[2].x, plg[2].y); /* X components */ - xf.eM11 = (plg[1].x*(rect[2].y - rect[0].y) - plg[2].x*(rect[1].y - rect[0].y) - plg[0].x*(rect[2].y - rect[1].y)) / det; - xf.eM21 = (rect[1].x*(plg[2].x - plg[0].x) - rect[2].x*(plg[1].x - plg[0].x) - rect[0].x*(plg[2].x - plg[1].x)) / det; - xf.eDx = (rect[0].x*(rect[1].y*plg[2].x - rect[2].y*plg[1].x) - - rect[1].x*(rect[0].y*plg[2].x - rect[2].y*plg[0].x) + - rect[2].x*(rect[0].y*plg[1].x - rect[1].y*plg[0].x) - ) / det; + xf.eM11 = -(rect[1].y*plg[2].x+rect[0].y*(plg[1].x-plg[2].x) + -rect[2].y*plg[1].x+plg[0].x*(rect[2].y-rect[1].y)) + /(rect[0].y*(rect[2].x-rect[1].x)-rect[1].y*rect[2].x+ + rect[2].y*rect[1].x+(rect[1].y-rect[2].y)*rect[0].x); + xf.eM21 = (plg[0].x*(rect[2].x-rect[1].x)-plg[1].x*rect[2].x + +plg[2].x*rect[1].x+(plg[1].x-plg[2].x)*rect[0].x) + /(rect[0].y*(rect[2].x-rect[1].x)-rect[1].y*rect[2].x + +rect[2].y*rect[1].x+(rect[1].y-rect[2].y)*rect[0].x); + xf.eDx = -(rect[0].y*(plg[2].x*rect[1].x-plg[1].x*rect[2].x) + +plg[0].x*(rect[1].y*rect[2].x-rect[2].y*rect[1].x) + +(rect[2].y*plg[1].x-rect[1].y*plg[2].x)*rect[0].x) + /(rect[0].y*(rect[2].x-rect[1].x)-rect[1].y*rect[2].x+rect[2].y + *rect[1].x+(rect[1].y-rect[2].y)*rect[0].x); /* Y components */ - xf.eM12 = (plg[1].y*(rect[2].y - rect[0].y) - plg[2].y*(rect[1].y - rect[0].y) - plg[0].y*(rect[2].y - rect[1].y)) / det; - xf.eM22 = (plg[1].x*(rect[2].y - rect[0].y) - plg[2].x*(rect[1].y - rect[0].y) - plg[0].x*(rect[2].y - rect[1].y)) / det; - xf.eDy = (rect[0].x*(rect[1].y*plg[2].y - rect[2].y*plg[1].y) - - rect[1].x*(rect[0].y*plg[2].y - rect[2].y*plg[0].y) + - rect[2].x*(rect[0].y*plg[1].y - rect[1].y*plg[0].y) - ) / det; + xf.eM12 = -(rect[1].y*(plg[2].y-plg[0].y)+rect[0].y*(plg[1].y + -plg[2].y)+rect[2].y*(plg[0].y-plg[1].y))/(rect[0].y*(rect[2].x + -rect[1].x)-rect[1].y*rect[2].x+rect[2].y*rect[1].x+(rect[1].y + -rect[2].y)*rect[0].x); + xf.eM22 = ((plg[0].y-plg[1].y)*rect[2].x+(plg[2].y-plg[0].y)*rect[1].x + +(plg[1].y-plg[2].y)*rect[0].x) /(rect[0].y*(rect[2].x-rect[1].x) + -rect[1].y*rect[2].x+rect[2].y*rect[1].x+(rect[1].y-rect[2].y) + *rect[0].x); + xf.eDy = (rect[0].y*(plg[1].y*rect[2].x-plg[2].y*rect[1].x) + -rect[1].y*plg[0].y*rect[2].x+rect[2].y*plg[0].y*rect[1].x + +(rect[1].y*plg[2].y-rect[2].y*plg[1].y)*rect[0].x)/(rect[0].y + *(rect[2].x-rect[1].x)-rect[1].y*rect[2].x+rect[2].y*rect[1].x + +(rect[1].y-rect[2].y)*rect[0].x); GetWorldTransform(hdcSrc,&SrcXf); CombineTransform(&xf,&xf,&SrcXf);

4 10