April 2017 - Wine-Devel - list.winehq.org

Re: kernel32/locale:Fix some bugs about special Chinese test in parse_locale_name()
by Marvin April 15, 2017

April 15, 2017

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=30184 Your paranoid android. === wvistau64 (32 bit locale) === locale.c:4532: Test failed: IsValidLocaleName failed locale.c:4534: Test failed: IsValidLocaleName failed === w2008s64 (32 bit locale) === locale.c:4532: Test failed: IsValidLocaleName failed locale.c:4534: Test failed: IsValidLocaleName failed === wvistau64 (64 bit locale) === locale.c:4532: Test failed: IsValidLocaleName failed locale.c:4534: Test failed: IsValidLocaleName failed === w2008s64 (64 bit locale) === locale.c:4532: Test failed: IsValidLocaleName failed locale.c:4534: Test failed: IsValidLocaleName failed

1 0

Re: kernel32/locale:Fix some bugs about special Chinese test in parse_locale_name()
by Marvin April 15, 2017

April 15, 2017

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=30183 Your paranoid android. === wvistau64 (32 bit locale) === locale.c:4532: Test failed: IsValidLocaleName failed locale.c:4534: Test failed: IsValidLocaleName failed === w2008s64 (32 bit locale) === locale.c:4532: Test failed: IsValidLocaleName failed locale.c:4534: Test failed: IsValidLocaleName failed === wvistau64 (64 bit locale) === locale.c:4532: Test failed: IsValidLocaleName failed locale.c:4534: Test failed: IsValidLocaleName failed === w2008s64 (64 bit locale) === locale.c:4532: Test failed: IsValidLocaleName failed locale.c:4534: Test failed: IsValidLocaleName failed

1 0

Re: kernel32/locale:Fix some bugs about special Chinese test in parse_locale_name()
by Marvin April 15, 2017

April 15, 2017

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=30182 Your paranoid android. === wvistau64 (32 bit locale) === locale.c:4532: Test failed: IsValidLocaleName failed locale.c:4534: Test failed: IsValidLocaleName failed === w2008s64 (32 bit locale) === locale.c:4532: Test failed: IsValidLocaleName failed locale.c:4534: Test failed: IsValidLocaleName failed === wvistau64 (64 bit locale) === locale.c:4532: Test failed: IsValidLocaleName failed locale.c:4534: Test failed: IsValidLocaleName failed === w2008s64 (64 bit locale) === locale.c:4532: Test failed: IsValidLocaleName failed locale.c:4534: Test failed: IsValidLocaleName failed

1 0

Re: kernel32/locale:Fix some bugs about special Chinese test in parse_locale_name()
by Marvin April 15, 2017

April 15, 2017

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=30181 Your paranoid android. === wvistau64 (32 bit locale) === locale.c:4532: Test failed: IsValidLocaleName failed locale.c:4534: Test failed: IsValidLocaleName failed === w2008s64 (32 bit locale) === locale.c:4532: Test failed: IsValidLocaleName failed locale.c:4534: Test failed: IsValidLocaleName failed === wvistau64 (64 bit locale) === locale.c:4532: Test failed: IsValidLocaleName failed locale.c:4534: Test failed: IsValidLocaleName failed === w2008s64 (64 bit locale) === locale.c:4532: Test failed: IsValidLocaleName failed locale.c:4534: Test failed: IsValidLocaleName failed

1 0

Re: PATCH:kernel32/locale:Fix some bugs about special Chinese test inparse_locale_name()
by Nikolay Sivov April 14, 2017

April 14, 2017

On 14.04.2017 13:58, loagen95 wrote: > I tried in this way ,but it doesn't work. > 发自我的iPhone Please be more specific, what did you try and it didn't work? > > > ------------------ Original ------------------ > *From:* Nikolay Sivov <bunglehead(a)gmail.com> > *Date:* Fri,Apr 14,2017 18:42 > *To:* wine-devel <wine-devel(a)winehq.org> > *Cc:* loagen95 <loagen95(a)gmail.com> > *Subject:* Re: PATCH:kernel32/locale:Fix some bugs about special Chinese > test inparse_locale_name() > > On 14.04.2017 13:21, THuang wrote: >> >> > > >> @@ -457,6 +457,8 @@ static void parse_locale_name( const WCHAR *str, struct locale_name *name ) >> static const WCHAR cW[] = {'C',0}; >> static const WCHAR latinW[] = {'l','a','t','i','n',0}; >> static const WCHAR latnW[] = {'-','L','a','t','n',0}; >> + static const WCHAR HantW[] = {'-','H','a','n','t',0}; >> + static const WCHAR HansW[] = {'-','H','a','n','s',0}; >> WCHAR *p; >> >> TRACE("%s\n", debugstr_w(str)); >> @@ -487,6 +489,16 @@ static void parse_locale_name( const WCHAR *str, struct locale_name *name ) >> else if (*p == '-') /* Windows format */ >> { >> strcpyW( name->win_name, name->lang ); >> + if(!strcmpiW(p,HantW)){ >> + name->lcid = 0x0c04; >> + name->matches = 1; >> + return ; >> + } >> + if(!strcmpiW(p,HansW)){ >> + name->lcid = 0x0804; >> + name->matches = 1; >> + return ; >> + } >> *p++ = 0; >> name->country = p; >> if (!(p = strpbrkW( p, winsepW ))) goto done; > > Well, no, that's not how it works. Did you explore a possibility if > adding hant/hans specific locale data to kernel32/nls will help? >

1 0

Re: PATCH:kernel32/locale:Fix some bugs about special Chinese test in parse_locale_name()
by Nikolay Sivov April 14, 2017

April 14, 2017

On 14.04.2017 13:21, THuang wrote: > > > @@ -457,6 +457,8 @@ static void parse_locale_name( const WCHAR *str, struct locale_name *name ) > static const WCHAR cW[] = {'C',0}; > static const WCHAR latinW[] = {'l','a','t','i','n',0}; > static const WCHAR latnW[] = {'-','L','a','t','n',0}; > + static const WCHAR HantW[] = {'-','H','a','n','t',0}; > + static const WCHAR HansW[] = {'-','H','a','n','s',0}; > WCHAR *p; > > TRACE("%s\n", debugstr_w(str)); > @@ -487,6 +489,16 @@ static void parse_locale_name( const WCHAR *str, struct locale_name *name ) > else if (*p == '-') /* Windows format */ > { > strcpyW( name->win_name, name->lang ); > + if(!strcmpiW(p,HantW)){ > + name->lcid = 0x0c04; > + name->matches = 1; > + return ; > + } > + if(!strcmpiW(p,HansW)){ > + name->lcid = 0x0804; > + name->matches = 1; > + return ; > + } > *p++ = 0; > name->country = p; > if (!(p = strpbrkW( p, winsepW ))) goto done; Well, no, that's not how it works. Did you explore a possibility if adding hant/hans specific locale data to kernel32/nls will help?

1 0

Re: PATCH:kernel32/locale:Fix some bugs about special Chinese test in parse_locale_name()
by Marvin April 14, 2017

April 14, 2017

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=30177 Your paranoid android. === wvistau64 (32 bit locale) === locale.c:4532: Test failed: IsValidLocaleName failed locale.c:4534: Test failed: IsValidLocaleName failed === w2008s64 (32 bit locale) === locale.c:4532: Test failed: IsValidLocaleName failed locale.c:4534: Test failed: IsValidLocaleName failed === wvistau64 (64 bit locale) === locale.c:4532: Test failed: IsValidLocaleName failed locale.c:4534: Test failed: IsValidLocaleName failed === w2008s64 (64 bit locale) === locale.c:4532: Test failed: IsValidLocaleName failed locale.c:4534: Test failed: IsValidLocaleName failed

1 0

Re: [v2 3/3] d3dx9: Compare parameter definition instead of parameter handle in IsParameterUsed().
by Matteo Bruni April 13, 2017

April 13, 2017

2017-04-11 15:58 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > is_same_parameter() is defined this way (argument type and placement in the file) > for a more straightforward reuse later in shared parameters implementation. > - if (walk_state_dep(&pass->states[j], compare_param_ptr, param)) > + if (walk_state_dep(&pass->states[j], (walk_parameter_dep_func)is_same_parameter, param)) The cast isn't nice though. Either change the signature of is_same_parameter() to match walk_parameter_dep_func or, if that really isn't an option, add a wrapper function with the correct signature and use that here instead. Even if you prefer the latter, it's probably better to do that only when you need it, in a later patch.

1 0

Re: [PATCH 1/3] d3dx9/tests: Add tests for cross effect handles usage.
by Matteo Bruni April 13, 2017

April 13, 2017

2017-04-11 15:22 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/tests/effect.c | 75 ++++++++++++++++++++++++++++++++++++++++---- > 1 file changed, 69 insertions(+), 6 deletions(-) > > diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c > index de5ae69..62da636 100644 > --- a/dlls/d3dx9_36/tests/effect.c > +++ b/dlls/d3dx9_36/tests/effect.c > @@ -4515,18 +4515,26 @@ static void test_isparameterused_children(ID3DXEffect *effect, D3DXHANDLE tech, > } > } > > -static void test_isparameterused_param_with_children(ID3DXEffect *effect, D3DXHANDLE tech, const char *name, > - BOOL expected_result) > +static void test_isparameterused_param_with_children(ID3DXEffect *effect, ID3DXEffect *effect2, D3DXHANDLE tech, > + const char *name, BOOL expected_result) I think you want to pass the source line to the function (like e.g. test_effect_preshader_compare_vconsts()) now that you call it from multiple places. > { > D3DXHANDLE param; > > - param = effect->lpVtbl->GetParameterByName(effect, NULL, name); > + ok(!effect->lpVtbl->IsParameterUsed(effect, (D3DXHANDLE)name, tech) == !expected_result, > + "Unexpected IsParameterUsed() result for %s.\n", name); > + > + if (effect2) > + param = effect2->lpVtbl->GetParameterByName(effect2, NULL, name); > + else > + param = effect->lpVtbl->GetParameterByName(effect, NULL, name); > ok(!!param, "GetParameterByName failed for %s.\n", name); > > + todo_wine_if(!!effect2 && expected_result) You don't need the !! here, the && gives an integer result anyway. > ok(!effect->lpVtbl->IsParameterUsed(effect, param, tech) == !expected_result, > "Unexpected IsParameterUsed() result for %s.\n", name); This is not new, but again the negations shouldn't be necessary. Actually if it turns out that they are, that means IsParameterUsed() doesn't always return a proper BOOL and that's an interesting result by itself. > +static void test_cross_effect_handle(IDirect3DDevice9 *device) > +{ > + ID3DXEffect *effect1, *effect2; > + D3DXHANDLE param1, param2; > + static int expected_ivect[4] = {28, 29, 30, 31}; > + int ivect[4]; > + HRESULT hr; > + > + hr = D3DXCreateEffect(device, test_effect_preshader_effect_blob, sizeof(test_effect_preshader_effect_blob), > + NULL, NULL, 0, NULL, &effect1, NULL); > + ok(hr == D3D_OK, "Got result %#x.\n", hr); > + hr = D3DXCreateEffect(device, test_effect_preshader_effect_blob, sizeof(test_effect_preshader_effect_blob), > + NULL, NULL, 0, NULL, &effect2, NULL); > + ok(hr == D3D_OK, "Got result %#x.\n", hr); It probably makes sense to add a ok(effect1 != effect2) here, to show that native doesn't do effect object deduplication (which would trivially imply that the rest of this test passes). > + param1 = effect1->lpVtbl->GetParameterByName(effect1, NULL, "g_iVect"); > + ok(!!param1, "GetParameterByName failed.\n"); > + > + param2 = effect2->lpVtbl->GetParameterByName(effect2, NULL, "g_iVect"); > + ok(!!param2, "GetParameterByName failed.\n"); Same here with param1 and param2.

1 0

Re: [PATCH 1/8] mshtml/tests: Added IMarshal and IManagedObject QueryInterface tests.
by Marvin April 13, 2017

April 13, 2017

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=30167 Your paranoid android. === w7u (32 bit htmldoc) === htmldoc.c:2671: Test failed: unexpected call GetOverrideKeyPath htmldoc.c:5081: Test failed: unexpected call {d9befc84-f21e-4166-874b-a8d3010dc764}

1 0