wine-devel October 2014

wine-devel@winehq.org

52 participants
183 discussions

Re: wined3d: Correctly display fog for right-handed projection matrix (try 5)
by Stefan Dösinger 07 Oct '14

07 Oct '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Am 2014-10-04 00:24, schrieb Joachim Priesner: > + static const D3DMATRIX proj_mat_rh = > + {{{ > + 0.828732f, 0.0f, 0.0f, 0.0f, > + 0.0f, 1.104976f, 0.0f, 0.0f, > + 0.0f, 0.0f, -1.0001f, -1.0f, > + 0.0f, 0.0f, -0.010001f, 0.0f > + }}}; > ... > + static const D3DMATRIX view_mat_rh = > + {{{ > + 1.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 1.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, -0.1f, 0.0f, > + 0.0f, 0.0f, 0.0f, 1.0f > + }}}; I'm sorry that this reply is a bit late, but I've been wondering if you need the complicated projection matrix to show the abs() in the vertex pipeline. If I understand it correctly, a view and projection matrix like this should do the job as well with the same input coordinates: 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, -1.0f, 0.0f, 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, -0.1f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f }}}; The test results with these matrices are identical, and the test correctly detects the defect in Wine. The test is much easier to follow. Am I missing something? As an added bonus you could replace the 10.0f in the input vertices with 1.0 and the -0.1f in the view matrix with -1.0f. Some other suggestions: > +/* Some color constants to make tests easier to read. */ > +#define COLOR_FOG 0xff00ff00 > +#define COLOR_FOGGED 0x0000ff00 > +#define COLOR_UNFOGGED 0x00ff0000 > +#define COLOR_CLEAR 0xffff00ff IMHO it would be nicer to either use an enum in the scope of fog_righthanded_test (preferred) or #undef them after the function. > + static struct > + { > + struct vec3 position; > + DWORD diffuse; > + } > + quad[] = > + { > + {{-1.0f, -1.0f, 10.0f}, COLOR_UNFOGGED}, > + {{-1.0f, 1.0f, 10.0f}, COLOR_UNFOGGED}, > + {{ 1.0f, -1.0f, 10.0f}, COLOR_UNFOGGED}, > + {{ 1.0f, 1.0f, 10.0f}, COLOR_UNFOGGED}, > + }; Always drawing a gradient would be better. That avoids other fog setup problems that lead to either always fogged or never fogged quads. Also, this can be static const in d3d8 and d3d9. > + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, COLOR_CLEAR, 1.0f, 0); > + ok(SUCCEEDED(hr), "IDirect3DDevice9_Clear failed (%08x)\n", hr); Do you need the Z buffer? Just disable the depth test, no need to clear it. > + /* 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 */ > ... > + 0x0000ffff, /* END */ > + }; > + > + /* Basic pixel shader */ Two indentation issues here. The comment needs one extra space, the closing bracket has one too many. I suspect your editor screwed this up when you copied the code from d3d9 to d3d8. > + if (caps.PixelShaderVersion >= D3DPS_VERSION(2, 0)) > + { > + hr = IDirect3DDevice9_CreateVertexShader(device, vertex_shader_code3, &vertex_shader[3]); > + ok(SUCCEEDED(hr), "CreateVertexShader failed (%08x)\n", hr); > + hr = IDirect3DDevice9_CreatePixelShader(device, pixel_shader_code2, &pixel_shader[2]); > + ok(SUCCEEDED(hr), "CreatePixelShader failed (%08x)\n", hr); > + } else { > + skip("No shader model 2 support, skipping some fog tests.\n"); > + } Curly bracket placement. This applies to a few other places. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUNGWtAAoJEN0/YqbEcdMw/+YQAIQxmRjeNMne0+f9AuCwtNVJ /MrhsXPnCFDWbYE6BTXM8/2CvlM5DzhCya2AQg8UFW4qMXQJmijTorCjDF0e7Vc7 RvuP4xJXsqhKDhyoYfSzcX8WYkJZcVow0tQIz++qKfjMbgqnGwoWocYdNgyymy9v pU6Q/shM1qv2PUkDNuMAJI7Tv09R5muYEyi9sfRa+grFGQwDJGQpgOXwP5oR2DWM wjlTIO7wMkXY0XGE5DInxE+slaF2gECrKrHRM+1HNicNq5hGOwYwdm/JcBA9qxGQ uv+w0WMKR0n4FPtJBHXcm3/qshUyBvzSsMSEilfBwOzrrclOx9ctNEuogqufEpF9 6yGuX0PEp+W9g9rN6rCMMBjYmGJdal2bY2F1KQ+iLAYHhMsahy+fibIGEwE7Yugg +ffx3RONm335mpZqQh5NrtHAwf3iLEEA7PQQawW5UKCoKANpV03KyZBFJLZ1lOC4 cEQLQQNo7p/M0211bm4dTN8SSYvucloDSuzwe+PqCNvyL8xJyJCiHMHuVX2cFdgt 7qPA13LdKze/7S4Jk1JjL31tTEdMCGZJSekkTEAJ7C/c01L3DiDVywn9VNVXdPsR 8oW8pfZI0t1g2/Miq08mP1T+IWTftYOQaHyiYrQ73hu8PtDgY3C92JHwV4SmvPUI UxItWlY/H/8FLJG5v5dt =dUDt -----END PGP SIGNATURE-----

1 0

Re: server: KeyNameInformation returns the full name of the key. (try 2)
by Alexandre Julliard 07 Oct '14

07 Oct '14

Akihiro Sagawa <sagawa.aki(a)gmail.com> writes: > Try 2: > - Use `for' loops instead of `while' loops in get_key_full_name function. > - Introduce full_name variable to avoid tricky free() condition check at > end of enum_key function. You should be able to do this without allocating memory. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 3/3] d3d8/tests: Introduce a create_device_pp function for custom present parameters.
by Marvin 07 Oct '14

07 Oct '14

1 0

Re: ntdll: Introduce new function wine_server_set_reply_user for user provided pointers.
by Alexandre Julliard 07 Oct '14

07 Oct '14

Sebastian Lackner <sebastian(a)fds-team.de> writes: > This patch is an alternative strategy for fixing the issue described > in http://source.winehq.org/patches/data/106864. Please note that the > patches 2-4 from the previous series are still valid, and can be > applied independently. > > Although Andre_H and ehoover told me that this solution will not be > accepted, I'll give it a try, because its the cleanest approach I can > think of. > > There is a huge amount of wineserver calls that use > wine_server_set_reply incorrectly, and manually adding code to all > these functions seems very complicated. In ntdll we have to use > virtual_check_buffer_for_write, everywhere else we have to use > IsBadWritePtr. And even if we have added that, it could still break > things: When we add the check at the top of each affected function, > and return some general error codes, it could break apps which expect > a page fault exception in some other code branch. There are few places that need this, and even fewer where it's an actual problem in practice. In fact it wouldn't be a problem at all except for your writecopy hack, which is in itself a questionable change. You'll need more convincing arguments for this series. -- Alexandre Julliard julliard(a)winehq.org

1 0

wine crashed on exiting inside gdiplus.
by Hin-Tak Leung 06 Oct '14

06 Oct '14

It is probably not important, just in case it is something easily fixable, I just got a crash on exit inside gdiplus. $ git describe wine-1.7.28 the backtrace is: Backtrace: =>0 0x7dcfed37 ipicture_pixel_width+0x7(pic=0xfeeefeee) [/home/Nobak-Hin-Tak/tmp-git/wine/dlls/gdiplus/../../include/ocidl.h:1221] in gdiplus (0x00e7e428) 1 0x7dd0b61b GdipGetImageBounds+0x15a(image=0x4eb5d40, srcRect=0xe7e548, srcUnit=0xe7e4c4) [/home/Nobak-Hin-Tak/tmp-git/wine/dlls/gdiplus/image.c:2182] in gdiplus (0x00e7e488) 2 0x7dce6f9e get_graphics_bounds+0x17d(graphics=<is not available>, rect=<is not available>) [/home/Nobak-Hin-Tak/tmp-git/wine/dlls/gdiplus/graphics.c:1999] in gdiplus (0x00e7e508) 3 0x7dcf2065 GdipGetDC+0xe4(graphics=<is not available>, hdc=<is not available>) [/home/Nobak-Hin-Tak/tmp-git/wine/dlls/gdiplus/graphics.c:5719] in gdiplus (0x00e7e598) 4 0x00bad6c0 (0x00e7e5e8) 5 0x00bad65c (0x00e7e608) ... ... 0x7dcfed37 ipicture_pixel_width+0x7 [/home/Nobak-Hin-Tak/tmp-git/wine/dlls/gdiplus/../../include/ocidl.h:1221] in gdiplus: movl 0x0(%eax),%edx 1221 return This->lpVtbl->get_Width(This,pWidth);

1 0

Re: po: Update German translation.
by Joachim Priesner 06 Oct '14

06 Oct '14

> #: jscript.rc:40 > > -#, fuzzy > -#| msgid "Subject Key Identifier" > > msgid "Expected identifier" > > -msgstr "SchlÃ¼sselkennung des Antragstellers" > +msgstr "Erwarteter Bezeichner" This should probably read "Bezeichner erwartet". Best Joachim

1 0

Re: [PATCH 7/7] user32/tests: Test WM_SYSCOMMAND(SC_MINIMIZE) on an unminimizable window.
by Marvin 06 Oct '14

06 Oct '14

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=9283 Your paranoid android. === wvistau64 (32 bit msg) === msg.c:4466: Test failed: SendMessage( WM_SYSCOMMAND, SC_MINIMIZE ):popup, unminimizable: 6: the msg 0x0046 was expected, but got msg 0x0088 instead msg.c:4466: Test failed: SendMessage( WM_SYSCOMMAND, SC_MINIMIZE ):popup, unminimizable: 7: the msg 0x0083 was expected, but got msg 0x0046 instead msg.c:4466: Test failed: SendMessage( WM_SYSCOMMAND, SC_MINIMIZE ):popup, unminimizable: 10: the msg 0x0047 was expected, but got msg 0x0083 instead msg.c:4466: Test failed: SendMessage( WM_SYSCOMMAND, SC_MINIMIZE ):popup, unminimizable: 11: the msg 0x0003 was expected, but got msg 0x0085 instead msg.c:4466: Test failed: SendMessage( WM_SYSCOMMAND, SC_MINIMIZE ):popup, unminimizable: 12: the msg 0x0005 was expected, but got msg 0x000d instead msg.c:4466: Test failed: SendMessage( WM_SYSCOMMAND, SC_MINIMIZE ):popup, unminimizable: 14: the msg sequence is not complete: expected 0000 - actual 0047 === w7u (32 bit msg) === msg.c:12187: Test failed: unexpected hwnd 00080150 msg.c:12209: Test failed: bad time 30ba3/30bb3

2 1

Re: [1/4] ntdll: Trigger write watches before passing userdata pointer to wait_reply.
by Alexandre Julliard 06 Oct '14

06 Oct '14

Sebastian Lackner <sebastian(a)fds-team.de> writes: > The reply_data field sometimes points directly to user-provided > memory. That's not supposed to happen. Callers that do that should be fixed. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/7] wined3d: Restore the display mode on focus loss (v2).
by Henri Verbeet 06 Oct '14

06 Oct '14

On 6 October 2014 13:42, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > +static BOOL wined3d_swapchain_mode_changed(const struct wined3d_swapchain *swapchain) > +{ > + return swapchain->desc.backbuffer_width != swapchain->original_mode.width > + || swapchain->desc.backbuffer_height != swapchain->original_mode.height > + || swapchain->desc.backbuffer_format != swapchain->original_mode.format_id > + || swapchain->desc.refresh_rate != swapchain->original_mode.refresh_rate; > +} > + > void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) > { > if (!activate) > + { > + if (wined3d_swapchain_mode_changed(swapchain)) > + { > + if (FAILED(wined3d_set_adapter_display_mode(swapchain->device->wined3d, > + swapchain->device->adapter->ordinal, &swapchain->original_mode))) > + ERR("Failed to set display mode.\n"); > + > + swapchain->reapply_mode = TRUE; This seems to imply that if an application created a fullscreen swapchain at the current display resolution, but then some external mode change happened, we should keep the mode from the external mode change on focus loss, but then change it on reset. That may be correct, but it's certainly more complicated than just resetting the original mode on focus loss, and I don't see tests. As a follow up, it would perhaps also be interesting to verify that in some of the places where we're currently using "original_mode", we really shouldn't be using EnumDisplaySettings() with ENUM_REGISTRY_SETTINGS instead.

2 2

Re: [PATCH 6/7] user32/tests: Test minimizing an unminimizable window. (v2)
by Marvin 06 Oct '14

06 Oct '14

1 0

← Newer
1
...
12
13
14
15
16
17
18
19
Older →

Jump to page:

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 October 2014