October 2013 - Wine-Devel - list.winehq.org

Re: [02/02] d3d8: update locked_rect only if wined3d_surface_map succeeds

by Lasse Rasinen

On 21.10.2013, at 15.08, Henri Verbeet wrote: > On 21 October 2013 13:52, Lasse Rasinen <lrasinen(a)iki.fi> wrote: >> On 21.10.2013, at 14.46, Henri Verbeet wrote: >>> This test fails for me on Windows 7: >>> >>> device.c:4029: Test failed: pBits changed on double lock. >>> device.c:4030: Test failed: Pitch changed on double lock. >> >> So on one W7 computer the struct gets cleared, on another it is kept. >> > Is that on your own machine, or did I miss those results? Buildbot on the previous patch and Stefan Dösinger on Friday. >> Any advice on how to continue? For my use case, either solution will work. >> > If the results here really are inconsistent between machines, and no > application cares, you can probably just drop this patch. On the other > hand, if applications expect e.g. either NULL, or the original value, > you could instead write the test as "ok(!locked_rect.pBits || > locked_rect.pBits == (void *)0xdeadbeef, ...);" and add an appropriate > comment. There's the one misbehaving app (Artemis spaceship sim) that cares. Will update test.

Oct. 21, 2013

Re: [02/02] d3d8: update locked_rect only if wined3d_surface_map succeeds

by Henri Verbeet

On 21 October 2013 13:52, Lasse Rasinen <lrasinen(a)iki.fi> wrote: > On 21.10.2013, at 14.46, Henri Verbeet wrote: >> This test fails for me on Windows 7: >> >> device.c:4029: Test failed: pBits changed on double lock. >> device.c:4030: Test failed: Pitch changed on double lock. > > So on one W7 computer the struct gets cleared, on another it is kept. > Is that on your own machine, or did I miss those results? > Any advice on how to continue? For my use case, either solution will work. > If the results here really are inconsistent between machines, and no application cares, you can probably just drop this patch. On the other hand, if applications expect e.g. either NULL, or the original value, you could instead write the test as "ok(!locked_rect.pBits || locked_rect.pBits == (void *)0xdeadbeef, ...);" and add an appropriate comment.

Oct. 21, 2013

Re: [02/02] d3d8: update locked_rect only if wined3d_surface_map succeeds

by Lasse Rasinen

On 21.10.2013, at 14.46, Henri Verbeet wrote: > On 21 October 2013 10:47, Lasse Rasinen <lrasinen(a)iki.fi> wrote: >> diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c >> index 7932a7f..52cf27a 100644 >> --- a/dlls/d3d8/tests/device.c >> +++ b/dlls/d3d8/tests/device.c >> @@ -4022,8 +4022,12 @@ static void test_lockrect_invalid(void) >> >> hr = IDirect3DSurface8_LockRect(surface, &locked_rect, NULL, 0); >> ok(SUCCEEDED(hr), "Failed to lock surface with rect NULL, hr %#x.\n", hr); >> + locked_rect.pBits = 0xdeadbeef; >> + locked_rect.Pitch = 1; >> hr = IDirect3DSurface8_LockRect(surface, &locked_rect, NULL, 0); >> ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); >> + ok(locked_rect.pBits == 0xdeadbeef, "pBits changed on double lock.\n"); >> + ok(locked_rect.Pitch == 1, "Pitch changed on double lock.\n"); >> hr = IDirect3DSurface8_UnlockRect(surface); >> ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); >> > This test fails for me on Windows 7: > > device.c:4029: Test failed: pBits changed on double lock. > device.c:4030: Test failed: Pitch changed on double lock. So on one W7 computer the struct gets cleared, on another it is kept. Any advice on how to continue? For my use case, either solution will work. > As an aside, if you had written the messages as "Got unexpected pBits > %p.\n" and "Got unexpected Pitch %d.\n", you would have gotten the > following output instead: > > device.c:4029: Test failed: Got unexpected pBits 00000000. > device.c:4030: Test failed: Got unexpected Pitch 0. Advice taken.

Oct. 21, 2013

Re: [01/02] d3d9: update locked_rect only if wined3d_surface_map succeeds

by Henri Verbeet

On 21 October 2013 10:46, Lasse Rasinen <lrasinen(a)iki.fi> wrote: > diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c > index 02b4174..51835c8 100644 > --- a/dlls/d3d9/tests/device.c > +++ b/dlls/d3d9/tests/device.c > @@ -5402,8 +5402,12 @@ static void test_lockrect_invalid(void) > > hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0); > ok(SUCCEEDED(hr), "Failed to lock surface with rect NULL, hr %#x.\n", hr); > + locked_rect.pBits = 0xdeadbeef; > + locked_rect.Pitch = 1; > hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0); > ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); > + ok(locked_rect.pBits == 0xdeadbeef, "pBits changed on double lock.\n"); > + ok(locked_rect.Pitch == 1, "Pitch changed on double lock.\n"); > hr = IDirect3DSurface9_UnlockRect(surface); > ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); > This introduces warnings: device.c: In function ‘test_lockrect_invalid’: device.c:5405:23: warning: assignment makes pointer from integer without a cast [enabled by default] device.c:5409:26: warning: comparison between pointer and integer [enabled by default] Also applies to the d3d8 test.

Oct. 21, 2013

Re: [02/02] d3d8: update locked_rect only if wined3d_surface_map succeeds

by Henri Verbeet

On 21 October 2013 10:47, Lasse Rasinen <lrasinen(a)iki.fi> wrote: > diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c > index 7932a7f..52cf27a 100644 > --- a/dlls/d3d8/tests/device.c > +++ b/dlls/d3d8/tests/device.c > @@ -4022,8 +4022,12 @@ static void test_lockrect_invalid(void) > > hr = IDirect3DSurface8_LockRect(surface, &locked_rect, NULL, 0); > ok(SUCCEEDED(hr), "Failed to lock surface with rect NULL, hr %#x.\n", hr); > + locked_rect.pBits = 0xdeadbeef; > + locked_rect.Pitch = 1; > hr = IDirect3DSurface8_LockRect(surface, &locked_rect, NULL, 0); > ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); > + ok(locked_rect.pBits == 0xdeadbeef, "pBits changed on double lock.\n"); > + ok(locked_rect.Pitch == 1, "Pitch changed on double lock.\n"); > hr = IDirect3DSurface8_UnlockRect(surface); > ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); > This test fails for me on Windows 7: device.c:4029: Test failed: pBits changed on double lock. device.c:4030: Test failed: Pitch changed on double lock. As an aside, if you had written the messages as "Got unexpected pBits %p.\n" and "Got unexpected Pitch %d.\n", you would have gotten the following output instead: device.c:4029: Test failed: Got unexpected pBits 00000000. device.c:4030: Test failed: Got unexpected Pitch 0.

Oct. 21, 2013

Re: winemac: Add registry settings to make Option keys send Alt rather than accessing additional characters from the keyboard layout.

by Phil Krylov

Hello, On Mon, Oct 21, 2013 at 6:47 AM, Ken Thomases <ken(a)codeweavers.com> wrote: > On Oct 10, 2013, at 3:11 AM, Phil Krylov wrote: > >> Every time I press Cmd-Space to switch keyboard layouts, Wine >> activates menu as if I would have pressed Alt, so I have to press >> Command once again to exit it. It does not happen in Windows, though, >> when I use Alt-Shift to switch layouts, so the real problem is not >> related to Alt interpretation of Cmd, but to incorrect emulation of >> Windows behaviour when a keyboard layout switch hotkey is pressed. > > Does the attached patch help? Yes it does, thanks! Although the menu still blinks momentarily when I release Command. > By the way, you should file a bug report about this issue so that it doesn't get lost. Yes I know, but I always want to examine a bug deeper before reporting, providing a patch if possible, and had no time to do it yet. -- Ph.

Oct. 21, 2013

Re: [03/23] kernel32/tests: Fix console tests compilation with __WINESRC__ defined.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://newtestbot.winehq.org/JobDetails.pl?Key=2889 Your paranoid android. === w864 (32 bit console) === console.c:1113: Test failed: Expected OpenConsoleW to return INVALID_HANDLE_VALUE for index 18, got 00000138 console.c:1113: Test failed: Expected OpenConsoleW to return INVALID_HANDLE_VALUE for index 20, got 0000013C console.c:1113: Test failed: Expected OpenConsoleW to return INVALID_HANDLE_VALUE for index 21, got 0000014C console.c:1113: Test failed: Expected OpenConsoleW to return INVALID_HANDLE_VALUE for index 22, got 00000148 console.c:1113: Test failed: Expected OpenConsoleW to return INVALID_HANDLE_VALUE for index 23, got 00000144 console.c:1113: Test failed: Expected OpenConsoleW to return INVALID_HANDLE_VALUE for index 24, got 00000150 console.c:1113: Test failed: Expected OpenConsoleW to return INVALID_HANDLE_VALUE for index 25, got 00000154 console.c:1113: Test failed: Expected OpenConsoleW to return INVALID_HANDLE_VALUE for index 26, got 00000158 console.c:1113: Test failed: Expected OpenConsoleW to return INVALID_HANDLE_VALUE for index 28, got 0000015C console.c:1113: Test failed: Expected OpenConsoleW to return INVALID_HANDLE_VALUE for index 29, got 00000160 console.c:1113: Test failed: Expected OpenConsoleW to return INVALID_HANDLE_VALUE for index 30, got 00000164 console.c:1113: Test failed: Expected OpenConsoleW to return INVALID_HANDLE_VALUE for index 31, got 00000168 console.c:1113: Test failed: Expected OpenConsoleW to return INVALID_HANDLE_VALUE for index 32, got 0000016C console.c:1113: Test failed: Expected OpenConsoleW to return INVALID_HANDLE_VALUE for index 33, got 00000170 console.c:1421: Test failed: [13] Expected output count to be 0, got 1987557047 console.c:1421: Test failed: [15] Expected output count to be 0, got 1987557047 console.c:1421: Test failed: [18] Expected output count to be 3735928559, got 1987557047 console.c:1664: Test failed: [13] Expected output count to be 0, got 1987557047 console.c:1664: Test failed: [15] Expected output count to be 0, got 1987557047 console.c:1664: Test failed: [18] Expected output count to be 3735928559, got 1987557047 === w864 (64 bit console) === console.c:1113: Test failed: Expected OpenConsoleW to return INVALID_HANDLE_VALUE for index 18, got 0000000000000054 console.c:1113: Test failed: Expected OpenConsoleW to return INVALID_HANDLE_VALUE for index 20, got 0000000000000058 console.c:1113: Test failed: Expected OpenConsoleW to return INVALID_HANDLE_VALUE for index 23, got 0000000000000060

Oct. 21, 2013

Re: server: Implement job objects (try 3)

by Alexandre Julliard

Andrew Cook <ariscop(a)gmail.com> writes: > It's been another 3 weeks with zero response. You keep sending more and more versions of the same patches, so it seems clear that this stuff is not ready yet. -- Alexandre Julliard julliard(a)winehq.org

Oct. 21, 2013

Re: [02/23] kernel32/tests: Fix file change notification tests compilation with __WINESRC__ defined.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://newtestbot.winehq.org/JobDetails.pl?Key=2888 Your paranoid android. === wvista (32 bit change) === change.c:81: Test failed: Missed notification

Oct. 21, 2013

Re: Clang Static analysis

by Ken Thomases

On Oct 13, 2013, at 11:38 AM, C.W. Betts wrote: > I have been doing a Clang static analysis of Wine on OS X using the one provided at http://clang-analyzer.llvm.org and storing the results on my PogoPlug drive. If someone wants to see the results, please tell me and I'll set up your e-mail. You will need a free PogoPlug account to view them. While the contents are zipped, they expand to about 1.2 GB. They are displayed as basic HTML pages, so you don't need anything special other than a web browser to see the results. > > Or you could click on this link for the analysis of 1.7.4: http://ppl.ug/ND-7PZ3cSzM/ Thanks for these. I've sent 3 patches for leaks it found. Unfortunately, the rate of false positives is pretty bad. I looked at about 25 of the reports and these 3 were the only ones that were real problems. For a few of them, I could tweak the code to help the analyzer understand it, but I don't think we want such patches in the project. :-/ Cheers, Ken

Oct. 21, 2013