March 2016 - Wine-devel - list.winehq.org

Re: [3/5] imm32: Create default IME window when creating a new window.
by Aric Stewart 03 Mar '16

03 Mar '16

Ok I have been chatting with Alexandre and also dusting off my own memories here. The problem with hooks is that they create serious performance issues. Alexandre will likely not accept any patch that involves hooks. What is likely a better approach is to move some of this code into user32. I know that on windows there is very close integration between imm32 and user32, beyond what we have in wine. I am thinking maybe we need the default IME window creation in user32 and have it stored somewhere, like in the TEB, where it can be in existing thread data. I was brainstorming with Alexandre so that I could give you some guidance, and he said that the user_thread_info block (user32/user_private.h stored in the TEB->Win32ClientInfo) would be acceptable, but the user_thread_info is private to user32, so there would have to be a way to get that to that data so that ImmGetDefaultIMEWnd can find that window. I dont have the answers for that yet, but it is a starting point to try to figure this out. I know when I implemented the IMMThreadData stuff in imm32 it was all mostly thing I felt like really belonged in the TEB, but I was not in a place where I needed to really advocated for that change. There are other Reserved blocks in the TEB that you could argue imm32 could take over if you feel that to be better than the user_thread_info structure. Unfortunately it sounds like hooks will not be acceptable for us. -aric On 3/2/16 7:54 AM, Akihiro Sagawa wrote: > Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> > --- > dlls/imm32/imm.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++- > dlls/imm32/tests/imm32.c | 4 ++-- > 2 files changed, 57 insertions(+), 3 deletions(-) > > > >

1 0

Re: [4/5] imm32: Move default IME window creation to WM_NCCREATE hook.
by Aric Stewart 03 Mar '16

03 Mar '16

Hooks are only installed if GetSystemMetrics(SM_DBCSENABLED) and GetSystemMetrics(SM_IMMENABLED) are both true. Your earlier patch which implement SM_IMEENABLED turns it on if GetVersion() & 0xff >= 6 or if the version is == 5 SM_DBCSENABLED, what window versions. So Any prefix with a version of lower than XP would no longer have default IME windows? For Windows XP and higher then we need SM_DBCSENABLED to be true. SM_DBCSENABLED results in the codepage having a MaxCharSize as > 1, which looks like it pretty much always true, especially for UTF8, but under which situations would that not be the case, and again we would be disabling the default IME window? I like what you are doing here, I just want to understand what situations we would be disabling ime input. -aric On 3/2/16 7:54 AM, Akihiro Sagawa wrote: > > In other words, we no longer create it in ImmGetDefaultIMEWnd(). > > Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> > --- > dlls/imm32/imm.c | 59 ++++++++++++++++++++++++++++++++++---------------------- > 1 file changed, 36 insertions(+), 23 deletions(-) > > > >

2 1

Re: [1/5] imm32/tests: Add tests for life cycle of default IME window.
by Aric Stewart 03 Mar '16

03 Mar '16

I worry about the 64-bit errors and even if they are false alarms we will want to be able to at least prevent/silence them. Otherwise looks good! -aric On 3/2/16 7:53 AM, Akihiro Sagawa wrote: > Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> > --- > dlls/imm32/tests/imm32.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 51 insertions(+) > > > >

2 1

Re: libport: Mark internal functions and data tables as hidden.
by Francois Gouget 03 Mar '16

03 Mar '16

commit 34174e2ca8cb61150d3d880400d8231a39d38307 Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 13:36:41 2016 +0900 libport: Mark internal functions and data tables as hidden. This patch breaks the compilation on Solaris 11.11: ld: fatal: relocation error: R_386_GOTOFF: file ../../libs/port/libwine_port.a(fold.o): symbol wine_digitmap: a GOT relative relocation must reference a local symbol ld: fatal: relocation error: R_386_GOTOFF: file ../../libs/port/libwine_port.a(fold.o): symbol wine_compatmap: a GOT relative relocation must reference a local symbol Removing the DECLSPEC_HIDDEN on wine_digitmap(), wine_compatmap() but also wine_compose() and wine_decompose() fixes this. As far as I can tell the linker considers that hidden symbols are not visible outside the static library. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ A black hole is just God dividing by zero.

2 7

Re: [PATCH] manpages: markup fixes
by Michael Stefaniuc 03 Mar '16

03 Mar '16

On 03/02/2016 02:03 PM, Eric S. Raymond wrote: > Marcus Meissner <marcus(a)jet.franken.de>: >> Supplied by Eric S. Raymond. >> >> (Did not send a specific signed-off-by, but his email and his follow up email >> seems to imply it.) > > That is correct. > > Thanks, I have marked thesse patches "promised" in my database. The patches were committed: https://source.winehq.org/git/wine.git/commitdiff/0d06ebf5fb515e19cd9ec951d… Thank you for your contribution to Wine! bye michael

2 1

Re: shell32/tests: Use SetRectEmpty() instead of open coding it.
by Marvin 03 Mar '16

03 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21142 Your paranoid android. === w1064 (32 bit ebrowser) === ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {2e228ba3-ea25-4378-97b6-d574faeba356}, riid: {2e228ba3-ea25-4378-97b6-d574faeba356} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {42f85136-db7e-439c-85f1-e4075d135fc8} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {42f85136-db7e-439c-85f1-e4075d135fc8} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {42f85136-db7e-439c-85f1-e4075d135fc8} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} === w1064 (64 bit ebrowser) === ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {2e228ba3-ea25-4378-97b6-d574faeba356}, riid: {2e228ba3-ea25-4378-97b6-d574faeba356} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {42f85136-db7e-439c-85f1-e4075d135fc8} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {42f85136-db7e-439c-85f1-e4075d135fc8} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d}, riid: {c13b3d3a-10d6-43f5-98db-b7ddd987b33d} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {42f85136-db7e-439c-85f1-e4075d135fc8} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832} ebrowser.c:524: Test failed: unknown service, serviceID: {d56a2092-7dbf-4144-a110-c2963a709832}, riid: {d56a2092-7dbf-4144-a110-c2963a709832}

2 1

Re: ddraw: Use SetRectEmpty() instead of open coding it.
by Marvin 03 Mar '16

03 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21137 Your paranoid android. === w864 (32 bit d3d) === d3d.c:2326: Test failed: Unexpected destination texture level pixels; 2031 differences at 0 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 518 differences at 1 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 138 differences at 2 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 46 differences at 3 level d3d.c:2510: Test failed: Unexpected destination texture level pixels; 257 differences d3d.c:2657: Test failed: Unexpected destination texture level pixels; 256 differences at 2 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 64 differences at 3 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 16 differences at 4 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 4 differences at 5 level === w1064 (32 bit d3d) === d3d.c:2326: Test failed: Unexpected destination texture level pixels; 2031 differences at 0 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 518 differences at 1 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 138 differences at 2 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 46 differences at 3 level d3d.c:2510: Test failed: Unexpected destination texture level pixels; 257 differences d3d.c:2657: Test failed: Unexpected destination texture level pixels; 256 differences at 2 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 64 differences at 3 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 16 differences at 4 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 4 differences at 5 level

2 1

Re: [resend] shell32: fix two bugs in IQueryAssocations
by Marvin 03 Mar '16

03 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21124 Your paranoid android. === wxppro (32 bit assoc) === assoc.c:123: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:176: Test failed: assoc.c:123: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:180: Test failed: assoc.c:123: Test failed: GetString returned 0x80070002, expected 0x80070483 assoc.c:185: Test failed: assoc.c:123: Test failed: GetString returned 0x80070002, expected 0x80070483 assoc.c:186: Test failed: assoc.c:123: Test failed: GetString returned 0x80070002, expected 0x80070483 assoc.c:187: Test failed: === w2003std (32 bit assoc) === assoc.c:123: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:176: Test failed: assoc.c:123: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:180: Test failed: assoc.c:123: Test failed: GetString returned 0x80070002, expected 0x80070483 assoc.c:185: Test failed: assoc.c:123: Test failed: GetString returned 0x80070002, expected 0x80070483 assoc.c:186: Test failed: assoc.c:123: Test failed: GetString returned 0x80070002, expected 0x80070483 assoc.c:187: Test failed:

1 0

Re: [v2 1/6] d3dx9: add test for basic effect state management.
by Matteo Bruni 02 Mar '16

02 Mar '16

2016-03-01 18:09 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/tests/effect.c | 260 +++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 260 insertions(+) > I think these patches are on the right path in general. There are a number of small issues though. You have a few trailing whitespaces in your patches, make sure to get rid of them. > diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c > index 1b895da..6dd3e00 100644 > --- a/dlls/d3dx9_36/tests/effect.c > +++ b/dlls/d3dx9_36/tests/effect.c > @@ -2692,6 +2692,265 @@ static void test_effect_compilation_errors(IDirect3DDevice9 *device) > effect->lpVtbl->Release(effect); > } > > +/* fxc.exe /T fx_2_0 Better if you put the effect source in a #if 0 block, as it is done elsewhere, instead of inside a comment. > +vertexshader vs_arr1[2] = > +{ > + asm > + { > + vs_1_1 > + def c0, 1, 1, 1, 1 > + mov oPos, c0 > + }, > + asm > + { > + vs_2_0 > + def c0, 2, 2, 2, 2 > + mov oPos, c0 > + } > +}; > + > +sampler sampler1 = > + sampler_state > + { > + MipFilter = LINEAR; > + }; > + > +float4x4 camera : VIEW = {4.0,0.0,0.0,0.0, 0.0,0.0,0.0,0.0, 0.0,0.0,0.0,0.0, 0.0,0.0,0.0,6.0}; > +technique tech0 > +{ > + pass p0 > + { > + vertexshader = vs_arr1[1]; > + VertexShaderConstant1[3] = {2,2,2,2}; > + BlendOp = 2; > + AlphaOp[3] = 4; > + ZEnable = true; > + WorldTransform[1]={2.0,0.0,0.0,0.0, 0.0,0.0,0.0,0.0, 0.0,0.0,0.0,0.0, 0.0,0.0,0.0,4.0}; > + ViewTransform=(camera); > + LightEnable[2] = TRUE; > + LightType[2] = POINT; > + LightPosition[2] = {4.0f, 5.0f, 6.0f}; > + Sampler[1] = sampler1; > + } > +} */ > + > +static const DWORD test_effect_states_effect_blob[] = > +{ > +0xfeff0901, 0x000002e8, 0x00000000, 0x00000010, 0x00000004, 0x00000020, 0x00000000, 0x00000002, > +0x00000001, 0x00000002, 0x00000008, 0x615f7376, 0x00317272, 0x0000000a, 0x00000004, 0x00000074, > +0x00000000, 0x00000000, 0x00000002, 0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, > +0x00000001, 0x00000001, 0x00000001, 0x000000ab, 0x00000100, 0x00000044, 0x00000040, 0x00000009, > +0x706d6173, 0x3172656c, 0x00000000, 0x00000003, 0x00000002, 0x000000e0, 0x000000ec, 0x00000000, > +0x00000004, 0x00000004, 0x40800000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > +0x00000000, 0x40c00000, 0x00000007, 0x656d6163, 0x00006172, 0x00000005, 0x57454956, 0x00000000, > +0x00000003, 0x00000010, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x40000000, 0x40000000, > +0x40000000, 0x40000000, 0x00000003, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000004, > +0x00000001, 0x00000002, 0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, > +0x00000001, 0x00000004, 0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, > +0x00000001, 0x00000001, 0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, > +0x00000001, 0x40000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > +0x40800000, 0x00000003, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000001, > +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > +0x00000003, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000004, 0x00000001, > +0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000001, > +0x00000002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x40800000, > +0x40a00000, 0x40c00000, 0x00000003, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000003, > +0x00000001, 0x00000000, 0x0000000a, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000003, > +0x00003070, 0x00000006, 0x68636574, 0x00000030, 0x00000003, 0x00000001, 0x00000005, 0x00000004, > +0x00000004, 0x00000018, 0x00000000, 0x00000000, 0x0000002c, 0x00000060, 0x00000000, 0x00000000, > +0x00000084, 0x000000a0, 0x00000000, 0x00000000, 0x000002dc, 0x00000000, 0x00000001, 0x000002d4, > +0x00000000, 0x0000000b, 0x00000092, 0x00000000, 0x000000fc, 0x000000f8, 0x00000098, 0x00000003, > +0x00000120, 0x00000110, 0x0000004b, 0x00000000, 0x00000140, 0x0000013c, 0x0000006b, 0x00000003, > +0x00000160, 0x0000015c, 0x00000000, 0x00000000, 0x00000180, 0x0000017c, 0x0000007d, 0x00000001, > +0x000001dc, 0x0000019c, 0x0000007c, 0x00000000, 0x00000238, 0x000001f8, 0x00000091, 0x00000002, > +0x00000258, 0x00000254, 0x00000084, 0x00000002, 0x00000278, 0x00000274, 0x00000088, 0x00000002, > +0x000002a0, 0x00000294, 0x000000b2, 0x00000001, 0x000002c0, 0x000002bc, 0x00000002, 0x00000003, > +0x00000001, 0x0000002c, 0xfffe0101, 0x00000051, 0xa00f0000, 0x3f800000, 0x3f800000, 0x3f800000, > +0x3f800000, 0x00000001, 0xc00f0000, 0xa0e40000, 0x0000ffff, 0x00000002, 0x0000002c, 0xfffe0200, > +0x05000051, 0xa00f0000, 0x40000000, 0x40000000, 0x40000000, 0x40000000, 0x02000001, 0xc00f0000, > +0xa0e40000, 0x0000ffff, 0x00000000, 0x00000000, 0xffffffff, 0x0000000a, 0x00000001, 0x00000009, > +0x706d6173, 0x3172656c, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0x00000006, 0x00000000, > +0x0000016c, 0x46580200, 0x0030fffe, 0x42415443, 0x0000001c, 0x0000008b, 0x46580200, 0x00000001, > +0x0000001c, 0x20000100, 0x00000088, 0x00000030, 0x00000002, 0x00000004, 0x00000038, 0x00000048, > +0x656d6163, 0xab006172, 0x00030003, 0x00040004, 0x00000001, 0x00000000, 0x40800000, 0x00000000, > +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x40c00000, 0x4d007874, 0x6f726369, > +0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, 0x2e392072, > +0x392e3932, 0x332e3235, 0x00313131, 0x0002fffe, 0x54494c43, 0x00000000, 0x0024fffe, 0x434c5846, > +0x00000004, 0x10000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000004, > +0x00000000, 0x10000004, 0x00000001, 0x00000000, 0x00000002, 0x00000004, 0x00000000, 0x00000004, > +0x00000004, 0x10000004, 0x00000001, 0x00000000, 0x00000002, 0x00000008, 0x00000000, 0x00000004, > +0x00000008, 0x10000004, 0x00000001, 0x00000000, 0x00000002, 0x0000000c, 0x00000000, 0x00000004, > +0x0000000c, 0xf0f0f0f0, 0x0f0f0f0f, 0x0000ffff, 0x00000000, 0x00000000, 0xffffffff, 0x00000000, > +0x00000001, 0x0000000b, 0x615f7376, 0x5b317272, 0x00005d31, > +}; Can you please indent the effect blob data? > + > +static DWORD test_effect_states_vshader_buf[sizeof(test_effect_states_effect_blob) / sizeof(DWORD)]; It seems better to dynamically allocate the buffer instead. Something like: - call GetFunction() with a NULL data pointer to get the size - HeapAlloc() the buffer with the received size - call GetFunction() again, passing it the allocated buffer - do your checks - HeapFree() the buffer > + > +static void test_effect_states(IDirect3DDevice9 *device) > +{ > + D3DMATRIX test_mat = > + {{{ > + -1.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.0f, 0.0f > + }}}; > + D3DMATRIX test_mat_camera = > + {{{ > + 4.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.0f, 6.0f > + }}}; > + D3DMATRIX test_mat_world1 = > + {{{ > + 2.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 0.0f, 4.0f > + }}}; > + D3DMATRIX mat; > + HRESULT hr; > + ID3DXEffect *effect; > + UINT npasses; > + DWORD value; > + IDirect3DVertexShader9 *vshader; > + UINT byte_code_size; > + BOOL bval; > + D3DLIGHT9 light; > + float float_data[4]; > + > + hr = D3DXCreateEffect(device, test_effect_states_effect_blob, sizeof(test_effect_states_effect_blob), > + NULL, NULL, 0, NULL, &effect, NULL); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + > + /* 1. State affected in passes saved/restored even if no pass > + was performed. States not present in passes are not saved & > + restored */ That type of "n." notation isn't found elsewhere and I don't think it's particularly useful here either. > + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_BLENDOP, 1); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ALPHAFUNC, 1); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + > + hr = effect->lpVtbl->Begin(effect, &npasses, 0); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + ok(npasses == 1, "Expected 1 pass, got %u\n", npasses); > + > + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_BLENDOP, 3); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ALPHAFUNC, 2); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + > + hr = effect->lpVtbl->End(effect); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + > + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_BLENDOP, &value); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + todo_wine ok(value == 1, "Got result %u, expected %u.\n", value, 1); > + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_ALPHAFUNC, &value); > + ok(value == 2, "Got result %u, expected %u.\n", value, 2); > + > + /* 2. Test states application in BeginPass. No states are restored > + on EndPass. */ > + hr = IDirect3DDevice9_SetSamplerState(device, 1, D3DSAMP_MIPFILTER, 0); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, 0); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + > + hr = IDirect3DDevice9_GetLightEnable(device, 2, &bval); > + todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + if (hr == D3D_OK) > + ok(!bval,"Got result %u, expected 0.", bval); > + > + hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLDMATRIX(1), &test_mat); > + hr = effect->lpVtbl->Begin(effect, &npasses, 0); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + > + hr = IDirect3DDevice9_GetTransform(device, D3DTS_WORLDMATRIX(1), &mat); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + ok(mat.m[0][0] == test_mat.m[0][0], "Unexpected value: %f.\n", mat.m[0][0]); Any reason you're not checking the entire matrix this time only? > + > + hr = effect->lpVtbl->BeginPass(effect, 0); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + > + hr = IDirect3DDevice9_GetTransform(device, D3DTS_WORLDMATRIX(1), &mat); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + todo_wine ok(!memcmp(mat.m, test_mat_world1.m, sizeof(mat)), "World matrix does not match.\n"); > + > + hr = IDirect3DDevice9_GetTransform(device, D3DTS_VIEW, &mat); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + todo_wine ok(!memcmp(mat.m, test_mat_camera.m, sizeof(mat)), "View matrix does not match.\n"); > + > + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_BLENDOP, &value); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + todo_wine ok(value == 2, "Got result %u, expected %u\n", value, 2); > + > + hr = IDirect3DDevice9_GetVertexShader(device, &vshader); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + todo_wine ok(vshader != NULL, "Got NULL vshader.\n"); > + if (vshader) > + { > + byte_code_size = sizeof(test_effect_states_vshader_buf); > + hr = IDirect3DVertexShader9_GetFunction(vshader, test_effect_states_vshader_buf,&byte_code_size); Whitespace after comma. > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + ok(byte_code_size > 1, "Got unexpected byte code size %u.\n", byte_code_size); > + ok(test_effect_states_vshader_buf[0] == 0xfffe0200, "Incorrect shader selected: %#x.\n", test_effect_states_vshader_buf[0]); Here you could memcmp the entire shader with the one from the effect blob. > + IDirect3DVertexShader9_Release(vshader); > + } > + > + hr = IDirect3DDevice9_GetLightEnable(device, 2, &bval); > + todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + if (hr == D3D_OK) > + ok(bval,"Got result %u, expected TRUE.\n", bval); > + hr = IDirect3DDevice9_GetLight(device, 2, &light); > + todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + if (hr == D3D_OK) > + ok(light.Position.x == 4.0f && light.Position.y == 5.0f && light.Position.z == 6.0f, > + "Got unexpected light position (%f, %f, %f).\n", light.Position.x, light.Position.y, light.Position.z); > + hr = IDirect3DDevice9_GetVertexShaderConstantF(device, 3, float_data, 1); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + todo_wine ok(float_data[0] == 2.0f && float_data[1] == 2.0f && float_data[2] == 2.0f && float_data[3] == 2.0f, > + "Got unexpected vertex shader floats: (%f %f %f %f).\n", > + float_data[0], float_data[1], float_data[2], float_data[3]); > + > + hr = effect->lpVtbl->EndPass(effect); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_BLENDOP, &value); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + todo_wine ok(value == 2, "Got result %u, expected %u\n", value, 2); > + > + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_ZENABLE, &value); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + todo_wine ok(value,"Got result %u, expected TRUE.\n", value); > + > + hr = IDirect3DDevice9_GetSamplerState(device, 1, D3DSAMP_MIPFILTER, &value); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + todo_wine ok(value == D3DTEXF_LINEAR, "Unexpected sampler 1 mipfilter %u.\n", value); > + > + hr = IDirect3DDevice9_GetTextureStageState(device, 3, D3DTSS_ALPHAOP, &value); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + todo_wine ok(value == 4, "Unexpected texture stage 3 AlphaOp %u.\n", value); > + > + hr = effect->lpVtbl->End(effect); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + > + hr = IDirect3DDevice9_GetTransform(device, D3DTS_WORLDMATRIX(1), &mat); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + ok(!memcmp(mat.m, test_mat.m, sizeof(mat)), "World matrix not restored.\n"); > + > + hr = IDirect3DDevice9_GetLightEnable(device, 2, &bval); > + todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + if (hr == D3D_OK) > + ok(!bval,"Got result %u, expected 0.\n", bval); > + > + if (effect) > + effect->lpVtbl->Release(effect); > +} > + > START_TEST(effect) > { > HWND wnd; > @@ -2730,6 +2989,7 @@ START_TEST(effect) > test_effect_parameter_value(device); > test_effect_variable_names(device); > test_effect_compilation_errors(device); > + test_effect_states(device); > > count = IDirect3DDevice9_Release(device); > ok(count == 0, "The device was not properly freed: refcount %u\n", count); > -- > 2.5.0

2 2

Re: [PATCH v2] winejoystick.drv: Gracefully handle polling an unplugged device
by Ken Thomases 02 Mar '16

02 Mar '16

On Mar 2, 2016, at 1:46 PM, Aric Stewart <aric(a)codeweavers.com> wrote: > > v2: Use a Helper function instead of duplicated code I should have caught this the first time, but: > +static LRESULT driver_getElementValue(IOHIDDeviceRef device, IOHIDElementRef element, IOHIDValueRef *pValueRef) > +{ > + IOReturn ret; > + ret = IOHIDDeviceGetValue(device, element, pValueRef); > + if (ret != kIOReturnSuccess) > + { > + switch (ret) > + { > + case kIOReturnNotAttached: > + return JOYERR_UNPLUGGED; > + default: > + ERR("IOHIDDeviceGetValue returned 0x%x\n",ret); > + return JOYERR_NOCANDO; > + } > + } > + return JOYERR_NOERROR; > +} It's a bit strange to use an "if" based on ret and then a "switch" based on it, too. You could just use the switch, right? -Ken

2 1