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

Re: [1/2] wined3d: Set D3DPMISCCAPS_FOGVERTEXCLAMPED flag in get_device_caps
by Henri Verbeet Oct. 29, 2014

Oct. 29, 2014

On 28 October 2014 00:43, Joachim Priesner <joachim.priesner(a)web.de> wrote: > Wine clamps the oFog output of vertex shaders. Tests for the flag follow > in the second part of this patch. Why is it better to add the flag instead of just removing the clamping?

2 5

Re: [PATCH 7/8] dwrite: Implement system font collection as any other font collection
by Alexandre Julliard Oct. 29, 2014

Oct. 29, 2014

Nikolay Sivov <nsivov(a)codeweavers.com> writes: > Subject: [PATCH 7/8] dwrite: Implement system font collection as any other > font collection It doesn't work here: ../../../tools/runtest -q -P wine -T ../../.. -M dwrite.dll -p dwrite_test.exe.so analyzer && touch analyzer.ok wine: Unhandled page fault on read access to 0x001a0000 at address 0x68665c0b (thread 007f), starting debugger... Unhandled exception: page fault on read access to 0x001a0000 in 32-bit code (0x68665c0b). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:68665c0b ESP:0032f6c0 EBP:0032f6e8 EFLAGS:00010216( R- -- I -A-P- ) EAX:001a0000 EBX:6867e828 ECX:006e0065 EDX:0018d418 ESI:0018c798 EDI:0018c7b8 Stack dump: 0x0032f6c0: 00000013 7b84aa26 0018c7d0 0018c7b8 0x0032f6d0: 0032f736 0018c928 68665b5b 6867e828 0x0032f6e0: 0032f736 0018c928 0032f7f8 6866720b 0x0032f6f0: 0018c798 0032f736 0018d418 00000000 0x0032f700: 00000040 00000001 6867298d 00002710 0x0032f710: 00000001 00000518 0018cb32 00000000 Backtrace: =>0 0x68665c0b add_localizedstring+0xbb(iface=0x18c798, locale="en-US", string="WenQuanYi Micro Hei?? ???I??????8bg --auto %ld %ld") [/home/julliard/wine/wine/dlls/dwrite/../../include/wine/unicode.h:200] in dwrite (0x0032f6e8) 1 0x6866720b opentype_get_font_strings_from_id+0x2fa(table_data=0x18c910, id=DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, strings=0x32f854) [/home/julliard/wine/wine/dlls/dwrite/opentype.c:815] in dwrite (0x0032f7f8) 2 0x6865cab2 create_font_collection+0x1b1(factory=0x12af18, enumerator=0x12b830, ret=0x12af20) [/home/julliard/wine/wine/dlls/dwrite/font.c:1486] in dwrite (0x0032fa88) 3 0x6865d048 get_system_fontcollection+0x97(factory=0x12af18, collection=0x12af20) [/home/julliard/wine/wine/dlls/dwrite/font.c:1676] in dwrite (0x0032fab8) 4 0x68664bbd dwritefactory_GetSystemFontCollection+0xdc(iface=<couldn't compute location>, collection=<couldn't compute location>, check_for_updates=<couldn't compute location>) [/home/julliard/wine/wine/dlls/dwrite/main.c:566] in dwrite (0x0032faf8) 5 0x6865d59b gdiinterop_CreateFontFromLOGFONT+0x5a(iface=<couldn't compute location>, logfont=<couldn't compute location>, font=<couldn't compute location>) [/home/julliard/wine/wine/dlls/dwrite/../../include/dwrite.h:6896] in dwrite (0x0032fb58) 6 0x6862a87d create_fontface+0xac() [/home/julliard/wine/wine/dlls/dwrite/tests/../../../include/dwrite.h:4396] in dwrite_test (0x0032fc18) 7 0x6862b700 func_analyzer+0xb1f() [/home/julliard/wine/wine/dlls/dwrite/tests/analyzer.c:1044] in dwrite_test (0x0032fd58) 8 0x6862a083 main+0x332(argc=<is not available>, argv=<is not available>) [/home/julliard/wine/wine/dlls/dwrite/tests/../../../include/wine/test.h:584] in dwrite_test (0x0032fe08) 9 0x6863571f __wine_spec_exe_entry+0x6e(peb=<couldn't compute location>) [/home/julliard/wine/wine/dlls/winecrt0/exe_entry.c:36] in dwrite_test (0x0032fe58) 10 0x7b85992c call_process_entry+0xb() in kernel32 (0x0032fe78) 11 0x7b85a8aa start_process+0x59(peb=<couldn't compute location>) [/home/julliard/wine/wine/dlls/kernel32/process.c:1104] in kernel32 (0x0032fea8) 12 0x7bc7a5a0 call_thread_func_wrapper+0xb() in ntdll (0x0032fec8) 13 0x7bc7d361 call_thread_func+0xb0(entry=0x7b85a850, arg=0x7ffdf000, frame=0x32ffc8) [/home/julliard/wine/wine/dlls/ntdll/signal_i386.c:2724] in ntdll (0x0032ffa8) 14 0x7bc7a57e call_thread_entry_point+0x11() in ntdll (0x0032ffc8) 15 0x7bc50f57 start_process+0x16(kernel_start=0x7b85a850) [/home/julliard/wine/wine/dlls/ntdll/loader.c:2870] in ntdll (0x0032ffe8) 16 0x6803121d wine_call_on_stack+0x1c() in libwine.so.1 (0x00000000) 17 0x68031380 wine_switch_to_stack+0x1f(func=0x7bc50f40, arg=0x7b85a850, stack=0x330000) [/home/julliard/wine/wine/libs/wine/port.c:59] in libwine.so.1 (0xffdc1c18) 18 0x7bc56365 LdrInitializeThunk+0x1f4(kernel_start=<couldn't compute location>, unknown2=<couldn't compute location>, unknown3=<couldn't compute location>, unknown4=<couldn't compute location>) [/home/julliard/wine/wine/dlls/ntdll/loader.c:2924] in ntdll (0xffdc1c58) 19 0x7b860613 __wine_kernel_init+0x9b2() [/home/julliard/wine/wine/dlls/kernel32/process.c:1276] in kernel32 (0xffdc2b48) 20 0x7bc57123 __wine_process_init+0x152() [/home/julliard/wine/wine/dlls/ntdll/loader.c:3133] in ntdll (0xffdc2bb8) 21 0x6802ee83 wine_init+0x2c2(argc=0x3, argv=0xffdc30f4, error="", error_size=0x400) [/home/julliard/wine/wine/libs/wine/loader.c:958] in libwine.so.1 (0xffdc2c08) 22 0x7bf00d6a main+0x79(argc=<is not available>, argv=<is not available>) [/home/julliard/wine/wine/loader/main.c:237] in <wine-loader> (0xffdc3048) 23 0x68251a63 __libc_start_main+0xf2() in libc.so.6 (0x00000000) 0x68665c0b add_localizedstring+0xbb [/home/julliard/wine/wine/dlls/dwrite/../../include/wine/unicode.h:200] in dwrite: cmpw $0,0x0(%eax) 200 while (*s) s++; -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 3/3] ddraw/tests: Port test_mode_change to ddraw (v2)
by Henri Verbeet Oct. 29, 2014

Oct. 29, 2014

For whatever it's worth, the ddraw test test_mode_change() was originally related to is test_coop_level_mode_set(). (I.e., see also commits 43aac32f, 1ac6f487, f41ea4fe.)

1 0

Re: [PATCH 1/3] d3d9/tests: The device restores the mode settings from the registry (v2).
by Henri Verbeet Oct. 29, 2014

Oct. 29, 2014

On 27 October 2014 23:28, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > + IDirect3D9_GetAdapterDisplayMode(d3d9, D3DADAPTER_DEFAULT, &d3ddm); > + adapter_mode_count = IDirect3D9_GetAdapterModeCount(d3d9, D3DADAPTER_DEFAULT, d3ddm.Format); Shouldn't "d3ddm.Format" just be "D3DFMT_A8R8G8B8" here, since the test is using create_device()? > + modes = HeapAlloc(GetProcessHeap(), 0, sizeof(*modes) * adapter_mode_count); > + for (i = 0; i < adapter_mode_count; ++i) > + { > + UINT j; > + > + hr = IDirect3D9_EnumAdapterModes(d3d9, D3DADAPTER_DEFAULT, d3ddm.Format, i, &d3ddm2); > + ok(SUCCEEDED(hr), "Failed to enumerate display mode, hr %#x.\n", hr); > + > + if (d3ddm2.Width == screen_width && d3ddm2.Height == screen_height) > + continue; Given the nature of this test, we'd probably want to retrieve "screen_width" and "screen_height" with EnumDisplaySettingsW() and ENUM_REGISTRY_SETTINGS, and perhaps also make sure they match the current settings before running any tests. > + /* The r200 driver on Windows XP enumerates modes like 320x200 and 320x240 but > + * refuses to create a device at these sizes. */ > + if (d3ddm2.Width < 640 || d3ddm2.Height < 480) > + continue; > + > + for (j = 0; j < mode_count; ++j) > + { > + if (modes[j].w == d3ddm2.Width && modes[j].h == d3ddm2.Height) > + break; > + } > + if (j == mode_count) > + { > + modes[j].w = d3ddm2.Width; > + modes[j].h = d3ddm2.Height; > + ++mode_count; > + } > + } > + > + /* Make sure the d3d mode is smaller or equal in both width and height > + * than the mode passed to ChangeDisplaySettings. Otherwise Windows > + * shrinks the window to the ChangeDisplaySettings parameters + 12. */ > + d3ddm.Width = d3ddm.Height = d3ddm2.Width = d3ddm2.Height = ~0U; > + for (i = 0; i < mode_count; i++) > + { > + if (modes[i].w < d3ddm.Width && modes[i].h < d3ddm.Height) > + { > + d3ddm.Width = modes[i].w; > + d3ddm.Height = modes[i].h; > + } > + } > + for (i = 0; i < mode_count; i++) > + { > + if (modes[i].w < d3ddm.Width || modes[i].h < d3ddm.Height) > + continue; > + if (modes[i].w == d3ddm.Width && modes[i].h == d3ddm.Height) > + continue; > + d3ddm2.Width = modes[i].w; > + d3ddm2.Height = modes[i].h; > + break; > + } > + > + HeapFree(GetProcessHeap(), 0, modes); > + if (d3ddm2.Width == ~0U) > + { > + skip("Could not find adequate modes, skipping mode tests.\n"); > + IDirect3D9_Release(d3d9); > + return; > + } This looks fairly complicated, but in the end you just need two display modes that satisfy a couple of conditions. I suspect this code could be simplified a fair bit. Of course that probably also applies to test_reset() where this looks borrowed from.

1 0

Re: dplayx: Fix some crashes and wine_todo's
by Marvin Oct. 29, 2014

Oct. 29, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9845 Your paranoid android. === w8 (32 bit dplayx) === The test timed out

3 3

Re: dplayx: Fix some crashes and wine_todo's ( try 2)
by Nikolay Sivov Oct. 29, 2014

Oct. 29, 2014

On 10/29/2014 08:13 AM, Alistair Leslie-Hughes wrote: > +#if 0 > + /* Crashes under Win7 */ > hr = IDirectPlayX_GetSessionDesc( pDP[0], lpData[0], NULL ); > checkHR( DPERR_INVALIDPARAM, hr ); > dwDataSize=-1; > hr = IDirectPlayX_GetSessionDesc( pDP[0], lpData[0], &dwDataSize ); > checkHR( DPERR_INVALIDPARAMS, hr ); > check( -1, dwDataSize ); > +#endif That's the same. Wine test use if (0) {} block to disable code. Also you don't need checkHR() at all in such cases.

2 1

Re: dplayx: Fix some crashes and wine_todo's ( try 2)
by Sebastian Lackner Oct. 29, 2014

Oct. 29, 2014

On 29.10.2014 06:13, Alistair Leslie-Hughes wrote: > Hi, > use #if 0 > Using "#if"s is no good idea, since this doesn't ensure that the code still compiles in the future. Better use "if (0)" instead.

1 0

Re: dplayx: Fix some crashes and wine_todo's
by Nikolay Sivov Oct. 28, 2014

Oct. 28, 2014

> - hr = IDirectPlayX_GetSessionDesc( pDP[0], lpData[0], NULL ); > +/* hr = IDirectPlayX_GetSessionDesc( pDP[0], lpData[0], NULL ); > checkHR( DPERR_INVALIDPARAM, hr ); > dwDataSize=-1; > hr = IDirectPlayX_GetSessionDesc( pDP[0], lpData[0], &dwDataSize ); > checkHR( DPERR_INVALIDPARAMS, hr ); > - check( -1, dwDataSize ); > + check( -1, dwDataSize );*/ You can't just comment out parts, if those crash on Windows put them in compilable block inside if (0) and add appropriate comment.

1 0

Re: gdiplus: Fix error when drawing from a rectangle outside bitmap bounds.
by Vincent Povirk Oct. 28, 2014

Oct. 28, 2014

Don't commit this. Right and bottom are included and I incorrectly treated them as excluded. I will send a fixed version.

1 0

Re: [2/2] wined3d: wined3d: Take abs() of vertex z coordinate as FFP fog coordinate
by Stefan Dösinger Oct. 28, 2014

Oct. 28, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-10-28 00:44, schrieb Joachim Priesner: > + {0, D3DFOG_NONE, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, C_FOGGED}, > + {0, D3DFOG_LINEAR, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, C_FOGGED}, > ... > + /* We are using an affine projection matrix, so pixel fog assumes fog start and end > + * to be in device space coordinates. Pixel fog will therefore be calculated from > + * z=-1 to z=1, whereas vertex fog will be calculated from z=0 to z=1. */ > + start.f = 0.0f; > + end.f = 1.0f; I think this comment is wrong. In d3d normalized Z coordiantes go from 0.0 to 1.0. In GL (sans GL_ARB_clip_control) they go from -1.0 to 1.0. The fog results above agree with this - otherwise you'd get C_UNFOGGED for table fog in the middle of the quad with the given projection matrix and fogstart and end. Strictly speaking you don't have to set start = 0, end = 1, those are the default values. A comment stating that is enough. > + {0, D3DFOG_NONE, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, C_FOGGED}, > + {0, D3DFOG_LINEAR, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, C_FOGGED}, > + {0, D3DFOG_LINEAR, D3DFOG_NONE, C_FOGGED, C_UNFOGGED, C_FOGGED, C_FOGGED}, > + {0, D3DFOG_NONE, D3DFOG_NONE, C_FOGGED, C_FOGGED, C_FOGGED, C_FOGGED}, There's a space missing in line 3. Otherwise this patch looks good to me. It also passes on my Radeon X1600 GPU. I didn't retest the HD 5770, I assume it passes there as well. I also tested it on Vista with my GeForce 7400, it works as expected. The Radeon 9000 GPU crashes on the vs1 ("non-foggy") + table fog tests. The other non-foggy shader tests run, but don't pass. I have attached the output in case you're interested, but otherwise don't bother about this. If I have time some day I'll try to find out where the driver's limitations are. I guess it's generally broken when fog is on and the shader does not write a fog coordinate. This is not the only fog-related problem on this card on Windows. Thanks again for your hard work. I hope I didn't miss anything this time :-) Cheers, Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUT4SlAAoJEN0/YqbEcdMwYKoP/0UgSvtbxdM2sTto3Fmtl5dB fHvudTRqxQJs/7ymaxcoknGOwgY8iyu4UB0lQ1vWgIG0kJAI3QK351AujXTEG2bm Rbke87C//kTyb8DRMRYvpA05BnF1eMMtzZXD/+d1CDp8xqnUEwpdsCUz+5ZMymrk z07+zmGyq6t7XKVT4yvVA58dkIB5FuJQ/XS7mkiJ+267A+ZN+odnFGrMP/rT/jnE x/ySDcOatBsZ94LpsYqSLQH33COki+ngD2H0qAQG33Y1UAQnRb7l5g/fFwrs8vqS o5P8Hq5zEKjyjfP9Gr/BdVUjLgNurTLrpgs7T06XwMGeVJvQV2HyEIffXjrKUsqg T2H4fJaa9DHyehm+zB7YRdk+QKr0ibODA8/AG+m85nmcUFK7TZY0n+OMEHdwR8xk g6pr01zw4mJg7bJZE+uVdLwNuWA/BhTsxCrjphI9GAUf7VVr/VdaZC30m2p7lTsn rtH7vjh/UEBZg8vGwVgkpHNwaop8Cr1sfXH+uy4K6F1O/j+oLH0qpP15PCRkPqq4 HF39Lnj0/JYuI6Ak7M70K8Qw6ExP6KDs9KL9rn2znsomtPYRfkRyLe2uUCjeBHNz OfCWB8zQUrYfV9VCmK77rNgqui7+/Nyb7+MODwbnkkgBIOF/dao7WNYz501Cubee Ab85oRdj1ReT91QW2Awt =k/GT -----END PGP SIGNATURE-----

2 2

Re: [PATCH] d3d8/tests: The device restores the mode settings from the registry (v3).
by Marvin Oct. 28, 2014

Oct. 28, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9818 Your paranoid android. === w8 (32 bit device) === device.c:2437: Test failed: Expected foreground window 000701B2, got 0002004C. device.c:3219: Test failed: Expected wndproc 0x412ba0, got 0x412ba0.

1 0

Re: gdiplus: Blend in the background colour.
by Vincent Povirk Oct. 28, 2014

Oct. 28, 2014

> + return ((b + ((BYTE)bkgnd * (255 - alpha) + 127) / 255) | What's the purpose of adding 127 here? > stat = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead|ImageLockModeUserInputBuf, > PixelFormat32bppPARGB, &lockeddata); > > + if (background & 0xffffff) > + { > + DWORD *ptr; > + UINT i; > + for (ptr = (DWORD*)bits, i = 0; i < width * height; ptr++, i++) > + { > + if ((*ptr & 0xff000000) == 0xff000000) continue; > + *ptr = blend_argb_no_bkgnd_alpha(*ptr, background); > + } > + } I guess it wouldn't hurt anything, but it doesn't make much sense to do this if LockBits fails.

2 1

Re: comctl32: Enable the appropriate wizard buttons before sending DM_SETDEFID.
by Marvin Oct. 28, 2014

Oct. 28, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9817 Your paranoid android. === w2000pro (32 bit propsheet) === propsheet.c:584: Test failed: The Add button has not been pressed! propsheet.c:785: Test failed: property sheet with custom window proc: the msg 0x001c was expected, but got msg 0x0047 instead === wxppro (32 bit propsheet) === propsheet.c:584: Test failed: The Add button has not been pressed! === wvistau64 (32 bit propsheet) === propsheet.c:584: Test failed: The Add button has not been pressed! === w2008s64 (32 bit propsheet) === propsheet.c:584: Test failed: The Add button has not been pressed! === w7u (32 bit propsheet) === propsheet.c:584: Test failed: The Add button has not been pressed! propsheet.c:785: Test failed: property sheet with custom window proc: the msg 0x001c was expected, but got msg 0x0047 instead === w8 (32 bit propsheet) === propsheet.c:584: Test failed: The Add button has not been pressed! === wvistau64 (64 bit propsheet) === propsheet.c:584: Test failed: The Add button has not been pressed! === w2008s64 (64 bit propsheet) === propsheet.c:584: Test failed: The Add button has not been pressed!

1 0

Re: ws2_32: WS_get_local_ips: Fix sorting IP addresses by metric if two addresses have the same metric
by Ken Thomases Oct. 27, 2014

Oct. 27, 2014

Hi, On Oct 24, 2014, at 3:27 PM, Joachim Priesner <joachim.priesner(a)web.de> wrote: > The previous implementation required the metrics to be mutually inequal > (because of the "this_metric > last_metric" check). If the metrics were > not mutually inequal, it would write only one address per metric value to the list > and fill up the rest of the list with the magic loopback IP address 127.12.34.56. > > I take it that this is not the expected behavior, please correct me if I'm wrong! I was recently looking at this code and noticed the same problem. Thanks for working on this. I don't understand why the original code ever would have wanted to return the magic loopback address, other than to cover up the brokenness of the sort. So, why do you still have that logic in there? Each pass of the outer (i) loop can "consume" at most one entry in the list. So, the inner (j) loop should always find a remaining lowest-metric entry. lowest_metric_idx should never be -1 at the end of that loop and the magic address should never be used. More simply, this is just an attempt to sort the routes. None should be added and none should be removed (i.e. replaced with magic). Since it's a sort, I recommend that this loop simply be replaced with an invocation of qsort() with an appropriate comparison function. That's what's done in iphlpapi for similar situations. (This can be conditioned on numroutes >= 2 to avoid the overhead when it's not necessary.) After the routes are sorted, the addresses can be copied over to the h_addr_list with a much simpler loop. -Ken

1 0

Re: [PATCH 2/6] reg: Add path/key conversion functions
by Stefan Dösinger Oct. 27, 2014

Oct. 27, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-10-27 13:10, schrieb Jonathan Vollebregt: > +#define ARRAY_COUNT(A) (sizeof(A)/sizeof(*A)) Other places that use a macro like this call it ARRAY_SIZE. > +typedef struct { > + HKEY key; > + const WCHAR *short_name; > + const WCHAR *long_name; > +} hkey_rel; Style :-) > +static inline int path_rootname_cmp(const WCHAR *path, const WCHAR *name) > +{ > + DWORD length = strlenW(name); > + > + return (strncmpiW(path, name, length) == 0 && (path[length] == 0 || path[length] == '\\')); > +} I don't like the names "path" and "name". I wondered why you're relying on the length of name. A better name for "path" could be "input", but I can't think of anything for "name". > +static HKEY path_get_rootkey(const WCHAR *path) > +{ > + DWORD i; > + for (i = 0; i < ARRAY_COUNT(root_rels); i++) > + { > + if (path_rootname_cmp(path, root_rels[i].short_name) || > + path_rootname_cmp(path, root_rels[i].long_name)) > + return root_rels[i].key; > + } > + > + reg_message(STRING_INVALID_KEY); > + return NULL; > +} Is it a good idea to write an error message from deep inside a helper function? What happens when you just pass the NULL root to RegOpenKey? Can you tell the cases for STRING_INVALID_KEY and STRING_CANNOT_FIND apart base on the return value? You could also consider a function that returns an error string ID for each advapi32 Reg* error result. Then you can propagate the advapi32 return codes to main() and write the error string there. Depending on the possible failure modes this may or may not be possible. > + path = strchrW(path, '\\'); > + if (!path) > + return k; I see that this is why you need the trailing backslash elimination in the previous patch. But still, do you need this? What happens when you call e.g. RegOpenKey(HKEY_CURRENT_USER, "\\", &k)? If it returns HKEY_CURRENT_USER or a handle that points to HKEY_CURRENT_USER you're fine. Similarly for RegOpenKey(HKEY_CURRENT_USER, "", &k). -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUTtS5AAoJEN0/YqbEcdMw+kEP/0DwI2fMgk2o6bKh1mCVwzeg AFH+EKh1pAwpHBmIRHX7XzyDBAusd0GVH0+B5WQFnl+Fr49ybYqp8CGfytqm0H/e lgqS0SCDZjaDTI5WO5zT/L5/VGhQ5tQHSQJiHS3UhXX3IBDXd7aYcbreSMHNcyJ8 ZPaFmVVCH8iRiR4qqMS8cJKXPxzx5tg5Ec9TpXfyYraI8YDPTNPOGlUipl9m5kwa lrqjD+TbGbCOczq1mx6WSJnVxKWboWhz3FnzYDM0C8PzpJlRyzODWlfUHVMSLSmQ xu9K/lXl2XJpmXbjFsCPZ5C4K3pRVH3poAtPNs+yOEeHkWTE2Pf3uyKNBwpW4ONU 3PFhn0beJM1scJY/LRjpCWLi74xA+FdBq6WDuxx2BpMoDvKCe/zV+LEY6zbymtxY OsXQXXQwpcVBAC3mWQK0EWce8g2/he4PoPi8/l4ZakkCEAF4dqtdfSEQAccf9KfV EeI8PJOAZRLoKAUQgKse2mYHG8V4EJEp8IQA0HcuWgR9zEMTpIUt08xdmU5cIWfu Ena2T9phlAWmDIjcgr9haIHEreZkMI8DZI07XOmVAlZL44rSdkVop816I/ItTE98 CTwU6N0pD/V4htZcwWN7ZVojPK4AA7UD9NW7sg326drl2KIpk5j0ZmYq0/WwSL2o uS2pHS9eKgBarX7GCXyd =k2ys -----END PGP SIGNATURE-----

1 0

Re: [PATCH 2/3] d3d8/tests: The device restores the mode settings from the registry (v2).
by Marvin Oct. 27, 2014

Oct. 27, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9791 Your paranoid android. === w8 (32 bit device) === device.c:2437: Test failed: Expected foreground window 000B00CA, got 0002004C. device.c:3129: Test failed: Got unexpect width 800, expected 1024. device.c:3131: Test failed: Got unexpect height 600, expected 768. device.c:3217: Test failed: Expected wndproc 0x412ba0, got 0x412ba0.

1 0

Re: wined3d: Take abs() of vertex z coordinate as FFP fog coordinate and remove oFog clamp for vertex shaders
by Stefan Dösinger Oct. 27, 2014

Oct. 27, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, I have tested your patches on my various systems. I have replaced C_IGNORE in the d3d8 test with C_FOGGED. The test passes on Nvidia cards, but fails (also in d3d9) on my AMD cards. As far as I can see AMD cards clamp the fog coord. I have attached results from a Radeon 9000 (WinXP), Radeon X1600 (Win7) and Radeon HD 5770 (Win7). The Radeon 9000 driver crashes in the tests. Windows somehow restores it, but the screen resolution is broken until the next reboot (Can't set back the native resolution of 1400x1050.) I haven't quite understood yet what you're doing with quad2/quad3, so I can't comment on the code yet. Cheers, Stefan Am 2014-10-22 09:43, schrieb Joachim Priesner: > Supersedes 107021. (The title of that patch really was not fitting > any more.) > > The FFP fog coordinate is not vertex.z, but the absolute value of > it. The patch fixes that and adds a test. > > The tests also suggest that the vertex shader side clamp of oFog > is incorrect. The test results are clear on that for d3d9, but vary > across different Windows machines for d3d8. Therefore, the d3d8 > oFog clamp tests are disabled for now. > > Tested on openSuse 13.1 and Windows 8.1 (VMware, Wine test bot, > real machine with nVidia graphics card). --- > dlls/d3d8/tests/visual.c | 335 > +++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/visual.c | > 399 +++++++++++++++++++++++++++++++++++++++++++++ > dlls/ddraw/tests/ddraw7.c | 186 +++++++++++++++++++++ > dlls/wined3d/glsl_shader.c | 4 +- 4 files changed, 922 > insertions(+), 2 deletions(-) > > diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c > index ba73bb6..42d3e97 100644 --- a/dlls/d3d8/tests/visual.c +++ > b/dlls/d3d8/tests/visual.c @@ -696,6 +696,340 @@ done: > DestroyWindow(window); } > > +/* This test tests fog in combination with negative vertex z > coordinates. */ +static void fog_negative_z_test(void) +{ + > enum + { + C_ALPHA_0x00 = 0x00000000, + C_CLEAR > = 0xffff00ff, + C_FOGGED = 0x0000ff00, + > C_HALF_FOGGED = 0x00808000, + C_UNFOGGED = 0x00ff0000, + > C_IGNORE = 0xdeadbeef + }; + + /* Fill the null-shader > entry with the FVF (SetVertexShader is "overloaded" on d3d8). */ + > DWORD vertex_shader[3] = {D3DFVF_XYZ | D3DFVF_DIFFUSE | > D3DFVF_SPECULAR, 0, 0}; + DWORD pixel_shader[2] = {0, 0}; + > IDirect3D8 *d3d; + IDirect3DDevice8 *device; + BOOL > has_vs_support, has_ps_support, has_table_fog_support; + > unsigned int i, ps, y; + D3DCOLOR color, expected_middle_color; > + ULONG refcount; + D3DCAPS8 caps; + HWND window; + > HRESULT hr; + union + { + float f; + DWORD i; + > } start, end; + + /* For all vertex shaders the view matrix goes > in registers c0...c3, + * the projection matrix goes in > registers c4...c7. */ + + /* Basic vertex shader without fog > computation ("non foggy") */ + static const DWORD > vertex_shader_code1[] = + { + 0xfffe0100, > /* vs_1_0 */ + /* output.Pos = mul(input.Pos, > View) */ + 0x00000009, 0x80010000, 0x90e40000, 0xa0e40000, > /* dp4 r0.x, v0, c0 */ + 0x00000009, 0x80020000, > 0x90e40000, 0xa0e40001, /* dp4 r0.y, v0, c1 > */ + 0x00000009, 0x80040000, 0x90e40000, 0xa0e40002, > /* dp4 r0.z, v0, c2 */ + 0x00000009, 0x80080000, > 0x90e40000, 0xa0e40003, /* dp4 r0.w, v0, c3 > */ + /* output.Pos = mul(output.Pos, Projection) */ + > 0x00000009, 0xc0010000, 0x80e40000, 0xa0e40004, > /* dp4 oPos.x, r0, c4 */ + 0x00000009, 0xc0020000, > 0x80e40000, 0xa0e40005, /* dp4 oPos.y, r0, > c5 */ + 0x00000009, 0xc0040000, 0x80e40000, 0xa0e40006, > /* dp4 oPos.z, r0, c6 */ + 0x00000009, 0xc0080000, > 0x80e40000, 0xa0e40007, /* dp4 oPos.w, r0, > c7 */ + /* output.Color = input.Color */ + > 0x00000001, 0xd00f0000, 0x90e40001, > /* mov oD0, v1 */ + 0x0000ffff, > /* END */ + }; + + /* Basic vertex shader with > fog computation ("foggy"). + * Using the vertex' x coordinate > as fog coordinate so that all test cases that use vertex fog + > * will have a gradient from fully fogged (green, left) to unfogged > (red, right). */ + static const DWORD vertex_shader_code2[] = + > { + 0xfffe0100, > /* vs_1_0 */ + /* output.Pos = mul(input.Pos, > View) */ + 0x00000009, 0x80010000, 0x90e40000, 0xa0e40000, > /* dp4 r0.x, v0, c0 */ + 0x00000009, 0x80020000, > 0x90e40000, 0xa0e40001, /* dp4 r0.y, v0, c1 > */ + 0x00000009, 0x80040000, 0x90e40000, 0xa0e40002, > /* dp4 r0.z, v0, c2 */ + 0x00000009, 0x80080000, > 0x90e40000, 0xa0e40003, /* dp4 r0.w, v0, c3 > */ + /* output.Pos = mul(output.Pos, Projection) */ + > 0x00000009, 0xc0010000, 0x80e40000, 0xa0e40004, > /* dp4 oPos.x, r0, c4 */ + 0x00000009, 0xc0020000, > 0x80e40000, 0xa0e40005, /* dp4 oPos.y, r0, > c5 */ + 0x00000009, 0xc0040000, 0x80e40000, 0xa0e40006, > /* dp4 oPos.z, r0, c6 */ + 0x00000009, 0xc0080000, > 0x80e40000, 0xa0e40007, /* dp4 oPos.w, r0, > c7 */ + /* output.Color = input.Color */ + > 0x00000001, 0xd00f0000, 0x90e40001, > /* mov oD0, v1 */ + /* output.Fog = input.Pos.x */ + > 0x00000001, 0xc00f0001, 0x90000000, > /* mov oFog, v0.x */ + 0x0000ffff, > /* END */ + }; + + /* Basic pixel shader */ + > static const DWORD pixel_shader_code[] = + { + > 0xffff0101, > /* ps_1_1 */ + 0x00000001, 0x800f0000, 0x90e40000, > /* mov r0, v0 */ + 0x0000ffff + }; + + static const > struct + { + struct vec3 position; + DWORD > diffuse; + DWORD specular; + } + quad1[] = + { + > {{-1.0f, -1.0f, -1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + > {{-1.0f, 0.0f, -1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ > 1.0f, -1.0f, 1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ 1.0f, > 0.0f, 1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + }, + quad2[] = + > { + {{-1.0f, 0.0f, -1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + > {{-1.0f, 1.0f, -1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ > 0.0f, 0.0f, 0.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ 0.0f, > 1.0f, 0.0f}, C_UNFOGGED, C_ALPHA_0x00}, + }, + quad3[] = + > { + {{ 0.0f, 0.0f, 0.0f}, C_UNFOGGED, C_ALPHA_0x00}, + > {{ 0.0f, 1.0f, 0.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ > 1.0f, 0.0f, 1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ 1.0f, > 1.0f, 1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + }; + static const > DWORD vertex_decl[] = + { + D3DVSD_STREAM(0), + > D3DVSD_REG(0, D3DVSDT_FLOAT3), /* position, v0 */ + > D3DVSD_REG(1, D3DVSDT_D3DCOLOR), /* diffuse color, v1 */ + > D3DVSD_REG(2, D3DVSDT_D3DCOLOR), /* specular color, v2 */ + > D3DVSD_END() + }; + static const struct test_data_t + { + > int vshader; + D3DFOGMODE vfog; + D3DFOGMODE tfog; + > DWORD color_left; + DWORD color_middle_top; + DWORD > color_middle_bottom; + DWORD color_right; + } + > test_data[] = + { + /* Using z-based fog, the bottom quad > should have a gradient UNFOGGED->FOGGED + * for table fog, > and be completely fogged for vertex fog. + * When the fog > coordinate returned by the vertex shader is used instead, + > * the result is a gradient FOGGED->UNFOGGED. */ + + /* No > vertex shader */ + {0, D3DFOG_NONE, D3DFOG_LINEAR, > C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, C_FOGGED}, + {0, > D3DFOG_LINEAR, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, > C_HALF_FOGGED, C_FOGGED}, + {0, D3DFOG_LINEAR, D3DFOG_NONE, > C_FOGGED, C_UNFOGGED, C_FOGGED, C_FOGGED}, + {0, > D3DFOG_NONE, D3DFOG_NONE, C_FOGGED, C_FOGGED, C_FOGGED, > C_FOGGED}, + + /* Vertex shader without vertex fog > computation */ + {1, D3DFOG_NONE, D3DFOG_LINEAR, > C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, C_FOGGED}, + {1, > D3DFOG_LINEAR, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, > C_HALF_FOGGED, C_FOGGED}, + {1, D3DFOG_LINEAR, D3DFOG_NONE, > C_FOGGED, C_FOGGED, C_FOGGED, C_FOGGED}, + {1, > D3DFOG_NONE, D3DFOG_NONE, C_FOGGED, C_FOGGED, C_FOGGED, > C_FOGGED}, + + /* Vertex shader with vertex fog > computation. + * Ignore the bottom middle color as test > results vary on different Windows machines. */ + {2, > D3DFOG_NONE, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, > C_HALF_FOGGED, C_FOGGED}, + {2, D3DFOG_LINEAR, > D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, > C_FOGGED}, + {2, D3DFOG_LINEAR, D3DFOG_NONE, C_FOGGED, > C_FOGGED, C_IGNORE, C_UNFOGGED}, + {2, > D3DFOG_NONE, D3DFOG_NONE, C_FOGGED, C_FOGGED, C_IGNORE, > C_UNFOGGED}, + }; + /* Affine projection matrix for z-near = > -1, z-far = 1. */ + static const D3DMATRIX proj_mat = + {{{ + > 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + > 0.0f, 0.0f, 0.5f, 0.0f, + 0.0f, 0.0f, 0.5f, 1.0f + }}}; + > /* Transposed version of proj_mat to pass to the vertex shaders. > */ + static const D3DMATRIX proj_mat_transposed = + {{{ + > 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + > 0.0f, 0.0f, 0.5f, 0.5f, + 0.0f, 0.0f, 0.0f, 1.0f + }}}; + > static const D3DMATRIX view_mat = + {{{ + 1.0f, 0.0f, > 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, > 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f + }}}; + + window > = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | > WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + > d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to > create a D3D object\n"); + if (!(device = create_device(d3d, > window, window, TRUE))) + { + skip("Failed to create a > D3D device, skipping tests\n"); + goto done; + } + + > hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + > ok(SUCCEEDED(hr), "Failed to get device caps (%#x)\n", hr); + + > has_table_fog_support = caps.RasterCaps & D3DPRASTERCAPS_FOGTABLE; > + if (!has_table_fog_support) + skip("No table fog > support, skipping some fog tests\n"); + + has_ps_support = > caps.PixelShaderVersion >= D3DPS_VERSION(1, 1); + if > (has_ps_support) + { + hr = > IDirect3DDevice8_CreatePixelShader(device, pixel_shader_code, > &pixel_shader[1]); + ok(SUCCEEDED(hr), "CreatePixelShader > failed (%#x)\n", hr); + } + else + { + skip("No > ps_1_1 support, skipping some fog tests\n"); + } + + > has_vs_support = caps.VertexShaderVersion >= D3DVS_VERSION(1, 0); + > if (has_vs_support) + { + hr = > IDirect3DDevice8_CreateVertexShader(device, vertex_decl, > vertex_shader_code1, &vertex_shader[1], 0); + > ok(SUCCEEDED(hr), "CreateVertexShader failed (%#x)\n", hr); + > hr = IDirect3DDevice8_CreateVertexShader(device, vertex_decl, > vertex_shader_code2, &vertex_shader[2], 0); + > ok(SUCCEEDED(hr), "CreateVertexShader failed (%#x)\n", hr); + + > /* Note: Shaders expect matrices in column-major form, so they > have + * to be transposed if they are not symmetrical. */ + > hr = IDirect3DDevice8_SetVertexShaderConstant(device, 0, &view_mat, > 4); + ok(SUCCEEDED(hr), "SetVertexShaderConstant (view > matrix) failed (%#x)\n", hr); + hr = > IDirect3DDevice8_SetVertexShaderConstant(device, 4, > &proj_mat_transposed, 4); + ok(SUCCEEDED(hr), > "SetVertexShaderConstant (projection matrix) failed (%#x)\n", hr); > + } + else + { + skip("No vs_1_0 support, skipping > some fog tests\n"); + } + + /* Setup initial states: No depth > test, no lighting, fog on, fog color */ + hr = > IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, > D3DZB_FALSE); + ok(SUCCEEDED(hr), "Turning off depth test failed > (%#x)\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, > D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Turning off > lighting failed (%#x)\n", hr); + hr = > IDirect3DDevice8_SetRenderState(device, D3DRS_FOGENABLE, TRUE); + > ok(SUCCEEDED(hr), "Turning on fog calculations failed (%#x)\n", > hr); + hr = IDirect3DDevice8_SetRenderState(device, > D3DRS_FOGCOLOR, C_FOGGED); + ok(SUCCEEDED(hr), "Setting fog > color failed (%#x)\n", hr); + + /* We are using an affine > projection matrix, so fog start and end are in device space > coords. + * This corresponds to a fog from z=-1 to z=1. */ + > start.f = 0.0f; + end.f = 1.0f; + + hr = > IDirect3DDevice8_SetRenderState(device, D3DRS_FOGSTART, start.i); + > ok(SUCCEEDED(hr), "Setting fog start failed (%#x)\n", hr); + hr > = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGEND, end.i); + > ok(SUCCEEDED(hr), "Setting fog end failed (%#x)\n", hr); + + hr > = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, > &proj_mat); + ok(SUCCEEDED(hr), "Failed to set projection > transform (%#x)\n", hr); + hr = > IDirect3DDevice8_SetTransform(device, D3DTS_VIEW, &view_mat); + > ok(SUCCEEDED(hr), "Failed to set view transform (%#x)\n", hr); + + > for (i = 0; i < sizeof(test_data)/sizeof(test_data[0]); i++) + > { + if (test_data[i].vshader != 0 && > !vertex_shader[test_data[i].vshader]) + continue; + > if (test_data[i].tfog != D3DFOG_NONE && !has_table_fog_support) + > continue; + + hr = IDirect3DDevice8_SetVertexShader(device, > vertex_shader[test_data[i].vshader]); + ok(SUCCEEDED(hr), > "SetVertexShader failed (%#x)\n", hr); + + for (ps = 0; ps < > sizeof(pixel_shader)/sizeof(pixel_shader[0]); ps++) + { + > if (ps != 0 && !pixel_shader[ps]) + continue; + + > if (has_ps_support) + { + hr = > IDirect3DDevice8_SetPixelShader(device, pixel_shader[ps]); + > ok(SUCCEEDED(hr), "SetPixelShader failed (%#x)\n", hr); + > } + + hr = IDirect3DDevice8_SetRenderState(device, > D3DRS_FOGVERTEXMODE, test_data[i].vfog); + > ok(SUCCEEDED(hr), "Setting fog vertex mode to %d failed (%#x)\n", > test_data[i].vfog, hr); + hr = > IDirect3DDevice8_SetRenderState(device, D3DRS_FOGTABLEMODE, > test_data[i].tfog); + ok(SUCCEEDED(hr), "Setting fog > table mode to %d failed (%#x)\n", test_data[i].tfog, hr); + + > hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, > C_CLEAR, 1.0f, 0); + ok(SUCCEEDED(hr), "Clear failed > (%#x)\n", hr); + hr = > IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), > "BeginScene failed (%#x)\n", hr); + hr = > IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, > &quad1[0], sizeof(quad1[0])); + ok(SUCCEEDED(hr), > "DrawPrimitiveUP failed (%#x)\n", hr); + hr = > IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, > &quad2[0], sizeof(quad2[0])); + ok(SUCCEEDED(hr), > "DrawPrimitiveUP failed (%#x)\n", hr); + hr = > IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, > &quad3[0], sizeof(quad3[0])); + ok(SUCCEEDED(hr), > "DrawPrimitiveUP failed (%#x)\n", hr); + hr = > IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), > "EndScene failed (%#x)\n", hr); + + /* Use 5% tolerance > on the colors since there may be a gradient + * between > left and right vertices. */ + for (y = 120; y <= 360; y > += 240) + { + color = > getPixelColor(device, 2, y); + ok(color_match(color, > test_data[i].color_left, 13), + "fog vs%i > ps%i fvm%i ftm%i, y=%i: got left color %08x, expected > %08x+-5%%\n", + test_data[i].vshader, ps, > test_data[i].vfog, test_data[i].tfog, y, + > color, test_data[i].color_left); + > expected_middle_color = + (y == 120 ? > test_data[i].color_middle_top : test_data[i].color_middle_bottom); > + if (expected_middle_color != C_IGNORE) + > { + color = getPixelColor(device, 320, y); + > ok(color_match(color, expected_middle_color, 13), + > "fog vs%i ps%i fvm%i ftm%i, y=%i: got middle color %08x, expected > %08x+-5%%\n", + test_data[i].vshader, > ps, test_data[i].vfog, test_data[i].tfog, y, + > color, expected_middle_color); + } + > color = getPixelColor(device, 638, y); + > ok(color_match(color, test_data[i].color_right, 13), + > "fog vs%i ps%i fvm%i ftm%i, y=%i: got right color %08x, expected > %08x+-5%%\n", + test_data[i].vshader, ps, > test_data[i].vfog, test_data[i].tfog, y, + > color, test_data[i].color_right); + } + + hr > = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + > ok(SUCCEEDED(hr), "Present failed (%#x)\n", hr); + } + } > + for (i = 0; i < > sizeof(vertex_shader)/sizeof(vertex_shader[0]); i++) + if > (vertex_shader[i]) + > IDirect3DDevice8_DeleteVertexShader(device, vertex_shader[i]); + > for (i = 0; i < sizeof(pixel_shader)/sizeof(pixel_shader[0]); i++) > + if (pixel_shader[i]) + > IDirect3DDevice8_DeletePixelShader(device, pixel_shader[i]); + > refcount = IDirect3DDevice8_Release(device); + ok(!refcount, > "Device has %u references left\n", refcount); +done: + > IDirect3D8_Release(d3d); + DestroyWindow(window); +} + /* This > tests fog in combination with shaders. * What's tested: linear fog > (vertex and table) with pixel shader * linear table > fog with non foggy vertex shader @@ -5092,6 +5426,7 @@ > START_TEST(visual) offscreen_test(); alpha_test(); > test_scalar_instructions(); + fog_negative_z_test(); > fog_with_shader_test(); cnd_test(); p8_texture_test(); diff --git > a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index > 117c8eb..421cae0 100644 --- a/dlls/d3d9/tests/visual.c +++ > b/dlls/d3d9/tests/visual.c @@ -1825,6 +1825,404 @@ done: > DestroyWindow(window); } > > +/* This test tests fog in combination with negative vertex z > coordinates. */ +static void fog_negative_z_test(void) +{ + > enum + { + C_ALPHA_0x00 = 0x00000000, + C_CLEAR > = 0xffff00ff, + C_FOGGED = 0x0000ff00, + > C_HALF_FOGGED = 0x00808000, + C_UNFOGGED = 0x00ff0000 + > }; + + IDirect3DVertexShader9 *vertex_shader[4] = {NULL, NULL, > NULL, NULL}; + IDirect3DPixelShader9 *pixel_shader[3] = {NULL, > NULL, NULL}; + IDirect3DVertexDeclaration9 *vertex_declaration = > NULL; + IDirect3DDevice9 *device; + BOOL has_vs_support, > has_ps_support, has_table_fog_support; + unsigned int i, ps, y; > + IDirect3D9 *d3d; + ULONG refcount; + D3DCAPS9 caps; + > DWORD color, expected_middle_color; + HWND window; + HRESULT > hr; + union + { + float f; + DWORD i; + } > start, end; + + /* For all vertex shaders the view matrix goes > in registers c0...c3, + * the projection matrix goes in > registers c4...c7. */ + + /* Basic vertex shader without fog > computation ("non foggy") */ + static const DWORD > vertex_shader_code1[] = + { + 0xfffe0101, > /* vs_1_1 */ + 0x0000001f, 0x80000000, > 0x900f0000, /* dcl_position0 v0 > */ + 0x0000001f, 0x8000000a, 0x900f0001, > /* dcl_color0 v1 */ + /* output.Pos = mul(input.Pos, > View) */ + 0x00000009, 0x80010000, 0x90e40000, 0xa0e40000, > /* dp4 r0.x, v0, c0 */ + 0x00000009, 0x80020000, > 0x90e40000, 0xa0e40001, /* dp4 r0.y, v0, c1 > */ + 0x00000009, 0x80040000, 0x90e40000, 0xa0e40002, > /* dp4 r0.z, v0, c2 */ + 0x00000009, 0x80080000, > 0x90e40000, 0xa0e40003, /* dp4 r0.w, v0, c3 > */ + /* output.Pos = mul(output.Pos, Projection) */ + > 0x00000009, 0xc0010000, 0x80e40000, 0xa0e40004, > /* dp4 oPos.x, r0, c4 */ + 0x00000009, 0xc0020000, > 0x80e40000, 0xa0e40005, /* dp4 oPos.y, r0, > c5 */ + 0x00000009, 0xc0040000, 0x80e40000, 0xa0e40006, > /* dp4 oPos.z, r0, c6 */ + 0x00000009, 0xc0080000, > 0x80e40000, 0xa0e40007, /* dp4 oPos.w, r0, > c7 */ + /* output.Color = input.Color */ + > 0x00000001, 0xd00f0000, 0x90e40001, > /* mov oD0, v1 */ + 0x0000ffff, > /* END */ + }; + + /* Basic vertex shader with > fog computation ("foggy"). + * Using the vertex' x coordinate > as fog coordinate so that all test cases that use vertex fog + > * will have a gradient from fully fogged (green, left) to unfogged > (red, right). */ + static const DWORD vertex_shader_code2[] = + > { + 0xfffe0101, > /* vs_1_1 */ + 0x0000001f, 0x80000000, > 0x900f0000, /* dcl_position0 v0 > */ + 0x0000001f, 0x8000000a, 0x900f0001, > /* dcl_color0 v1 */ + /* output.Pos = mul(input.Pos, > View) */ + 0x00000009, 0x80010000, 0x90e40000, 0xa0e40000, > /* dp4 r0.x, v0, c0 */ + 0x00000009, 0x80020000, > 0x90e40000, 0xa0e40001, /* dp4 r0.y, v0, c1 > */ + 0x00000009, 0x80040000, 0x90e40000, 0xa0e40002, > /* dp4 r0.z, v0, c2 */ + 0x00000009, 0x80080000, > 0x90e40000, 0xa0e40003, /* dp4 r0.w, v0, c3 > */ + /* output.Pos = mul(output.Pos, Projection) */ + > 0x00000009, 0xc0010000, 0x80e40000, 0xa0e40004, > /* dp4 oPos.x, r0, c4 */ + 0x00000009, 0xc0020000, > 0x80e40000, 0xa0e40005, /* dp4 oPos.y, r0, > c5 */ + 0x00000009, 0xc0040000, 0x80e40000, 0xa0e40006, > /* dp4 oPos.z, r0, c6 */ + 0x00000009, 0xc0080000, > 0x80e40000, 0xa0e40007, /* dp4 oPos.w, r0, > c7 */ + /* output.Color = input.Color */ + > 0x00000001, 0xd00f0000, 0x90e40001, > /* mov oD0, v1 */ + /* output.Fog = input.Pos.x */ + > 0x00000001, 0xc00f0001, 0x90000000, > /* mov oFog, v0.x */ + 0x0000ffff, > /* END */ + }; + + /* Basic vertex shader with > fog computation ("foggy"), vs_2_0 */ + static const DWORD > vertex_shader_code3[] = + { + 0xfffe0200, > /* vs_2_0 */ + 0x0200001f, 0x80000000, > 0x900f0000, /* dcl_position0 v0 > */ + 0x0200001f, 0x8000000a, 0x900f0001, > /* dcl_color0 v1 */ + /* output.Pos = mul(input.Pos, > View) */ + 0x03000009, 0x80010000, 0x90e40000, 0xa0e40000, > /* dp4 r0.x, v0, c0 */ + 0x03000009, 0x80020000, > 0x90e40000, 0xa0e40001, /* dp4 r0.y, v0, c1 > */ + 0x03000009, 0x80040000, 0x90e40000, 0xa0e40002, > /* dp4 r0.z, v0, c2 */ + 0x03000009, 0x80080000, > 0x90e40000, 0xa0e40003, /* dp4 r0.w, v0, c3 > */ + /* output.Pos = mul(output.Pos, Projection) */ + > 0x03000009, 0xc0010000, 0x80e40000, 0xa0e40004, > /* dp4 oPos.x, r0, c4 */ + 0x03000009, 0xc0020000, > 0x80e40000, 0xa0e40005, /* dp4 oPos.y, r0, > c5 */ + 0x03000009, 0xc0040000, 0x80e40000, 0xa0e40006, > /* dp4 oPos.z, r0, c6 */ + 0x03000009, 0xc0080000, > 0x80e40000, 0xa0e40007, /* dp4 oPos.w, r0, > c7 */ + /* output.Color = input.Color */ + > 0x02000001, 0xd00f0000, 0x90e40001, > /* mov oD0, v1 */ + /* output.Fog = input.Pos.x */ + > 0x02000001, 0xc00f0001, 0x90000000, > /* mov oFog, v0.x */ + 0x0000ffff, > /* END */ + }; + + /* Basic pixel shader */ + > static const DWORD pixel_shader_code[] = + { + > 0xffff0101, > /* ps_1_1 */ + 0x00000001, 0x800f0000, 0x90e40000, > /* mov r0, v0 */ + 0x0000ffff + }; + static const > DWORD pixel_shader_code2[] = + { + 0xffff0200, > /* ps_2_0 */ + 0x0200001f, 0x80000000, 0x900f0000, > /* dcl v0 */ + 0x02000001, 0x800f0800, 0x90e40000, > /* mov oC0, v0 */ + 0x0000ffff + }; + static const > struct + { + struct vec3 position; + D3DCOLOR > diffuse; + D3DCOLOR specular; + } + quad1[] = + { + > {{-1.0f, -1.0f, -1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + > {{-1.0f, 0.0f, -1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ > 1.0f, -1.0f, 1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ 1.0f, > 0.0f, 1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + }, + quad2[] = + > { + {{-1.0f, 0.0f, -1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + > {{-1.0f, 1.0f, -1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ > 0.0f, 0.0f, 0.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ 0.0f, > 1.0f, 0.0f}, C_UNFOGGED, C_ALPHA_0x00}, + }, + quad3[] = + > { + {{ 0.0f, 0.0f, 0.0f}, C_UNFOGGED, C_ALPHA_0x00}, + > {{ 0.0f, 1.0f, 0.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ > 1.0f, 0.0f, 1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ 1.0f, > 1.0f, 1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + }; + + static > const D3DVERTEXELEMENT9 decl_elements[] = + { + {0, 0, > D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, > 0}, + {0, 12, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, > D3DDECLUSAGE_COLOR, 0}, /* diffuse */ + {0, 16, > D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, > 1}, /* specular */ + D3DDECL_END() + }; + static const > struct test_data_t + { + int vshader; + D3DFOGMODE > vfog; + D3DFOGMODE tfog; + DWORD color_left; + > DWORD color_middle_top; + DWORD color_middle_bottom; + > DWORD color_right; + } + test_data[] = + { + /* > Using z-based fog, the bottom quad should have a gradient > UNFOGGED->FOGGED + * for table fog, and be completely > fogged for vertex fog. + * When the fog coordinate returned > by the vertex shader is used instead, + * the result is a > gradient FOGGED->UNFOGGED in the right half of the screen. */ + + > /* No vertex shader */ + {0, D3DFOG_NONE, D3DFOG_LINEAR, > C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, C_FOGGED}, + {0, > D3DFOG_LINEAR, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, > C_HALF_FOGGED, C_FOGGED}, + {0, D3DFOG_LINEAR, D3DFOG_NONE, > C_FOGGED, C_UNFOGGED, C_FOGGED, C_FOGGED}, + {0, > D3DFOG_NONE, D3DFOG_NONE, C_FOGGED, C_FOGGED, C_FOGGED, > C_FOGGED}, + + /* Vertex shader without vertex fog > computation */ + {1, D3DFOG_NONE, D3DFOG_LINEAR, > C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, C_FOGGED}, + {1, > D3DFOG_LINEAR, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, > C_HALF_FOGGED, C_FOGGED}, + {1, D3DFOG_LINEAR, D3DFOG_NONE, > C_FOGGED, C_FOGGED, C_FOGGED, C_FOGGED}, + {1, > D3DFOG_NONE, D3DFOG_NONE, C_FOGGED, C_FOGGED, C_FOGGED, > C_FOGGED}, + + /* Vertex shader vs_1_1 with vertex fog > computation */ + {2, D3DFOG_NONE, D3DFOG_LINEAR, > C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, C_FOGGED}, + {2, > D3DFOG_LINEAR, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, > C_HALF_FOGGED, C_FOGGED}, + {2, D3DFOG_LINEAR, D3DFOG_NONE, > C_FOGGED, C_FOGGED, C_FOGGED, C_UNFOGGED}, + {2, > D3DFOG_NONE, D3DFOG_NONE, C_FOGGED, C_FOGGED, C_FOGGED, > C_UNFOGGED}, + + /* Vertex shader vs_2_0 with vertex fog > computation */ + {3, D3DFOG_NONE, D3DFOG_LINEAR, > C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, C_FOGGED}, + {3, > D3DFOG_LINEAR, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, > C_HALF_FOGGED, C_FOGGED}, + {3, D3DFOG_LINEAR, D3DFOG_NONE, > C_FOGGED, C_FOGGED, C_FOGGED, C_UNFOGGED}, + {3, > D3DFOG_NONE, D3DFOG_NONE, C_FOGGED, C_FOGGED, C_FOGGED, > C_UNFOGGED}, + }; + /* Affine projection matrix for z-near = > -1, z-far = 1. */ + static const D3DMATRIX proj_mat = + {{{ + > 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + > 0.0f, 0.0f, 0.5f, 0.0f, + 0.0f, 0.0f, 0.5f, 1.0f, + }}}; > + /* Transposed version of proj_mat to pass to the vertex > shaders. */ + static const D3DMATRIX proj_mat_transposed = + > {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, > 0.0f, + 0.0f, 0.0f, 0.5f, 0.5f, + 0.0f, 0.0f, 0.0f, > 1.0f, + }}}; + static const D3DMATRIX view_mat = + {{{ + > 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + > 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }}}; > + + window = CreateWindowA("static", "d3d9_test", > WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, > NULL, NULL, NULL, NULL); + d3d = > Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create > a D3D object\n"); + if (!(device = create_device(d3d, window, > window, TRUE))) + { + skip("Failed to create a D3D > device, skipping tests\n"); + goto done; + } + + hr = > IDirect3DDevice9_GetDeviceCaps(device, &caps); + > ok(SUCCEEDED(hr), "Failed to get device caps (%#x)\n", hr); + + > has_table_fog_support = caps.RasterCaps & D3DPRASTERCAPS_FOGTABLE; > + if (!has_table_fog_support) + skip("No table fog > support, skipping some fog tests\n"); + + has_vs_support = > caps.VertexShaderVersion >= D3DVS_VERSION(1, 1); + if > (has_vs_support) + { + hr = > IDirect3DDevice9_CreateVertexShader(device, vertex_shader_code1, > &vertex_shader[1]); + ok(SUCCEEDED(hr), "CreateVertexShader > failed (%#x)\n", hr); + hr = > IDirect3DDevice9_CreateVertexShader(device, vertex_shader_code2, > &vertex_shader[2]); + ok(SUCCEEDED(hr), "CreateVertexShader > failed (%#x)\n", hr); + + if (caps.VertexShaderVersion >= > D3DVS_VERSION(2, 0)) + { + hr = > IDirect3DDevice9_CreateVertexShader(device, vertex_shader_code3, > &vertex_shader[3]); + ok(SUCCEEDED(hr), > "CreateVertexShader failed (%#x)\n", hr); + } + else > + { + skip("No vs_2_0 support, skipping some fog > tests\n"); + } + + /* Note: Shaders expect matrices > in column-major form, so they have + * to be transposed if > they are not symmetrical. */ + hr = > IDirect3DDevice9_SetVertexShaderConstantF(device, 0, (const > float*)&view_mat, 4); + ok(SUCCEEDED(hr), > "SetVertexShaderConstantF (view matrix) failed (%#x)\n", hr); + > hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 4, (const > float*)&proj_mat_transposed, 4); + ok(SUCCEEDED(hr), > "SetVertexShaderConstantF (projection matrix) failed (%#x)\n", > hr); + } + else + { + skip("No vs_1_1 support, > skipping some fog tests\n"); + } + + has_ps_support = > caps.PixelShaderVersion >= D3DPS_VERSION(1, 1); + if > (has_ps_support) + { + hr = > IDirect3DDevice9_CreatePixelShader(device, pixel_shader_code, > &pixel_shader[1]); + ok(SUCCEEDED(hr), "CreatePixelShader > failed (%#x)\n", hr); + + if (caps.PixelShaderVersion >= > D3DPS_VERSION(2, 0)) + { + hr = > IDirect3DDevice9_CreatePixelShader(device, pixel_shader_code2, > &pixel_shader[2]); + ok(SUCCEEDED(hr), > "CreatePixelShader failed (%#x)\n", hr); + } + else + > { + skip("No ps_2_0 support, skipping some fog > tests\n"); + } + } + else + { + skip("No > ps_1_1 support, skipping some fog tests\n"); + } + + hr = > IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, > &vertex_declaration); + ok(SUCCEEDED(hr), > "CreateVertexDeclaration failed (%#x)\n", hr); + + /* Setup > initial states: No depth test, no lighting, fog on, fog color */ + > hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, > D3DZB_FALSE); + ok(SUCCEEDED(hr), "Turning off depth test failed > (%#x)\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, > D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Turning off > lighting failed (%#x)\n", hr); + hr = > IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, TRUE); + > ok(SUCCEEDED(hr), "Turning on fog calculations failed (%#x)\n", > hr); + hr = IDirect3DDevice9_SetRenderState(device, > D3DRS_FOGCOLOR, C_FOGGED); + ok(SUCCEEDED(hr), "Setting fog > color failed (%#x)\n", hr); + hr = > IDirect3DDevice9_SetVertexDeclaration(device, vertex_declaration); > + ok(SUCCEEDED(hr), "SetVertexDeclaration failed (%#x)\n", hr); > + + /* We are using an affine projection matrix, so fog start > and end are in device space coords. + * This corresponds to a > fog from z=-1 to z=1. */ + start.f = 0.0f; + end.f = 1.0f; + > + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGSTART, > start.i); + ok(SUCCEEDED(hr), "Setting fog start failed > (%#x)\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, > D3DRS_FOGEND, end.i); + ok(SUCCEEDED(hr), "Setting fog end > failed (%#x)\n", hr); + + hr = > IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, > &proj_mat); + ok(SUCCEEDED(hr), "Failed to set projection > transform (%#x)\n", hr); + hr = > IDirect3DDevice9_SetTransform(device, D3DTS_VIEW, &view_mat); + > ok(SUCCEEDED(hr), "Failed to set view transform (%#x)\n", hr); + + > for (i = 0; i < sizeof(test_data)/sizeof(test_data[0]); i++) + > { + if (test_data[i].vshader != 0 && > !vertex_shader[test_data[i].vshader]) + continue; + > if (test_data[i].tfog != D3DFOG_NONE && !has_table_fog_support) + > continue; + + if (has_vs_support) + { + hr > = IDirect3DDevice9_SetVertexShader(device, > vertex_shader[test_data[i].vshader]); + > ok(SUCCEEDED(hr), "SetVertexShader failed (%#x)\n", hr); + > } + + for (ps = 0; ps < > sizeof(pixel_shader)/sizeof(pixel_shader[0]); ps++) + { + > if (ps != 0 && !pixel_shader[ps]) + continue; + + > if (has_ps_support) + { + hr = > IDirect3DDevice9_SetPixelShader(device, pixel_shader[ps]); + > ok(SUCCEEDED(hr), "SetPixelShader failed (%#x)\n", hr); + > } + + hr = IDirect3DDevice9_SetRenderState(device, > D3DRS_FOGVERTEXMODE, test_data[i].vfog); + > ok(SUCCEEDED(hr), "Setting fog vertex mode to %d failed (%#x)\n", > test_data[i].vfog, hr); + hr = > IDirect3DDevice9_SetRenderState(device, D3DRS_FOGTABLEMODE, > test_data[i].tfog); + ok(SUCCEEDED(hr), "Setting fog > table mode to %d failed (%#x)\n", test_data[i].tfog, hr); + + > hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, > C_CLEAR, 1.0f, 0); + ok(SUCCEEDED(hr), "Clear failed > (%#x)\n", hr); + hr = > IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), > "BeginScene failed (%#x)\n", hr); + hr = > IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, > &quad1[0], sizeof(quad1[0])); + ok(SUCCEEDED(hr), > "DrawPrimitiveUP failed (%#x)\n", hr); + hr = > IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, > &quad2[0], sizeof(quad2[0])); + ok(SUCCEEDED(hr), > "DrawPrimitiveUP failed (%#x)\n", hr); + hr = > IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, > &quad3[0], sizeof(quad3[0])); + ok(SUCCEEDED(hr), > "DrawPrimitiveUP failed (%#x)\n", hr); + hr = > IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), > "EndScene failed (%#x)\n", hr); + + /* Use 5% tolerance > on the colors since there may be a gradient + * between > left and right vertices. */ + for (y = 120; y <= 360; y > += 240) + { + color = > getPixelColor(device, 2, y); + ok(color_match(color, > test_data[i].color_left, 13), + "fog vs%i > ps%i fvm%i ftm%i, y=%i: got left color %08x, expected > %08x+-5%%\n", + test_data[i].vshader, ps, > test_data[i].vfog, test_data[i].tfog, y, + > color, test_data[i].color_left); + color = > getPixelColor(device, 320, y); + > expected_middle_color = + (y == 120 ? > test_data[i].color_middle_top : test_data[i].color_middle_bottom); > + ok(color_match(color, expected_middle_color, 13), > + "fog vs%i ps%i fvm%i ftm%i, y=%i: got > middle color %08x, expected %08x+-5%%\n", + > test_data[i].vshader, ps, test_data[i].vfog, test_data[i].tfog, y, > + color, expected_middle_color); + > color = getPixelColor(device, 638, y); + > ok(color_match(color, test_data[i].color_right, 13), + > "fog vs%i ps%i fvm%i ftm%i, y=%i: got right color %08x, expected > %08x+-5%%\n", + test_data[i].vshader, ps, > test_data[i].vfog, test_data[i].tfog, y, + > color, test_data[i].color_right); + } + + hr > = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + > ok(SUCCEEDED(hr), "Present failed (%#x)\n", hr); + } + } > + + for (i = 0; i < > sizeof(vertex_shader)/sizeof(vertex_shader[0]); i++) + if > (vertex_shader[i]) + > IDirect3DVertexShader9_Release(vertex_shader[i]); + for (i = 0; > i < sizeof(pixel_shader)/sizeof(pixel_shader[0]); i++) + if > (pixel_shader[i]) + > IDirect3DPixelShader9_Release(pixel_shader[i]); + > IDirect3DVertexDeclaration9_Release(vertex_declaration); + > refcount = IDirect3DDevice9_Release(device); + ok(!refcount, > "Device has %u references left\n", refcount); +done: + > IDirect3D9_Release(d3d); + DestroyWindow(window); +} + /* This > test tests fog in combination with shaders. * What's tested: linear > fog (vertex and table) with pixel shader * linear > table fog with non foggy vertex shader @@ -16729,6 +17127,7 @@ > START_TEST(visual) test_vshader_input(); test_vshader_float16(); > stream_test(); + fog_negative_z_test(); fog_with_shader_test(); > texbem_test(); texdepth_test(); diff --git > a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index > ec50fb8..286b828 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ > b/dlls/ddraw/tests/ddraw7.c @@ -3384,6 +3384,191 @@ static void > test_fog_special(void) DestroyWindow(window); } > > +/* This test tests fog in combination with negative vertex z > coordinates. */ +static void test_fog_negative_z(void) +{ + > enum + { + C_ALPHA_0x00 = 0x00000000, + C_CLEAR > = 0xffff00ff, + C_FOGGED = 0x0000ff00, + > C_HALF_FOGGED = 0x00808000, + C_UNFOGGED = 0x00ff0000 + > }; + + D3DCOLOR color, expected_middle_color; + HRESULT hr; + > ULONG refcount; + BOOL has_table_fog_support; + unsigned int > i, y; + HWND window; + IDirect3DDevice7 *device; + > IDirectDrawSurface7 *rt; + D3DDEVICEDESC7 caps; + + union + > { + float f; + DWORD d; + } start, end; + + > static struct + { + struct vec3 position; + > D3DCOLOR diffuse; + D3DCOLOR specular; + } + quad1[] > = + { + {{-1.0f, 0.0f, -1.0f}, C_UNFOGGED, > C_ALPHA_0x00}, + {{ 1.0f, 0.0f, 1.0f}, C_UNFOGGED, > C_ALPHA_0x00}, + {{-1.0f, -1.0f, -1.0f}, C_UNFOGGED, > C_ALPHA_0x00}, + {{ 1.0f, -1.0f, 1.0f}, C_UNFOGGED, > C_ALPHA_0x00}, + }, + quad2[] = + { + {{-1.0f, > 1.0f, -1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ 0.0f, 1.0f, > 0.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{-1.0f, 0.0f, -1.0f}, > C_UNFOGGED, C_ALPHA_0x00}, + {{ 0.0f, 0.0f, 0.0f}, > C_UNFOGGED, C_ALPHA_0x00}, + }, + quad3[] = + { + > {{ 0.0f, 1.0f, 0.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ > 1.0f, 1.0f, 1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ 0.0f, > 0.0f, 0.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ 1.0f, 0.0f, > 1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + }; + static const struct > test_data_t + { + DWORD vertexmode, tablemode; + > D3DCOLOR color_left, color_middle_top, color_middle_bottom, > color_right; + } + test_data[] = + { + > {D3DFOG_NONE, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, > C_HALF_FOGGED, C_FOGGED}, + {D3DFOG_LINEAR, D3DFOG_LINEAR, > C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, C_FOGGED}, + > {D3DFOG_LINEAR, D3DFOG_NONE, C_FOGGED, C_UNFOGGED, C_FOGGED, > C_FOGGED}, + {D3DFOG_NONE, D3DFOG_NONE, C_FOGGED, > C_FOGGED, C_FOGGED, C_FOGGED}, + }; + /* Affine > projection matrix for z-near = -1, z-far = 1. */ + static > D3DMATRIX proj_mat = + { + 1.0f, 0.0f, 0.0f, 0.0f, + > 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.5f, 0.0f, + > 0.0f, 0.0f, 0.5f, 1.0f + }; + static D3DMATRIX view_mat = + > { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, > 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, > 1.0f + }; + + window = CreateWindowA("static", "ddraw_test", > WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + > if (!(device = create_device(window, DDSCL_NORMAL))) + { + > skip("Failed to create a 3D device, skipping test.\n"); + > DestroyWindow(window); + return; + } + + memset(&caps, > 0, sizeof(caps)); + hr = IDirect3DDevice7_GetCaps(device, > &caps); + ok(SUCCEEDED(hr), "IDirect3DDevice7_GetCaps failed, hr > %#x.\n", hr); + + has_table_fog_support = > caps.dpcTriCaps.dwRasterCaps & D3DPRASTERCAPS_FOGTABLE; + if > (!has_table_fog_support) + skip("No table fog support, > skipping some fog tests.\n"); + + hr = > IDirect3DDevice7_GetRenderTarget(device, &rt); + > ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + > + hr = IDirect3DDevice7_SetRenderState(device, > D3DRENDERSTATE_FOGENABLE, TRUE); + ok(SUCCEEDED(hr), "Failed to > enable fog, hr %#x.\n", hr); + hr = > IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGCOLOR, > C_FOGGED); + ok(SUCCEEDED(hr), "Failed to set fog color, hr > %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, > D3DRENDERSTATE_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to > disable lighting, hr %#x.\n", hr); + hr = > IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZENABLE, > D3DZB_FALSE); + ok(SUCCEEDED(hr), "Failed to disable depth test, > hr %#x.\n", hr); + + /* We are using an affine projection > matrix, so fog start and end are in device space coords. + * > This corresponds to a fog from z=-1 to z=1. */ + start.f = > 0.0f; + end.f = 1.0f; + + hr = > IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGSTART, > start.d); + ok(SUCCEEDED(hr), "Failed to set fog start, hr > %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, > D3DRENDERSTATE_FOGEND, end.d); + ok(SUCCEEDED(hr), "Failed to > set fog end, hr %#x.\n", hr); + + hr = > IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, > &proj_mat); + ok(SUCCEEDED(hr), "Failed to set projection > transform, hr %#x.\n", hr); + hr = > IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_VIEW, > &view_mat); + ok(SUCCEEDED(hr), "Failed to set view transform, > hr %#x.\n", hr); + + for (i = 0; i < > sizeof(test_data)/sizeof(test_data[0]); i++) + { + if > (test_data[i].tablemode != D3DFOG_NONE && !has_table_fog_support) + > continue; + + hr = IDirect3DDevice7_Clear(device, 0, NULL, > D3DCLEAR_TARGET, C_CLEAR, 1.0f, 0); + ok(SUCCEEDED(hr), > "Failed to clear render target, i=%d, hr %#x.\n", i, hr); + + > hr = IDirect3DDevice7_SetRenderState(device, > D3DRENDERSTATE_FOGVERTEXMODE, test_data[i].vertexmode); + > ok(SUCCEEDED(hr), "Failed to set fog vertex mode, i=%d, hr %#x.\n", > i, hr); + hr = IDirect3DDevice7_SetRenderState(device, > D3DRENDERSTATE_FOGTABLEMODE, test_data[i].tablemode); + > ok(SUCCEEDED(hr), "Failed to set fog table mode, i=%d, hr %#x.\n", > i, hr); + + hr = IDirect3DDevice7_BeginScene(device); + > ok(SUCCEEDED(hr), "Failed to begin scene, i=%d, hr %#x.\n", i, > hr); + hr = IDirect3DDevice7_DrawPrimitive(device, > D3DPT_TRIANGLESTRIP, + D3DFVF_XYZ | D3DFVF_DIFFUSE | > D3DFVF_SPECULAR, quad1, 4, 0); + ok(SUCCEEDED(hr), "Failed > to draw, i=%d, hr %#x.\n", i, hr); + hr = > IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, + > D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_SPECULAR, quad2, 4, 0); + > ok(SUCCEEDED(hr), "Failed to draw, i=%d, hr %#x.\n", i, hr); + > hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, + > D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_SPECULAR, quad3, 4, 0); + > ok(SUCCEEDED(hr), "Failed to draw, i=%d, hr %#x.\n", i, hr); + > hr = IDirect3DDevice7_EndScene(device); + ok(SUCCEEDED(hr), > "Failed to end scene, i=%d, hr %#x.\n", i, hr); + + /* Use > 5% tolerance on the colors since there may be a gradient + > * between left and right vertices. */ + for (y = 120; y <= > 360; y += 240) + { + color = > get_surface_color(rt, 2, y); + ok(compare_color(color, > test_data[i].color_left, 13), + "fog fvm%i ftm%i > y=%i: got left color %08x, expected %08x+-5%%.\n", + > test_data[i].vertexmode, test_data[i].tablemode, color, y, + > test_data[i].color_left); + color = > get_surface_color(rt, 320, y); + expected_middle_color > = + (y == 120 ? test_data[i].color_middle_top : > test_data[i].color_middle_bottom); + > ok(compare_color(color, expected_middle_color, 13), + > "fog fvm%i ftm%i y=%i: got middle color %08x, expected > %08x+-5%%.\n", + test_data[i].vertexmode, > test_data[i].tablemode, y, + color, > expected_middle_color); + color = get_surface_color(rt, > 638, y); + ok(compare_color(color, > test_data[i].color_right, 13), + "fog fvm%i > ftm%i y=%i: got right color %08x, expected %08x+-5%%.\n", + > test_data[i].vertexmode, test_data[i].tablemode, y, + > color, test_data[i].color_right); + } + } + + > IDirectDrawSurface7_Release(rt); + refcount = > IDirect3DDevice7_Release(device); + ok(!refcount, "Device has %u > references left.\n", refcount); + DestroyWindow(window); +} + > static void test_lighting_interface_versions(void) { > IDirect3DDevice7 *device; @@ -7671,6 +7856,7 @@ START_TEST(ddraw7) > test_clear_rect_count(); test_coop_level_versions(); > test_fog_special(); + test_fog_negative_z(); > test_lighting_interface_versions(); test_coop_level_activateapp(); > test_texturemanage(); diff --git a/dlls/wined3d/glsl_shader.c > b/dlls/wined3d/glsl_shader.c index 7379ba2..b78e59e 100644 --- > a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ > -4352,7 +4352,7 @@ static GLhandleARB > generate_param_reorder_function(struct wined3d_shader_buffer } else > if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_FOG)) > { - shader_addline(buffer, "gl_FogFragCoord = > clamp(vs_out[%u].%c, 0.0, 1.0);\n", i, reg_mask[1]); + > shader_addline(buffer, "gl_FogFragCoord = vs_out[%u].%c;\n", i, > reg_mask[1]); } } shader_addline(buffer, "}\n"); @@ -5005,7 +5005,7 > @@ static GLhandleARB shader_glsl_generate_ffp_vertex_shader(struct > wined3d_shader_ /* Need to undo the [0.0 - 1.0] -> [-1.0 - 1.0] > transformation from D3D to GL coordinates. */ > shader_addline(buffer, "gl_FogFragCoord = gl_Position.z * 0.5 + > 0.5;\n"); else - shader_addline(buffer, > "gl_FogFragCoord = ec_pos.z;\n"); + > shader_addline(buffer, "gl_FogFragCoord = abs(ec_pos.z);\n"); > break; > > default: > -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUR5+HAAoJEN0/YqbEcdMwkzAP/Rr0nW6/UhcjbrhTWFapJgu1 yofwZuo6jh6hWeqYJQKmI+ltYY+D6zX8yjaAZv8b+JbW5QbNAAUkH8UR1DakrvuY ZxBKxOURffVifx3cC1K6c8Joy2j/0TLKMGBtB5MMNZKpRaROPa+jGo6Yp7B3lyqr V3V0OfOSyduQTSpFdXLTkQzXK0qu4Knk1tGqg3IuuLERMZC8ClYnrTMnwO1nU93J PLXT+AVF0/h6/pHOyyXJm63w5+j8ZQGScqEVaqaT+Js3Yl2KKc+IgiOCo81VdCF+ AcTh2ReRSxQLIp+5qcGw36/dw/+RSq+Hld54OsnDZlgpLd1nYs3Bs6DBae7aaQZ8 QUEzc74DThOssKcOmObfuplzAEcg1VP7Asb7aHxWAzRUrnpLJS5L+NAJYtzzOld3 1dLTjXoQO+B+RCwh5Ea5gbSLbhX8h5U2amA6IEract8rKU5EMWlGmJ7l2TX+3HY9 5hiBMXSEeARTfkwXTqhf+NTpL4A0kXudd25/9RgubfOJusZT5vWKMJryMbW/H5Ah TKpYDiFYC7bBGaTlsxHb1CWoOweFIRm1ord4vob7IB3KBE9VCvm2j+3ZxHmm2dld J4WyhbrErJq86Qxa6tToh9ELZlg4UkJxvUOxjdD7ra4qo2isd9ABkbxhxoHgcvY2 PqVs5A384cEgYrNgBe55 =hu36 -----END PGP SIGNATURE-----

2 5

Re: [PATCH 2/5] dwrite: Block attempts of registering local file loader
by Marvin Oct. 27, 2014

Oct. 27, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9762 Your paranoid android. === wvistau64 (32 bit font) === font.c:949: Test failed: got 0x88985006 font.c:953: Test failed: got 0x80070057 === w2008s64 (32 bit font) === font.c:949: Test failed: got 0x88985006 font.c:953: Test failed: got 0x80070057 === wvistau64 (64 bit font) === font.c:949: Test failed: got 0x88985006 font.c:953: Test failed: got 0x80070057 === w2008s64 (64 bit font) === font.c:949: Test failed: got 0x88985006 font.c:953: Test failed: got 0x80070057

1 0

Re: comctl32: Use strcmpW instead of pointer comparison to ensure treeview updates correctly (try 2)
by Nikolay Sivov Oct. 26, 2014

Oct. 26, 2014

On 10/26/2014 21:02, Dan Bassi wrote: This should be a normal message sequence test, we have everything in place for that. And you're not testing text callback case.

1 0

Re: [1/2] server: Store the time of the socket connection (resend)
by Alexandre Julliard Oct. 26, 2014

Oct. 26, 2014

Bruno Jesus <00cpxxx(a)gmail.com> writes: > diff --git a/server/protocol.def b/server/protocol.def > index fec5e75..1e83862 100644 > --- a/server/protocol.def > +++ b/server/protocol.def > @@ -1250,6 +1250,7 @@ enum server_fd_type > int family; /* family, see socket manpage */ > int type; /* type, see socket manpage */ > int protocol; /* protocol, see socket manpage */ > + unsigned int connect_time; /* time the socket was connected (tick count) */ There doesn't seem to be any reason to return a tick count (as opposed to a normal server timestamp). -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: urlmon/tests: Clarify ok() condition
by Marvin Oct. 25, 2014

Oct. 25, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9754 Your paranoid android. === w2008s64 (64 bit url) === url.c:1681: Test failed: unexpected call OnProgress_CONNECTING

1 0

Re: [PATCH] vbscript: Implemented String(try 2)
by Marvin Oct. 25, 2014

Oct. 25, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9751 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH v4 2/8] reg.exe: Add path_get_key() to remove boilerplate
by Stefan Dösinger Oct. 24, 2014

Oct. 24, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 I think this patch has the potential to improve code readability if improved a bit. Am 2014-10-09 10:55, schrieb Jonathan Vollebregt: > +#define MAX_ROOT_KEY_NAME_LENGTH 20 > +#define NUM_ROOT_KEYS 5 > + > +static const WCHAR short_HKEY_name[NUM_ROOT_KEYS][5] = { > ... > +}; > + > +static const WCHAR long_HKEY_name[NUM_ROOT_KEYS][MAX_ROOT_KEY_NAME_LENGTH] = { > ... > +}; > + > +static const HKEY HKEYs[NUM_ROOT_KEYS] = { > ... > +}; Why not use one table instead of 3 separate arrays with magically matching indices? Something like static const struct { HKEY key; const WCHAR *long_name; const WCHAR *short_name; } keys[] = { {HKEY_LOCAL_MACHINE, {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E',0}, {'H','K','L','M',0}}, ... }; static HKEY path_get_rootkey(const WCHAR *path) { unsigned int i; for (i = 0; i < sizeof(keys) / sizeof(*keys); i++) { if (!strcmpi(keys[i].short_name, name) || !strcmpi(keys[i].long_name, name)) return keys[i].key; } return NULL; } > + if (strncmpiW(path, short_HKEY_name[i], strlenW(short_HKEY_name[i])) == 0 || > + strncmpiW(path, long_HKEY_name[i], strlenW(long_HKEY_name[i])) == 0) I don't think strncmpi(x, y, strlen(y)) has any advantage over strcmpi(x, y). strlen just counts the number of characters to the first 0 byte, where strcmpi would stop anyway. Are you sure there is not some other behavior of CompareStringW that str(n)cmpi does not have? I have not found any, but I am not sure about the CP_ACP part. The original code probably has a bug if the user passes a string like HKEY_LOCAL_MACHINE_GARBAGE. It's worth writing a test for this. > +static HKEY path_get_rootkey(const WCHAR *path) > +{ > + if (path_get_rootkey_name(path)) > + return HKEYs[(path_get_rootkey_name(path) - long_HKEY_name[0]) / MAX_ROOT_KEY_NAME_LENGTH]; This searches the array twice. > + path = strchrW(path, '\\'); > + if (!path) > + return k; I expect that this causes trouble with RegCloseKey. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUOoj8AAoJEN0/YqbEcdMwBI8P/1CgdHX0yt2Z6iZqn61fA1wt M89EKguHgXoQmorrtpMYtZJNoMd6f0kIv4yH+corcZwz01iGAuu4Zq7v3grD3SIz uv6S+QNiysw8wT5tTSFVu+DiGuxQXreb1BryjMXgmoOLbmPLPbcYX+yEj1DaiRqg gh1hXYpVoqCjKGed8Wukk+Cq481azQz41e2vUqd2pP8mux0BToWaBU8H9HufTxYg RyHYaKksstGhQLINm2FOAtq2S8eZN5TRdELcTEuQoDiE6c6YNIepLLJ5f6MiH4lt 6Biq2CUeIOhkqEWjWGzGmfom2rBq1lcSWuLnV9N7coRKdCOC+wWpeEvUBjvFTqMW JcbdZxusE3Rp80scp7YFnUBVXfOlQr4IofKkNeJkVUjoAIGOuSAcr6pHnO8KTpMI K/9nkFb/cOF8IQi6Gc3PxJxXYBBQFw578aeNpUk6QEmimXcyBvmCe/K2Oki1Qa7x CoU7MIMvtE1oSL2kN5o4yzJ+YrIZ4CGfg8yhvl9M54tWHvLMLe+Bw+5pMefwgDXP QIYCdKKIWf+hsTOJCYHLgD5wU8euvTvcgmBklI5cGivwLQqrLfZMucmnsG4jmXH4 pLdZwJsC1XXRRej13YofPzfRSZbK3pcjGwpiq7sxJTrWH05pTm+kBOGId1ChelcS jW7y6q/ecery5/13atxt =PXew -----END PGP SIGNATURE-----

4 9

Re: [PATCH 3/5] ddraw/tests: RestoreDisplayMode uses the registry mode.
by Marvin Oct. 24, 2014

Oct. 24, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9733 Your paranoid android. === w8 (32 bit ddraw1) === ddraw1.c:1318: Test failed: Expected color 0x00ff0000 for test 0, got 0x0000ff00. ddraw1.c:1340: Test failed: Expected color 0x000000ff for test 0, got 0x0000ff00.

1 0

Re: [PATCH 2/5] d3d8/tests: The device restores the mode settings from the registry.
by Marvin Oct. 24, 2014

Oct. 24, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9732 Your paranoid android. === w8 (32 bit device) === device.c:2437: Test failed: Expected foreground window 000301BA, got 0002004C. device.c:3098: Test failed: Expected {0, 0, 640, 480}, got {0, 0, 800, 600}. device.c:3121: Test failed: Got unexpect width 640, expected 1024. device.c:3123: Test failed: Got unexpect height 480, expected 768. device.c:3209: Test failed: Expected wndproc 0x412ba0, got 0x412ba0.

1 0