- wine-devel - winehq.org

Re: [RFC] msvcp120: Change exported vbtable sizes.
by Piotr Caban 06 Jan '16

06 Jan '16

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 06 Jan '16

06 Jan '16

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 06 Jan '16

06 Jan '16

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 06 Jan '16

06 Jan '16

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 06 Jan '16

06 Jan '16

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 06 Jan '16

06 Jan '16

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 06 Jan '16

06 Jan '16

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 05 Jan '16

05 Jan '16

> 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 05 Jan '16

05 Jan '16

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 05 Jan '16

05 Jan '16

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

Testbot build VM is offline
by Hugh McMaster 05 Jan '16

05 Jan '16

The Build VM / vm4 is currently offline. Judging by the test queue, it has been offline since 3 January, 23:30 (UTC+1). Francois, I imagine this is for maintenance? -- Hugh McMaster

2 1

Re: [1/2] kernel32: add stub for GetSystemPreferredUILanguages
by Matteo Bruni 05 Jan '16

05 Jan '16

2015-12-30 10:21 GMT+01:00 Stefan Leichter <Stefan.Leichter(a)camline.com>: > The function is called from VSWinExpress.exe (Visual Studio 2013/12.0 > Express Edition) > > Signed-off-by: Stefan Leichter <Stefan.Leichter(a)camLine.com> > --- > .../api-ms-win-core-localization-l1-2-0.spec | 2 +- > .../api-ms-win-core-localization-l1-2-1.spec | 2 +- > dlls/kernel32/kernel32.spec | 2 +- > dlls/kernel32/locale.c | 26 > ++++++++++++++++++++++ > include/winnls.h | 1 + > 5 files changed, 30 insertions(+), 3 deletions(-) Just a drive-by comment: I think it would be nicer if the FIXME was at the start of the function i.e. before the early returns. I would also replace PULONG and PZZWSTR with ULONG * and WCHAR *, not sure what's the convention in kernel32 though.

2 1

Re: [PATCH 5/5] kernel32/tests: Add tests for GetLargestConsoleWindowSize
by Marvin 05 Jan '16

05 Jan '16

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=19405 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 4/5] kernel32/tests: Refresh the console to clear the console font table
by Marvin 05 Jan '16

05 Jan '16

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=19404 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 9/9] programs/plugplay.exe: Add Linux udev hidraw bus
by Damjan Jovanovic 05 Jan '16

05 Jan '16

Using poll() would be better than select() here, as select() not only has a limit on the number of fds that can be polled, but cannot even deal with a single fd whose number is above the same limit, which could happen if many files are already open by that process. That limit is as low as 1024, and needs patching and recompiling both the kernel and libc on Linux IIRC. We already went through a round of converting all Wine source from select() to poll(). udev is also Linux-only - the *BSDs are left out in the cold. Nice work otherwise, I expected it to take you much longer. Damjan On Mon, Jan 4, 2016 at 7:36 PM, Aric Stewart <aric(a)codeweavers.com> wrote: > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > programs/plugplay/Makefile.in | 1 + > programs/plugplay/bus_hidraw.c | 264 > +++++++++++++++++++++++++++++++++++++++++ > programs/plugplay/main.c | 3 + > programs/plugplay/pnp.h | 1 + > 4 files changed, 269 insertions(+) > create mode 100644 programs/plugplay/bus_hidraw.c > > > > > >

1 0

[PATCH] ntdll/tests: Correct signaled / not signaled error messages.
by Alex Henrie 05 Jan '16

05 Jan '16

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/tests/file.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index b8f1847..7bf2ffe 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -677,7 +677,7 @@ static void read_file_test(void) apc_count = 0; U(iosb).Status = 0xdeadbabe; iosb.Information = 0xdeadbeef; - ok( !is_signaled( read ), "read handle is not signaled\n" ); + ok( !is_signaled( read ), "read handle is signaled\n" ); status = pNtReadFile( read, 0, apc, &apc_count, &iosb, buffer, 1, NULL, NULL ); ok( status == STATUS_PENDING, "wrong status %x\n", status ); ok( !is_signaled( read ), "read handle is signaled\n" ); @@ -690,7 +690,7 @@ static void read_file_test(void) Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 1, "wrong info %lu\n", iosb.Information ); - ok( is_signaled( read ), "read handle is signaled\n" ); + ok( is_signaled( read ), "read handle is not signaled\n" ); ok( !apc_count, "apc was called\n" ); apc_count = 0; SleepEx( 1, FALSE ); /* non-alertable sleep */ @@ -731,7 +731,7 @@ static void read_file_test(void) ok(ret && written == 1, "WriteFile error %d\n", GetLastError()); /* partial read is good enough */ Sleep(1); /* FIXME: needed for wine to run the i/o apc */ - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 1, "wrong info %lu\n", iosb.Information ); ok( !apc_count, "apc was called\n" ); @@ -762,7 +762,7 @@ static void read_file_test(void) ok( status == STATUS_INVALID_HANDLE, "wrong status %x\n", status ); ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); /* not reset on invalid handle */ + ok( is_signaled( event ), "event is not signaled\n" ); /* not reset on invalid handle */ ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( !apc_count, "apc was called\n" ); @@ -782,7 +782,7 @@ static void read_file_test(void) Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == STATUS_PIPE_BROKEN, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -807,7 +807,7 @@ static void read_file_test(void) Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -833,7 +833,7 @@ static void read_file_test(void) Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -859,7 +859,7 @@ static void read_file_test(void) Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -885,7 +885,7 @@ static void read_file_test(void) Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 2, "apc was not called\n" ); @@ -906,7 +906,7 @@ static void read_file_test(void) if (status == STATUS_PENDING) WaitForSingleObject( event, 1000 ); ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -923,7 +923,7 @@ static void read_file_test(void) if (status == STATUS_PENDING) WaitForSingleObject( event, 1000 ); ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -940,7 +940,7 @@ static void read_file_test(void) WaitForSingleObject( event, 1000 ); ok( U(iosb).Status == STATUS_END_OF_FILE, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -961,7 +961,7 @@ static void read_file_test(void) if (status == STATUS_PENDING) WaitForSingleObject( event, 1000 ); ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -975,7 +975,7 @@ static void read_file_test(void) ok( status == STATUS_SUCCESS, "wrong status %x\n", status ); ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information ); - ok( is_signaled( event ), "event is signaled\n" ); + ok( is_signaled( event ), "event is not signaled\n" ); ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ todo_wine ok( !apc_count, "apc was called\n" ); -- 2.6.4

1 0

read_file_test doesn't look right
by Alex Henrie 05 Jan '16

05 Jan '16

Dear Mike and Alexandre, The function read_file_test in dlls/ntdll/tests/file.c [1] has a lot of lines like this: ok( is_signaled( event ), "event is not signaled\n" ); This makes sense to me. The first parameter is the condition we want (a signal), and the second parameter is the error message to display if we didn't get what we want (no signal). However, there are also a lot of lines like this: ok( is_signaled( event ), "event is signaled\n" ); Either this is a mistake or in some cases a zero return value does indicate that the event was signaled. What is going on here? I made a patch to make these messages look like I think they should. If you approve, I will send the patch on to wine-patches. -Alex [1] https://source.winehq.org/git/wine.git/blob/93d7356290bfe5bfd2104f985927908…

1 0

Re: [PATCH 3/5] winex11.drv: Only update drop effect if IDropTarget::DragOver returned S_OK
by Matteo Bruni 04 Jan '16

04 Jan '16

2015-12-21 11:21 GMT+01:00 Piotr Caban <piotr(a)codeweavers.com>: diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index d5881ad..841eaff 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -325,7 +325,7 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) if (dropTarget) { hr = IDropTarget_DragOver(dropTarget, MK_LBUTTON, pointl, &effect); - if (SUCCEEDED(hr)) + if (hr != S_OK) XDNDDropEffect = effect; else WARN("IDropTarget_DragOver failed, error 0x%08X\n", hr); Doesn't that do the opposite of what the patch title says?

1 0

Re: [PATCH 2/3] d3dx9_36: Store all values passed to the create and return them in the correct functions
by Matteo Bruni 04 Jan '16

04 Jan '16

2015-12-23 7:47 GMT+01:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > static ULONG WINAPI d3dx9_animation_controller_AddRef(ID3DXAnimationController *iface) > { > - struct d3dx9_animation_controller *animation = impl_from_ID3DXAnimationController(iface); > - ULONG refcount = InterlockedIncrement(&animation->ref); > + struct d3dx9_animation_controller *This = impl_from_ID3DXAnimationController(iface); > + ULONG refcount = InterlockedIncrement(&This->ref); > > - TRACE("%p increasing refcount to %u.\n", animation, refcount); > + TRACE("%p increasing refcount to %u.\n", This, refcount); These changes don't seem useful, especially considering that these lines were introduced in the previous patch. More of it below, same comment applies. FWIW I prefer "animation" to "This".

1 0

Re: [PATCH 1/3] d3dx9_36: Implement D3DXCreateAnimationController with a stubbed ID3DXAnimationController interface.
by Matteo Bruni 04 Jan '16

04 Jan '16

2015-12-23 7:47 GMT+01:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > From: Christian Costa <titan.costa(a)gmail.com> > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Hi Alistair, some nitpicking... Please use the "d3dx9:" prefix for this and the other patches. > +static HRESULT WINAPI d3dx9_animation_controller_QueryInterface(ID3DXAnimationController *iface, REFIID riid, void **out) > +{ > + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); > + > + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXAnimationController)) > + { > + IUnknown_AddRef(iface); > + *out = iface; I think this is usually done as "*out = &animation->ID3DXAnimationController_iface" or similar (where "animation" is the result of impl_from_ID3DXAnimationController(iface)). > + return D3D_OK; > + } > + > + WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); > + > + *out = NULL; > + return E_NOINTERFACE; > +} Similarly this is usually written in a slightly different way. Please follow the style of the other (recent) QueryInterface implementations, we are pretty consistent now and it would be nice to preserve that consistency. > +static DOUBLE WINAPI d3dx9_animation_controller_GetTime(ID3DXAnimationController *iface) Can this (and the other instances of it in the patch) simply use "double" instead? Apparently the only difference between the two is that DOUBLE sometimes forces alignment to 8 bytes. That should only matter for struct fields though, as far as we are concerned, so we should probably prefer plain double. > +/*********************************************************************** > + * D3DXCreateAnimationController (D3DX9_36.@) > + */ It doesn't really matter but this comment is unnecessary. > +HRESULT WINAPI D3DXCreateAnimationController(UINT MaxNumAnimationOutputs, UINT MaxNumAnimationSets, > + UINT MaxNumTracks, UINT MaxNumEvents, ID3DXAnimationController **AnimationController) Please use the usual "lowercase and underscores" style for the parameter names. Also check the '*' placement a couple of lines below.

1 0

Re: [PATCH] d3drm/tests: Add tests for IDirect3DRM*::LoadTexture (try 10).
by Aaryaman Vasishta 04 Jan '16

04 Jan '16

Now that I'm not using CreateDIBSection, I should probably remove the gdi32 dependency as well (Thanks to nsivov for pointing that out). I'll resend the patch after your review (if there's any more changes required) so that way I can get both done at the same time. Cheers, Aaryaman On Tue, Jan 5, 2016 at 12:21 AM, Aaryaman Vasishta < jem456.vasishta(a)gmail.com> wrote: > try 10: Fix XP test failures. > Added bitmap generation function to generate bitmaps at runtime. > > Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> > --- > dlls/d3drm/tests/Makefile.in | 2 +- > dlls/d3drm/tests/d3drm.c | 320 > +++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 321 insertions(+), 1 deletion(-) > > diff --git a/dlls/d3drm/tests/Makefile.in b/dlls/d3drm/tests/Makefile.in > index 4b39989..76613e2 100644 > --- a/dlls/d3drm/tests/Makefile.in > +++ b/dlls/d3drm/tests/Makefile.in > @@ -1,5 +1,5 @@ > TESTDLL = d3drm.dll > -IMPORTS = dxguid uuid d3drm ddraw user32 > +IMPORTS = dxguid uuid d3drm ddraw user32 gdi32 > > C_SRCS = \ > d3drm.c \ > diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c > index 06c2c54..9cabbe6 100644 > --- a/dlls/d3drm/tests/d3drm.c > +++ b/dlls/d3drm/tests/d3drm.c > @@ -2,6 +2,7 @@ > * Copyright 2010, 2012 Christian Costa > * Copyright 2012 André Hentschel > * Copyright 2011-2014 Henri Verbeet for CodeWeavers > + * Copyright 2014-2015 Aaryaman Vasishta > * > * This library is free software; you can redistribute it and/or > * modify it under the terms of the GNU Lesser General Public > @@ -3693,6 +3694,324 @@ static void test_create_device_from_d3d3(void) > DestroyWindow(window); > } > > +static char *create_bitmap(const char *filename, int w, int h, BOOL > palettized) > +{ > + static char path[MAX_PATH]; > + HANDLE file; > + BITMAPFILEHEADER file_header; > + BITMAPINFOHEADER info_header; > + BITMAPINFO *info = NULL; > + const int bpp = palettized ? 8 : 24; > + unsigned char *buffer = NULL; > + DWORD written, size; > + int i, j; > + > + /* Calculate size of the BITMAPINFO header */ > + /* Space for 256 color palette would need to be allocated if the > bitmap is 8bpp */ > + size = sizeof(BITMAPINFOHEADER); > + if (palettized) > + size += sizeof(RGBQUAD)* 256; > + > + memset(&file_header, 0, sizeof(BITMAPFILEHEADER)); > + file_header.bfType = 0x4d42; /* BM */ > + file_header.bfOffBits = sizeof(BITMAPFILEHEADER)+size; > + file_header.bfSize = ((((w * bpp + 31) & ~31) >> 3) * h) + > file_header.bfOffBits; > + memset(&info_header, 0, sizeof(BITMAPINFOHEADER)); > + info_header.biSize = sizeof(BITMAPINFOHEADER); > + info_header.biBitCount = bpp; > + info_header.biPlanes = 1; > + info_header.biWidth = w; > + info_header.biHeight = h; > + info_header.biCompression = BI_RGB; > + > + if (palettized) > + { > + info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); > + /* Create a 256 color palette for 8bpp bitmap */ > + for (i = 0; i < 256; i++) > + { > + info->bmiColors[i].rgbBlue = i; > + info->bmiColors[i].rgbGreen = i; > + info->bmiColors[i].rgbRed = i; > + } > + } > + else > + info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, > sizeof(*info)); > + info->bmiHeader = info_header; > + > + /* Create the bitmap file */ > + GetTempPathA(sizeof(path) / sizeof(char), path); > + lstrcatA(path, filename); > + file = CreateFileA(path, GENERIC_READ | GENERIC_WRITE, 0, NULL, > CREATE_ALWAYS, 0, 0); > + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error > %d\n", path, > + GetLastError()); > + > + /* Write the file header, followed by the BITMAPINFO header */ > + WriteFile(file, &file_header, sizeof(BITMAPFILEHEADER), &written, > NULL); > + ok(written == sizeof(BITMAPFILEHEADER), "Couldn't write bitmap file > header.\n"); > + WriteFile(file, info, size, &written, NULL); > + ok(written == size, "Couldn't write bitmap info header.\n"); > + > + size = file_header.bfSize; > + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); > + > + /* Saving pixels by directly accessing bitmap buffer is faster than > using SetPixel */ > + for (i = 0, j = 0; i < size;) > + { > + if (palettized) > + { > + buffer[i++] = j++; > + j %= 256; > + } > + else > + { > + buffer[i++] = j % 251; > + buffer[i++] = j % 239; > + buffer[i++] = j++ % 247; > + } > + } > + > + /* Finally, write the bitmap pixels */ > + WriteFile(file, buffer, size, &written, NULL); > + ok(written == size, "Couldn't write bitmap pixels.\n"); > + > + CloseHandle(file); > + HeapFree(GetProcessHeap(), 0, buffer); > + > + return path; > +} > + > +static BOOL test_bitmap_data(const int test_num, const char *file, > D3DRMIMAGE *img, BOOL upside_down) > +{ > + const int w = img->width; > + const int h = img->height; > + int i, j, k = 0, offset, depth, expected; > + BOOL val1, val2, val3, ret = TRUE; > + BITMAPFILEHEADER *bmp_header = NULL; > + BITMAPINFO *bmp_info = NULL; > + BITMAPINFOHEADER info_header; > + HANDLE hfile = NULL, hmapping = NULL; > + DWORD size; > + BOOL check; > + unsigned char *buffer = NULL, *buffer1 = NULL, *buffer2 = NULL; > + > + buffer1 = (unsigned char *)img->buffer1; > + hfile = CreateFileA(file, GENERIC_READ, FILE_SHARE_READ, 0, > OPEN_EXISTING, 0, 0); > + ok(file != INVALID_HANDLE_VALUE, "Failed to open file at %s, error %d > (test %d)\n", file, > + GetLastError(), test_num); > + if (hfile == INVALID_HANDLE_VALUE) > + goto cleanup; > + > + size = GetFileSize(hfile, NULL); > + ok(size != INVALID_FILE_SIZE, "Failed to get file size, error %d > (test %d)\n", GetLastError(), test_num); > + > + hmapping = CreateFileMappingA(hfile, NULL, PAGE_READONLY, 0, 0, NULL); > + ok(hmapping != NULL, "Cannot create file mapping (error = %d, test > %d).\n", GetLastError(), test_num); > + if (hmapping == NULL) > + goto cleanup; > + > + buffer = MapViewOfFile(hmapping, FILE_MAP_READ, 0, 0, 0); > + ok(buffer != NULL, "Cannot create map view of file (error = %d, test > %d).\n", GetLastError(), test_num); > + if (buffer == NULL) > + goto cleanup; > + > + bmp_header = (BITMAPFILEHEADER *)buffer; > + bmp_info = (BITMAPINFO *)((unsigned char *)buffer + > sizeof(BITMAPFILEHEADER)); > + info_header = bmp_info->bmiHeader; > + ok(info_header.biWidth == w, "Expected texture width == %d, got %d > (test %d).\n", info_header.biWidth, w, test_num); > + ok(info_header.biHeight == h, "Expected texture height == %d, got %d > (test %d).\n", info_header.biHeight, h, test_num); > + depth = info_header.biBitCount; > + > + buffer2 = (unsigned char *)buffer + bmp_header->bfOffBits; > + > + if (img->palette) > + { > + ok(img->depth == 8, "Expected texture bpp == 8, got %d (test > %d).\n", img->depth, test_num); > + if (depth == 8) > + { > + /* bytes_per_line is not always aligned by d3drm depending on > the format */ > + expected = info_header.biWidth; > + ok(expected == img->bytes_per_line, "Expected bytes per line > == %d, got %d (test %d).\n", expected, img->bytes_per_line, test_num); > + for (i = 0; i < h; i++) > + { > + offset = upside_down ? (img->bytes_per_line * (h - i - > 1)) : (img->bytes_per_line * i); > + for (j = 0; j < w; j++) > + { > + if (buffer1[k++] != buffer2[offset++]) > + { > + ret = FALSE; > + goto cleanup; > + } > + } > + } > + } > + else > + { > + /* In this case, bytes_per_line is aligned to the nearest > multiple of 4 from width */ > + expected = (info_header.biWidth + 3) & ~3; > + ok(expected == img->bytes_per_line, "Expected bytes per line > == %d, got %d (test %d).\n", expected, img->bytes_per_line, test_num); > + /* The image is palettized if the total number of colors used > is <= 256. */ > + for (i = 0; i < h; i++) > + { > + offset = upside_down ? (w * (h - i - 1) * 3) : (w * i * > 3); > + for (j = 0; j < w; j++) > + { > + val1 = img->palette[buffer1[k + j]].blue == > buffer2[offset]; > + val2 = img->palette[buffer1[k + j]].green == > buffer2[offset + 1]; > + val3 = img->palette[buffer1[k + j]].red == > buffer2[offset + 2]; > + if (!(val1 && val2 && val3)) > + { > + ret = FALSE; > + goto cleanup; > + } > + offset += 3; > + } > + k += img->bytes_per_line; > + } > + } > + } > + else > + { > + /* d3drm aligns the 24bpp texture to 4 bytes in the buffer, with > one bype padding from 24bpp texture. */ > + ok(img->depth == 32, "Expected texture bpp == 32, got %d (test > %d).\n", img->depth, test_num); > + expected = info_header.biWidth * 4; > + ok(expected == img->bytes_per_line, "Expected bytes per line == > %d, got %d (test %d).\n", expected, img->bytes_per_line, test_num); > + for (i = 0; i < h; i++) > + { > + offset = upside_down ? (w * (h - i - 1) * 3) : (w * i * 3); > + for (j = 0; j < w; j++) > + { > + val1 = buffer1[k] == buffer2[offset]; > + val2 = buffer1[k + 1] == buffer2[offset + 1]; > + val3 = buffer1[k + 2] == buffer2[offset + 2]; > + if (!(val1 && val2 && val3)) > + { > + ret = FALSE; > + goto cleanup; > + } > + k += 4; > + offset += 3; > + } > + } > + } > + > +cleanup: > + UnmapViewOfFile(buffer); > + CloseHandle(hmapping); > + CloseHandle(hfile); > + check = DeleteFileA(file); > + ok(check, "Cannot delete image stored in %s (error = %d, test > %d).\n", file, GetLastError(), test_num); > + return ret; > +} > + > +static void test_load_texture(void) > +{ > + struct texture_test > + { > + int version; > + int w; > + int h; > + BOOL palettized; > + }; > + static const struct texture_test tests[] = > + { > + { 1, 100, 100, TRUE }, > + { 1, 99, 100, TRUE }, > + { 1, 100, 100, FALSE }, > + { 1, 99, 100, FALSE }, > + { 1, 3, 39, FALSE }, > + { 2, 100, 100, TRUE }, > + { 2, 99, 100, TRUE }, > + { 2, 100, 100, FALSE }, > + { 2, 99, 100, FALSE }, > + { 2, 3, 39, FALSE }, > + { 3, 100, 100, TRUE }, > + { 3, 99, 100, TRUE }, > + { 3, 100, 100, FALSE }, > + { 3, 99, 100, FALSE }, > + { 3, 3, 39, FALSE }, > + }; > + HRESULT hr; > + IDirect3DRM *d3drm1 = NULL; > + IDirect3DRM2 *d3drm2 = NULL; > + IDirect3DRM3 *d3drm3 = NULL; > + IDirect3DRMTexture *texture1 = NULL; > + IDirect3DRMTexture2 *texture2 = NULL; > + IDirect3DRMTexture3 *texture3 = NULL; > + D3DRMIMAGE *d3drm_img = NULL; > + BOOL check; > + char *file = NULL; > + const int num_tests = sizeof(tests) / sizeof(*tests); > + int i; > + > + hr = Direct3DRMCreate(&d3drm1); > + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", > hr); > + > + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void > **)&d3drm2); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %x)\n", > hr); > + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void > **)&d3drm3); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %x)\n", > hr); > + > + for (i = 0; i < num_tests; i++) > + { > + switch (tests[i].version) > + { > + case 1: > + file = create_bitmap("test.bmp", tests[i].w, tests[i].h, > tests[i].palettized); > + hr = IDirect3DRM_LoadTexture(d3drm1, file, &texture1); > + ok(SUCCEEDED(hr), "Failed to load texture (hr = %x).\n", > hr); > + d3drm_img = IDirect3DRMTexture_GetImage(texture1); > + todo_wine ok(d3drm_img != NULL, "Could not get a > D3DRMIMAGE struct from texture.\n"); > + if (d3drm_img == NULL) > + { > + IDirect3DRMTexture_Release(texture1); > + goto cleanup; > + } > + check = test_bitmap_data(i, file, d3drm_img, FALSE); > + ok(check, "Buffer contents do not match that of bitmap > (test %d).\n", i); > + IDirect3DRMTexture_Release(texture1); > + break; > + case 2: > + file = create_bitmap("test.bmp", tests[i].w, tests[i].h, > tests[i].palettized); > + hr = IDirect3DRM2_LoadTexture(d3drm2, file, &texture2); > + ok(SUCCEEDED(hr), "Failed to load texture (hr = %x).\n", > hr); > + d3drm_img = IDirect3DRMTexture2_GetImage(texture2); > + todo_wine ok(d3drm_img != NULL, "Could not get a > D3DRMIMAGE struct from texture.\n"); > + check = test_bitmap_data(i, file, d3drm_img, TRUE); > + ok(check, "Buffer contents do not match that of bitmap > (test %d).\n", i); > + IDirect3DRMTexture2_Release(texture2); > + break; > + case 3: > + file = create_bitmap("test.bmp", tests[i].w, tests[i].h, > tests[i].palettized); > + hr = IDirect3DRM3_LoadTexture(d3drm3, file, &texture3); > + ok(SUCCEEDED(hr), "Failed to load texture (hr = %x).\n", > hr); > + d3drm_img = IDirect3DRMTexture3_GetImage(texture3); > + todo_wine ok(d3drm_img != NULL, "Could not get a > D3DRMIMAGE struct from texture.\n"); > + check = test_bitmap_data(i, file, d3drm_img, TRUE); > + ok(check, "Buffer contents do not match that of bitmap > (test %d).\n", i); > + IDirect3DRMTexture3_Release(texture3); > + break; > + } > + } > + > + /* Test whether querying a version 1 texture from version 3 causes a > change in the loading behavior */ > + file = create_bitmap("test.bmp", 3, 39, FALSE); > + hr = IDirect3DRM3_LoadTexture(d3drm3, file, &texture3); > + ok(SUCCEEDED(hr), "Failed to load texture (hr = %x).\n", hr); > + hr = IDirect3DRMTexture3_QueryInterface(texture3, > &IID_IDirect3DRMTexture, (void **)&texture1); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface (hr = > %x)\n", hr); > + d3drm_img = IDirect3DRMTexture_GetImage(texture1); > + check = test_bitmap_data(num_tests + 1, file, d3drm_img, TRUE); > + ok(check, "Buffer contents do not match that of bitmap (test %d).\n", > num_tests + 1); > + IDirect3DRMTexture_Release(texture1); > + IDirect3DRMTexture3_Release(texture3); > + > +cleanup: > + IDirect3DRM3_Release(d3drm3); > + IDirect3DRM2_Release(d3drm2); > + IDirect3DRM_Release(d3drm1); > +} > + > START_TEST(d3drm) > { > test_MeshBuilder(); > @@ -3720,4 +4039,5 @@ START_TEST(d3drm) > test_create_device_from_d3d1(); > test_create_device_from_d3d2(); > test_create_device_from_d3d3(); > + test_load_texture(); > } > -- > 2.3.2 (Apple Git-55) > >

1 0

Re: [PATCH] d3drm/tests: Add tests for IDirect3DRM*::LoadTexture (try 9).
by Marvin 04 Jan '16

04 Jan '16

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=19398 Your paranoid android. === wxppro (32 bit d3drm) === d3drm.c:3777: Test failed: Couldn't write bitmap pixels. d3drm.c:3972: Test failed: Buffer contents do not match that of bitmap (test 4). d3drm.c:3777: Test failed: Couldn't write bitmap pixels. d3drm.c:3830: Test failed: Expected texture bpp == 8, got 4 (test 9). d3drm.c:3853: Test failed: Expected bytes per line == 4, got 2 (test 9). d3drm.c:3982: Test failed: Buffer contents do not match that of bitmap (test 9). d3drm.c:3777: Test failed: Couldn't write bitmap pixels. d3drm.c:3830: Test failed: Expected texture bpp == 8, got 4 (test 14). d3drm.c:3853: Test failed: Expected bytes per line == 4, got 2 (test 14). d3drm.c:3992: Test failed: Buffer contents do not match that of bitmap (test 14). d3drm.c:3777: Test failed: Couldn't write bitmap pixels. d3drm.c:3830: Test failed: Expected texture bpp == 8, got 4 (test 16). d3drm.c:3853: Test failed: Expected bytes per line == 4, got 2 (test 16). d3drm.c:4006: Test failed: Buffer contents do not match that of bitmap (test 16).

2 1

Re: [PATCH] usp10: rewrite ScriptXtoCP
by Marvin 04 Jan '16

04 Jan '16

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=19394 Your paranoid android. === wvistau64 (32 bit usp10) === No test summary line found Failure running script in VM: network read timed out (wait2:ListSize:0/4) === w1064 (32 bit usp10) === usp10.c:1244: Test failed: 0: uJustification incorrect (0) usp10.c:1244: Test failed: 1: uJustification incorrect (0) usp10.c:1244: Test failed: 2: uJustification incorrect (0) usp10.c:1244: Test failed: 3: uJustification incorrect (0) usp10.c:1244: Test failed: 4: uJustification incorrect (0) usp10.c:1244: Test failed: 5: uJustification incorrect (0) usp10.c:1244: Test failed: 6: uJustification incorrect (0) usp10.c:1244: Test failed: 7: uJustification incorrect (0) usp10.c:1244: Test failed: 8: uJustification incorrect (0) usp10.c:1244: Test failed: 9: uJustification incorrect (0) usp10.c:1260: Test failed: 3: uJustification incorrect (0) usp10.c:1260: Test failed: 5: fDiacritic incorrect (1) usp10.c:1260: Test failed: 5: fZeroWidth incorrect (1) usp10.c:1260: Test failed: 15: fDiacritic incorrect (1) usp10.c:1260: Test failed: 15: fZeroWidth incorrect (1)

2 1

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

04 Jan '16

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=19397 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 04 Jan '16

04 Jan '16

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=19395 Your paranoid android. === w1064 (32 bit ddraw7) === ddraw7.c:2253: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Re: [PATCH] d3drm/tests: Add tests for IDirect3DRM*::LoadTexture (try 8).
by Stefan Dösinger 04 Jan '16

04 Jan '16

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-01-02 um 22:57 schrieb Aaryaman Vasishta: > + for (i = 0, j = 0; i < size;) > + { > + if (palettized) > + { > + buffer[i++] = j; > + buffer[i++] = j; > + buffer[i++] = j++; > + j %= 256; > + } You're still initializing 3 pixels here. This will go wrong if size isn't a multiple of 3. > +struct texture_test > +{ > + int version; > + int w; > + int h; > + BOOL palettized; > + BOOL upside_down; > +}; upside_down is unused. You can make this an anonymous structure: static void test_load_texture(void) { static const struct { int version; ... } tests[] = { { 1, 100, 100, TRUE }, ... }; ... } No need to have a global struct declaration. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWiXP7AAoJEN0/YqbEcdMwuhgP/0hLiEmRWbxxxfpe7ndxtq1Z DdbBsB3Mzd2r062tVeFl5fM2zxTAfD0XIHBEnJiAXgbkvZYfJelc9oWzU+k6dbb3 SnpbxGQo0K9YQQMXMxQwAcd6e72dNysEEEF66wowLoyYuSej5uHm4CKr030s9qAN 14Dkr+3O5yXXHGLewKaFptOnePBEhRNPKo2xxV2QNJRlA4Vl+Cck+89O6yW2iGjS /ubaZ72wYlZaC14AiYGaUof0oYsyf2GjneyxKWbGxsy9oieB8JayCDaajtNjo7Pi WpunKlMzbi+mQgJ0lAloFcyuEKfZQBboMWCibkOIAJc4jyT4FMls77cPUme0wKBA AR7vSupCSTxVKucbppEuI0Wbaaa/t9UycAB+WnTsm0Vvj4/NC+eXDz6GFhk41Els C5wlSfKCFetPP/ItZKLwI/4nSNRHehfv51T0LwS0DcPe3BGSMaxYcYP6OnHvc/nk zZzUresWwyUXq4Sk6/XdTjcMQ+SUZeBRCDPDpQivuvY2I3ABz2AeuCgNk0viGJyp SROL+bpF2YGU+Fr3sD306fIE3nd4q0sUQ71BwAQ49Kj5ZuFfjv9/RvL8JL0Ao0YP OP3esHNFazQIVMNXwuEVK3YMPnQqN2smHcVPgBPYbC75BB2KciAkKqjCdnsJ2wua 3zutYgIYY7j/HkhfmCgX =3JVE -----END PGP SIGNATURE-----

2 1

Re: [PATCH 1/6] wined3d: Add support for buffers in wined3d_device_update_sub_resource().
by Henri Verbeet 04 Jan '16

04 Jan '16

On 1 January 2016 at 18:08, Józef Kucia <jkucia(a)codeweavers.com> wrote: > @@ -3989,6 +3989,17 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str > TRACE("device %p, resource %p, sub_resource_idx %u, box %p, data %p, row_pitch %u, depth_pitch %u.\n", > device, resource, sub_resource_idx, box, data, row_pitch, depth_pitch); > > + if (resource->type == WINED3D_RTYPE_BUFFER) > + { > + struct wined3d_buffer *buffer = buffer_from_resource(resource); > + HRESULT hr; > + > + if (FAILED(hr = wined3d_buffer_upload_data(buffer, box, data))) > + WARN("Failed to update buffer data, hr %#x.\n", hr); > + > + return; > + } Are the sub_resource_idx and row_pitch/depth_pitch parameters validated in any way for buffer resources?

2 1

Re: [RFC] msvcp120: Change exported vbtable sizes.
by Marvin 04 Jan '16

04 Jan '16

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=19384 Your paranoid android. === w2008s64 (32 bit msvcp120) === msvcp120: unhandled exception c0000005 at 00000000 === w2008s64 (64 bit msvcp120) === msvcp120.c:1862: Test failed: vbtable[1] wrong, got 0x10 msvcp120.c:1863: Test failed: vbtable[1] wrong, got 0x10 msvcp120.c:1864: Test failed: vbtable[1] wrong, got 0x10

1 0

Re: [4/6] gdi32: Fix the advance width in synthetic bold glyphs with scaling.
by Huw Davies 04 Jan '16

04 Jan '16

On Thu, Dec 31, 2015 at 01:33:16PM +0900, Akihiro Sagawa wrote: > @@ -6955,14 +6972,18 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, > vec.x = metrics.horiAdvance; > vec.y = 0; > pFT_Vector_Transform(&vec, &transMat); > - gm.gmCellIncY = -((vec.y+63) >> 6); > + if (font->fake_bold) > + fake_bold_adv = normalize_vector(&vec); > + else > + fake_bold_adv.x = fake_bold_adv.y = 0; > + gm.gmCellIncY = -((vec.y+fake_bold_adv.y+63) >> 6); > if (!avgAdvance || vec.y) > - gm.gmCellIncX = (vec.x+63) >> 6; > + gm.gmCellIncX = (vec.x+fake_bold_adv.x+63) >> 6; > else { > vec.x = incoming_font->ntmAvgWidth; > vec.y = 0; > pFT_Vector_Transform(&vec, &transMat); > - gm.gmCellIncX = pFT_MulFix(vec.x, em_scale) * 2; > + gm.gmCellIncX = pFT_MulFix(vec.x, em_scale) * 2 + (fake_bold_adv.x >> 6); > } > > if (vertical_metrics) > @@ -6971,13 +6992,15 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, > vec.x = metrics.horiAdvance; > vec.y = 0; > pFT_Vector_Transform(&vec, &transMatUnrotated); > + if (font->fake_bold) > + fake_bold_adv = normalize_vector(&vec); > if (!avgAdvance || vec.y) > - adv = (vec.x+63) >> 6; > + adv = (vec.x+fake_bold_adv.x+63) >> 6; > else { > vec.x = incoming_font->ntmAvgWidth; > vec.y = 0; > pFT_Vector_Transform(&vec, &transMatUnrotated); > - adv = pFT_MulFix(vec.x, em_scale) * 2; > + adv = pFT_MulFix(vec.x, em_scale) * 2 + (fake_bold_adv.x >> 6); > } > Is it possible to merge these two blocks of very similar code into a helper or something? I realise that you didn't start this duplication, but it's become increasingly more complicated. Huw.

1 0

Re: [PATCH] msxml3/tests: Fix BSTR leak warning (Valgrind)
by Marvin 04 Jan '16

04 Jan '16

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=19359 Your paranoid android. === w1064 (32 bit httpreq) === httpreq.c:1627: Test failed: got 0x80070057, expected 0x00000000

1 0

Re: [resend v2 4/4] ddraw: Do refcounting only through wined3d_texture_{inc, dec}ref().
by Henri Verbeet 03 Jan '16

03 Jan '16

On 22 December 2015 at 22:43, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > @@ -1227,6 +1221,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 > struct wined3d_texture *texture; > IDirectDrawSurface7 *current; > struct wined3d_surface *tmp; > + unsigned int tmp_idx; You shouldn't need that. Flippable surfaces aren't supposed to be textures, and only textures should have mip-levels. It should be enough to validate the sub-resource index is 0 and print an ERR if it somehow isn't. I don't think we enforce that DDSCAPS_MIPMAP needs DDSCAPS_TEXTURE. That would be a bug and needs tests. > @@ -6286,8 +6287,10 @@ void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, stru > } > desc->lpSurface = NULL; > > - wined3d_surface_incref(wined3d_surface); > + wined3d_texture_incref(wined3d_texture); > surface->wined3d_surface = wined3d_surface; > + surface->wined3d_texture = wined3d_texture; The reference counting here is odd. You'd normally increment the reference count right before or after storing the pointer. You also store wined3d_surface without increasing the reference count, although that's probably ok because it's protected by the one from the texture. Still, it would probably be nicer to just get rid of the wined3d_surface field first.

3 5

Re: [PATCH 1/5] wined3d: Regenerate FFP replacement VS on changes to the normal attribute in the vertex declaration.
by Henri Verbeet 03 Jan '16

03 Jan '16

On 15 December 2015 at 11:58, Henri Verbeet <hverbeet(a)codeweavers.com> wrote: > Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> > I signed of on this (117257) a while ago, but notice it's still marked as "Assigned".

1 0

Re: [PATCH 3/6] d3d11/tests: Add test for SM4 sample_l instruction.
by Henri Verbeet 03 Jan '16

03 Jan '16

There seems to be a good amount of overlap between this test and test_texture(). Would it make sense to merge them? Also, I assume you'll add a d3d10core version of the test as well? On 1 January 2016 at 18:08, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + float miplevel[4] = {0}; A struct vec4 would perhaps be more appropriate. IIRC MSVC gets a bit unhappy about initializing floating-point variables with anything other than floating-point constants, so it would perhaps be better to use 0.0f here. However, ... > + buffer_desc.ByteWidth = sizeof(miplevel); > + buffer_desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER; > + > + resource_data[0].pSysMem = &miplevel; > + > + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, resource_data, &cb); > + ok(SUCCEEDED(hr), "Failed to create constant buffer, hr %#x.\n", hr); ... > + *miplevel = test->miplevel; > + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, miplevel, 0, 0); ... I don't think you should need to pass in initial data in the first place.

1 0

Re: [PATCH v3] user32: Add MOUSEHOOKSTRUCTEX to fix mouse wheel support for JA2 1.13 and other apps which use it
by Nikolay Sivov 03 Jan '16

03 Jan '16

Hello again. > +typedef struct > +{ > + MOUSEHOOKSTRUCT MOUSEHOOKSTRUCT; > + DWORD mouseData; > +} MOUSEHOOKSTRUCTEX, *PMOUSEHOOKSTRUCTEX, *LPMOUSEHOOKSTRUCTEX; Apparently that's not how Windows SDK defines it. For some obscure reason they didn't define EX struct simply as non-EX + extra field, but used cpp style, kind of. Older versions don't even have field name for MOUSEHOOKSTRUCT portion, only type, but this won't work, not with gcc at least. SDK 10 uses DUMMYSTRUCTNAME as a field name, which resolves to 's', if NONAMELESSSTRUCT is defined. I guess we have to follow version 10 definition.

3 4

Re: user32/tests: Add message tests for EM_SETSEL when getting/losing focus in combo boxes (v2)
by Marvin 03 Jan '16

03 Jan '16

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=19336 Your paranoid android. === w7u (32 bit msg) === msg.c:4644: Test failed: ShowWindow(SW_RESTORE):overlapped: 18: the msg sequence is not complete: expected 0000 - actual 0088 === w1064 (32 bit msg) === msg.c:6290: Test failed: Update region shouldn't be empty msg.c:6524: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6526: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different

2 1

Fedora source packages
by Jeffrey Smith 02 Jan '16

02 Jan '16

For the builddep commands in http://wiki.winehq.org/Fedora to work as intended, there needs to be a repository containing the source rpms. The binary rpms do NOT provide the _build_ dependency information needed for the builddep commands to do their job. Otherwise, the instructions need to be redone, as the builddep commands are not really doing anything useful as things stand. Jeff

4 4

Shared WoW64 on Mac OS X via Homebrew
by kaazoo 02 Jan '16

02 Jan '16

Hello, I modified the existing Homebrew formular for Wine in order to make shared WoW64 (32bit and 64bit Wine together) possible: https://github.com/kaazoo/homebrew/commit/cd0f1db42e0a8228740fce347604d1cfe… The changes are not yet upstream, so you'll need to overwrite /usr/local/Library/Formula/wine.rb with my version. The upcoming LLVM 3.8 release is a dependency for the 64bit build: brew install llvm --with-clang --with-clang-extra-tools --with-compiler-rt --with-libcxx --with-lld --with-rtti --HEAD After that Wine 1.9.0 can be installed via: brew install wine --with-win64 --without-x11 --devel Regards, kaazoo

1 0

Re: [PATCH] d3drm/tests: Add tests for IDirect3DRM*::LoadTexture (try 7).
by Stefan Dösinger 02 Jan '16

02 Jan '16

> Am 02.01.2016 um 07:24 schrieb Aaryaman Vasishta <jem456.vasishta(a)gmail.com>: > > + size = w * h * (bpp / 8); > + /* Saving pixels by directly accessing bitmap buffer is faster than using SetPixel */ > + for (i = 0, j = 0; i < size;) > + { > + if (palettized) > + { > + buffer[i++] = j; > + buffer[i++] = j; > + buffer[i++] = j++; > + j %= 256; > + } > + else > + { > + buffer[i] = i % 256; > + i++; > + buffer[i] = j % 256; > + i++; > + j = (j % w) + 1; > + } > + } This is different from earlier patch versions afair. Whats the reason for the change? I guess this gets the job done, but it feels a bit odd to initialize 2/3rds of a rgb pixel or 3 palletized pixels per iteration. It can also cause trouble with writing past the end if size isn't a multiple of 2 or 3 respectively. (with 24 bit rgb even a multiple of 2 isn't guaranteed) Also I think you can get rid of the DIB section and just use a HeapAlloced blob.

2 1

Re: [PATCH] d3drm/tests: Add tests for IDirect3DRM*::LoadTexture (try 6).
by Stefan Dösinger 02 Jan '16

02 Jan '16

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-01-01 um 18:15 schrieb Aaryaman Vasishta: > + expected = (info_header.biWidth + 3) & ~3; > + ok(expected == img->bytes_per_line, "Expected bytes per line == %d, got %d.\n", expected, img->bytes_per_line); > + if (depth == 8) > + { > + for (i = 0; i < h; i++) > + { > + offset = upside_down ? (img->bytes_per_line * (h - i - 1)) : (img->bytes_per_line * i); > + for (j = 0; j < img->bytes_per_line; j++) > + { > + if (buffer1[k++] != buffer2[offset++]) > + return FALSE; > + } You want j < img->width here, otherwise you compare the padded bytes against the next line of the input image. (You'll then also compare the follow-up lines incorrectly and read past the input buffer). It works here because you pass an image with a width that's a multiple of 4 when this codepath is used. So iterate over width pixels, but advance the read offset / pointer by bytes_per_line bytes after processing one line. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWhs9jAAoJEN0/YqbEcdMwx6kP/RXJJdivWRU1ouvEP32VWNRA O/tOZxGNJnXw0Rz40QQz1rtckN3GGAe54pwilQbaPAqrZeIDAEWfk4gWMKIvHvUw Vdg3w7dfQv6fpKK16EWWb83gdaQU9X3Nc7bFzHx4XwvkjHgV/ztsk/t6cqkAOv2Y cWul6MpQcWvehGyEv+vk1siMxO5zFjLvBpT7jgFh+7Ehzbk8ziZWdBYGjV18PnAQ 4eT5MrsNbaA99wKj7ibhz9I4GsKLf8oQQAFFqcVTutCOLeQh7zvHkQ4Z4glXSEYu VvNRmLdMYNSYho+Z9lZEABNvaw9lkxJ6/r1OYd3tP2A0TZzKur732iUYwTo1RnFB Hlv6K/PKzTTMN1m9GZ8UiltnjsEq5G+05nkaywsh7pkr9bGU2pfSEihZ8BSX1/4a zG+vLJipg/rdHalQKfCflxWpKcHiIFjm5E/+Bdtgzb3sSksPh2bfmdVDW/bl3lvD OMXD2FgHB4BE+lexisBV7+qlQhlv8vEPgWryoJ8xomfyAc0ZHioOgTrq0XSMrTdC 19oNGDWZd/8P1guTTC3eRlBFA3jYt/yvjzINRYG1h9L5DbYISuMbp0oUSFx3412o YB7HTHjbyxcWhZFEXc9oDHoMzfIEyJI1QOa8fCNkisucCc/idN7Zrqz+3wYJhHCu PjleVblBVMqsSN/Qw2OE =ftwX -----END PGP SIGNATURE-----

2 1

Mac OS X beta packages!
by Michael Müller 02 Jan '16

02 Jan '16

Hi, we are happy to announce an initial version of our Mac OS X >= 10.8 builds. So far the packages have not yet received that much testing, so please give them a try, and report any issues you encounter. The packages are available at: https://dl.winehq.org/wine-builds/macosx (Some mirrors don't show all files yet, just append random arguments to the url like ?whereismypackage to trick the cache) For unexperienced users, it is recommended to install Wine using the *.pkg files. Just double-click on the package, and the usual Mac OS X installer wizard should open. As pointed out by Austin, I am not a registered Apple Developer and therefore the packages aren't signed. This will result in an error if you configured gate keeper to block unsigned packages. The installation itself should be self-explaining, so I will not go into too much detail here. It is possible to install the package either for all users (needs administrator privileges), or just for your current user. If you haven't installed XQuartz >= 2.7.7 yet (our package supports the x11drv as well as the macdrv), the installer will complain. Just install the missing dependency, and restart the installation, if this is the case. After the installation is finished, you should find an entry "Wine Staging" or "Wine Devel" in your Launchpad. By clicking on it, a new Terminal window opens with a short introduction into some important wine commands. You can now directly start wine/winecfg/... from the Terminal, as the PATH variable is set correctly. For user convenience, the package also associates itself with all *.exe files, which means you can run windows executables just by double-clicking on them. This might not work for all executables though, since OS X doesn't seem to pass the current working directory to the "Open With" handler. Some experienced users on the other hand might prefer a raw wine version without those gimmicks, so we also provide tarball archives. They basically contain the same files (except packaging related stuff), and can be unpacked in any directory. There is no need to set DYLD_* environment variables, all paths are relative, so it should work as long as the directory structure is preserved (you can skip the /usr prefix though using --strip-components 1). Also make sure to install XQuartz >= 2.7.7 in this case. For those who are wondering, here a couple more technical aspects: -------- Dependencies -------- The following dependencies are shipped as precompiled *.dylib-libraries directly with Wine: * libjpeg-turbo * liblcms2 * liblzma * libopenal-soft * libtiff * libxml2 * libxslt * [libtxc-dxtn-s2tc] This is the patent free implementation of dxtn as used by many linux distros. Only included in Wine Staging. -------- Scripts -------- You can find all scripts and build files at https://github.com/wine-compholio/wine-packaging/tree/master/macosx Those files allow you to build the packages on Debian Jessie as host system, starting from a patched clang compiler (to support ms_hook_prologue), tools necessary to create OS X packages, cross compilation of the Wine build dependencies and finally cross compiles Wine itself. You only have to provide MacOSX10.8.sdk.tar.xz and xquartz-2.7.7.tar.xz, everything else is built from source. However, the generated scripts are meant to be run inside our build VMs, so realistically speaking it requires some effort to setup such a system and is not suitable for an average user. ------------------------ There are also some features I am planning to implement in the future (depending on how much time I have): -------- Auto updater -------- There is no common system to provide automatic updates for packages besides the Store, so I think it would be good to come up with some solution for this problem. Especially if the user installed the package into his home directory, he could easily update it without entering a password. I don't have much knowledge about objective-c or cocoa, so if someone else wants to implement this, I am more then glad to add it as an optional feature to the installer. -------- Desktop integration -------- So far Wine does not create desktop entries that are shown in Launchpad, but instead creates useless entries at ~/.local/share/applications/. I think it shouldn't be too hard to dynamically create a proper entry at ~/Applications/ using a wrapper like I did for the main wine executable. -------- Package signing? -------- This is basically something I could fix in 5 minutes, but I don't feel like paying 99$/year if I basically don't use Mac OS X myself. ------------------------ Happy new year and happy testing! :) Best regards, Michael

3 5

Re: [PATCH] shell32/tests: Explicitly compare to HRESULT values
by Marvin 02 Jan '16

02 Jan '16

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=19335 Your paranoid android. === w1064 (32 bit shlfolder) === shlfolder.c:1578: Test failed: IShellFolder_GetDisplayNameOf(NULL) failed! hr = 80070057

2 1

Re: [3/3] ntdll/tests: Add tests for setting debug registers with NtSetContextThread.
by Marvin 02 Jan '16

02 Jan '16

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=19333 Your paranoid android. === wvistau64 (32 bit exception) === exception.c:485: Test failed: 42: Wrong exception address 002D0000/002D0001 exception: unhandled exception 80000004 at 002D0000 exception.c:485: Test failed: 42: Wrong exception address 77BAED97/002D0001 === w7u (32 bit exception) === exception.c:485: Test failed: 42: Wrong exception address 003D0000/003D0001 exception: unhandled exception 80000004 at 003D0000 exception.c:485: Test failed: 42: Wrong exception address 77CDE34F/003D0001 === w1064 (32 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9) === w1064 (64 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9)

2 1

Re: [PATCH] user32: Allow WM_CAPTURECHANGE indicating SetCapture() parameter. (try 2)
by Sebastian Lackner 02 Jan '16

02 Jan '16

On 01.01.2016 23:50, Christopher Thielen wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=13683 > > A window may be notified with WM_CAPTURECHANGED about itself > gaining mouse capture if it calls SetCapture() twice. > > Tested on Windows XP and Fedora Workstation 22. > > Re-submitting to simplify based on wine-devel feedback. > Re-submitting after 1.8 release. > > Signed-off-by: Christopher Thielen <cthielen(a)gmail.com> > Where are the tests you initially had in your patch? I assume you accidentially resent an old version. The tests are still useful to make sure, that noone will break this fix again. Also, please review all the occurances of WM_CAPTURECHANGED, and fix them accordingly. If the code doesn't look like it can handle the double notification, then just ignore them based on the condition lParam == hWnd. This could also be done in separate patches before. Regards, Sebastian

1 0

Re: [PATCH 3/3] ddraw/tests: Use a slop for test_shademode.
by Marvin 01 Jan '16

01 Jan '16

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=19330 Your paranoid android. === w1064 (32 bit ddraw2) === ddraw2.c:2337: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw1) === ddraw1.c:2186: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw7) === ddraw7.c:2253: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw4) === ddraw4.c:2522: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Re: [PATCH] d3drm/tests: Add tests for IDirect3DRM*::LoadTexture (try 5).
by Stefan Dösinger 01 Jan '16

01 Jan '16

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2015-12-27 um 10:23 schrieb Aaryaman Vasishta: > + if (info_header.biWidth % 4 != 0) > + expected = (info_header.biWidth & ~0x03) + 4; > + else > + expected = info_header.biWidth; This is more complicated than it needs to be: expected = (info_header.biWidth + 3) & ~3 should work as well. > + k++; > + /* Take into account padded bytes after every row for odd widths */ > + if ((w % 2 == 1) && (j == w - 1)) > + k = (k & ~0x03) + 4; Wouldn't this also apply for e.g. a width of 10 that is a multiple of 2, but not a multiple of 4? The canonical way is to advance bytes_per_line bytes every line, e.g. buffer1[i * bytes_per_line + j] Or do k += bytes_per_line in the outer loop and then just do buffer1[k + j] to avoid re-doing the multiplication every time. I'd expect the compiler to optimize it anyway though. Other than that the patch looks good :-) -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWhnqDAAoJEN0/YqbEcdMwiLYP/1eERxdjpnqfm2CX3dPF4wmx 3BQjdvH8LLxlS9HNG9PcGXs6gnyhPtsXL3DTSJtsl6UnHn7Ws9EWrjNFrnLEkoDB K7JwHNCPBvuOGb4YHDo4+9NeIXn3Kg6r3yorPGEu0NvWO98FcbhTJWbfhPq4y0uD WvQSCUcqufusFRUFUlOAks5zUXEmEVimxtMgaAYMqul3rsD22pT9CIOPd7Pxp+tc 6AzROoxTA0OoyMpH33APRKCLSwXET6KsMsrV7V83DblE5T9GrIz1ufRYQ155yUpe 3sBG9cGtPJ9KgjEdwp2Gy4hSFOSNVZJauNG3NhYf55cpngnYGU2W7Om9hkGQ6lOF IkjlBDWdKTX6WpC3Yiitw8DfNtRy7S1syEfhkqscYEiDRKYKILHB/njrbdj8q3so SRGAO/g8WSltCfUzlPHU3Jjmb/QjHl6JUV7JkqmJkrmqtd5mrOqPO+YFlDVCwtKl 79DWf5gbF7MbDBQQ82pBy30dy7+a4W9/cmls8x6EeZVr9zBvojfnxbR9xgy7tAVp EWaSUvUJWIoTTxMh4KEbVrH2LxJcEKGocHdXL22h5pMvpk02oCoj8nx1hUtHqMTW mvfYJDGV/DKiaYoSxUjuLqiB1wtNzg4BQcDNCzojRWQD4xS/yHC22rV9/4jG/+b4 F11LmyZfBxp83t+SpGjk =BnPO -----END PGP SIGNATURE-----

2 1

Re: [PATCH] ieframe: Don't write icon file path and index to storage if not specified in shortcut (Valgrind)
by Dmitry Timoshkov 01 Jan '16

01 Jan '16

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > - U(pv[1]).iVal = iconIndex; > + U(pv[1]).lVal = iconIndex; This change is wrong and doesn't match the code below it in the patch. -- Dmitry.

2 1

Re: user32/tests: Add message tests for EM_SETSEL when getting/losing focus in combo boxes
by Marvin 01 Jan '16

01 Jan '16

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=19318 Your paranoid android. === wvistau64 (32 bit msg) === msg.c:10877: Test failed: expected PeekMessage to return FALSE, got 1 msg.c:10889: Test failed: msg.message = 275 instead of WM_USER msg.c:10891: Test failed: expected PeekMessage to return FALSE, got 1 msg.c:10900: Test failed: msg.message = 1024 instead of WM_TIMER msg.c:10902: Test failed: expected PeekMessage to return FALSE, got 1 msg.c:13824: Test failed: 0: WaitForSingleObject failed === w1064 (32 bit msg) === msg.c:6290: Test failed: Update region shouldn't be empty msg.c:6524: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6526: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different

2 1

Re: [PATCH 3/3] msxml3/tests: Fix a stream leak (Valgrind)
by Marvin 31 Dec '15

31 Dec '15

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=19305 Your paranoid android. === w1064 (32 bit httpreq) === httpreq.c:1627: Test failed: got 0x80070057, expected 0x00000000

2 1

Re: user32/tests: Add message tests for EM_SETSEL when getting/losing focus in combo boxes
by Marvin 31 Dec '15

31 Dec '15

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=19315 Your paranoid android. === w1064 (32 bit msg) === msg.c:6290: Test failed: Update region shouldn't be empty msg.c:6524: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6526: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different

1 0

Re: [4/6] gdi32: Fix the advance width in synthetic bold glyphs with scaling.
by Marvin 31 Dec '15

31 Dec '15

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=19284 Your paranoid android. === wvistau64 (32 bit font) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9) === wvistau64 (64 bit font) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9)

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel