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

Re: [RFC] msvcp120: Change exported vbtable sizes.
by Piotr Caban Jan. 6, 2016

Jan. 6, 2016

Hi, On 01/04/16 12:08, Bernhard Übelacker wrote: > The test contains 2 tests: > - Simply check the exports of the vbtable sizes for their values. This test needs some improvements before it can be accepted to wine. The structure sizes are different in 32-bit and 64-bit cases. > - Call constructor and destructor like it is done in Supertux. This test will need to be rewritten in order to get into wine. You should use vbtable while computing this pointer (you can tests values inside vbtable). The test should also be named differently (e.g. test_virtual_base_func_call). > I tried to add these 8 bytes as an unknown field to basic_istream_* > and basic_ostream_* structs. But then I cannot find a way to get the > sizes for basic_iostream_* right. I've tried to find what happens there. It looks like there's a bug in Visual Studio that is described here (sorry I couldn't find it on Microsoft pages): http://stackoverflow.com/questions/14487241/avoiding-an-inheritance-by-domi… I've tried looking on basic_istream_char class layout (32-bit): void* vbtable 4-byte padding int64 count 4-byte padding int vtordisp = 0 (as described https://msdn.microsoft.com/en-us/library/7sf3txa8%28v=vs.100%29.aspx) basic_ios_char I've also tried creating following classes and ended with a different layout: class vbase { public: int a; virtual ~vbase() {}; }; class c : virtual public vbase { public: int b; virtual ~c() {}; virtual _Add_vtordisp1() {}; }; c class has following layout (as expected): void *vtable; void *vbtable; int b; void *vtable; int a; if b is defined as offsetof the layout changes strangely (looks like there's another problem in compiler related to padding): void *vtable; 4-byte padding; void *vbtable; 4-byte padding int64 b void *vtable int a The difference shows that _Add_vtordisp1 and _Add_vtordisp2 are defined in basic_ios_char class. I don't understand yet why vtordisp is needed. It's kind of described here (https://msdn.microsoft.com/en-us/library/453x4xdd%28v=vs.100%29.aspx) but I don't understand it yet. Thanks, Piotr

2 3

Re: [PATCH 01/12] shell32/tests: The expectedArgs parameter of the DDE tests is an argument count, not a boolean.
by Marvin Jan. 6, 2016

Jan. 6, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=19429 Your paranoid android. === wxppro (32 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === w2003std (32 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === wvistau64 (32 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === w2008s64 (32 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === w7u (32 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === w7pro64 (32 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === w8 (32 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === w864 (32 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === w1064 (32 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wtF7A6.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wtF7A6.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wtF7A6.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2299: Test failed: ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wtF7A6.tmp\test file.sde")]', got '[open("C:\Users\winetest\AppData\Local\Temp\wtF7A6.tmp\test file.sde")]' shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wtF7A6.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wtF7A6.tmp\test file.sde") failed: rc=29 err=2 === wvistau64 (64 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === w2008s64 (64 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === w7pro64 (64 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === w864 (64 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === w1064 (64 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt4B23.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt4B23.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt4B23.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt4B23.tmp\test file.sde") failed: rc=29 err=2

1 0

Re: [PATCH] kernel32: Clamp maximum console window size to screen buffer size.
by Sebastian Lackner Jan. 6, 2016

Jan. 6, 2016

On 06.01.2016 05:26, Hugh McMaster wrote: > From: Sebastian Lackner <sebastian(a)fds-team.de> > > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> > --- > dlls/kernel32/console.c | 4 ++-- > dlls/kernel32/tests/console.c | 9 +++++++++ > 2 files changed, 11 insertions(+), 2 deletions(-) Thanks for adding your sign-off. Please note that there is no need to resend the patch itself, if you don't do any changes. A mail just with "Signed-off-by: ..." as reply to wine-patches(a)winehq.org is sufficient, and makes it easier to review.

2 2

kernel32: add GetConsoleScreenBufferInfoEx/SetConsoleScreenBufferInfoEx stubs (try 2)
by Hugh McMaster Jan. 6, 2016

Jan. 6, 2016

On Tuesday, 5 Jan 2016 13:10:14 -0600, Austin English wrote: +BOOL WINAPI GetConsoleScreenBufferInfoEx(HANDLE output, CONSOLE_SCREEN_BUFFER_INFOEX *buffer) +{ + FIXME("(%p %p): stub!\n", output, buffer); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SetConsoleScreenBufferInfoEx(HANDLE output, CONSOLE_SCREEN_BUFFER_INFOEX *buffer) +{ + FIXME("(%p %p): stub!\n", output, buffer); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} Would you mind resending this patch with HANDLE hConsole and CONSOLE_SCREEN_BUFFER_INFOEX *csbix?

1 0

Re: [PATCH] kernel32: Clamp maximum console window size to screen buffer size.
by Marvin Jan. 6, 2016

Jan. 6, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=19422 Your paranoid android. === w8 (32 bit console) === 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 === w864 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 2686924 console.c:1445: Test failed: [15] Expected output count to be 0, got 2686924 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2686924 console.c:1689: Test failed: [13] Expected output count to be 0, got 2686924 console.c:1689: Test failed: [15] Expected output count to be 0, got 2686924 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2686924 === w1064 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 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:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 2752460 console.c:1445: Test failed: [15] Expected output count to be 0, got 2752460 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2752460 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 2752460 console.c:1689: Test failed: [15] Expected output count to be 0, got 2752460 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2752460 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1

1 0

RE: [PATCH 4/5] kernel32/tests: Refresh the console to clear the console font table
by Hugh McMaster Jan. 6, 2016

Jan. 6, 2016

On Tuesday, 5 Jan 2016 16:21:51 +0100, Sebastian Lackner wrote: > > On 05.01.2016 08:59, Hugh McMaster wrote: > > The testScreenBuffer function unintentionally causes the console > > font table to increase from 14 entries to about 40. This patch restores the font table. > > > > Signed-off-by: Hugh McMaster > > --- > > dlls/kernel32/tests/console.c | 11 +++++++++++ > > 1 file changed, 11 insertions(+) > > > > Signed-off-by: Sebastian Lackner > > (It would look better if we could restore it in the corresponding test itself, but at least I'm fine with this solution.) I'm not sure it's possible to restore the console font table from the test, but I'll take a look.

2 1

Re: kernel32: Clamp maximum console window size to screen buffer size.
by Marvin Jan. 6, 2016

Jan. 6, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=19420 Your paranoid android. === w8 (32 bit console) === 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 === w864 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 2686924 console.c:1445: Test failed: [15] Expected output count to be 0, got 2686924 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2686924 console.c:1689: Test failed: [13] Expected output count to be 0, got 2686924 console.c:1689: Test failed: [15] Expected output count to be 0, got 2686924 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2686924 === w1064 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 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:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 2752460 console.c:1445: Test failed: [15] Expected output count to be 0, got 2752460 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2752460 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 2752460 console.c:1689: Test failed: [15] Expected output count to be 0, got 2752460 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2752460 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1

2 1

Re: [PATCH 2/5] ddraw/tests: Don't require a 3D device for test_resource_priority().
by Stefan Dösinger Jan. 5, 2016

Jan. 5, 2016

> Am 04.01.2016 um 14:11 schrieb Henri Verbeet <hverbeet(a)codeweavers.com>: > > This fixes commit b0d4502c29941c31108a53d6c23f9e23196fb7ec. I asked Riccardo about this init change in an earlier version, and afair he said creating cubemaps without a device crashes on some Windows drivers. I can't find the exchange in the archives, it was probably on IRC. Riccardo, do you remember why you made this change? > - if ((test_data[i].caps2 & DDSCAPS2_CUBEMAP) > - && !(device_desc.dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_CUBEMAP)) > - { > - skip("Device does not support cubemaps.\n"); > - continue; > - } You're creating cubemaps without checking for support now.

3 3

Re: [PATCH 3/5] wined3d: Set WINED3D_BUFFER_DOUBLEBUFFER for managed buffers as well.
by Marvin Jan. 5, 2016

Jan. 5, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=19408 Your paranoid android. === w1064 (32 bit device) === device.c:2613: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2618: Test failed: The focus window is active. device.c:2626: Test failed: Got unexpected hr 0x88760869. device.c:2632: Test failed: Got unexpect screen size 800x600. device.c:2647: Test failed: Expected message 0x47 for window 0, but didn't receive it, i=1. device.c:2656: Test failed: Got unexpect screen size 800x600. device.c:2669: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2677: Test failed: Got unexpect width 640. device.c:2678: Test failed: Got unexpect height 480.

1 0

Re: [PATCH 2/5] ddraw/tests: Don't require a 3D device for test_resource_priority().
by Marvin Jan. 5, 2016

Jan. 5, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=19406 Your paranoid android. === w1064 (32 bit ddraw7) === ddraw7.c:2253: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0