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

Re: [v2 4/5] d3dx9: Do not set active pass if BeginPass() failed.

by Paul Gofman

On 05/05/2017 01:14 AM, Matteo Bruni wrote: > 2017-05-04 0:33 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > >> if (technique && pass < technique->pass_count && !effect->active_pass) >> { >> + HRESULT hr; >> + >> effect->active_pass = &technique->passes[pass]; >> memset(effect->current_light, 0, sizeof(effect->current_light)); >> memset(&effect->current_material, 0, sizeof(effect->current_material)); >> - return d3dx9_apply_pass_states(effect, effect->active_pass, TRUE); >> + hr = d3dx9_apply_pass_states(effect, effect->active_pass, TRUE); >> + if (FAILED(hr)) >> + effect->active_pass = NULL; >> + return hr; >> } > Can't you just set active_pass only if d3dx9_apply_pass_states() > succeeds, instead? Yes, sure, I think it is not supposed to be ever used within apply_pass_states().

May 4, 2017

Re: dmusic/tests: Add some IDirectMusic_SetDirectSound() tests.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=30792 Your paranoid android. === wvistau64 (32 bit dmusic) === dmusic.c:143: Test failed: DirectSoundCreate failed: 88780078 00c4:dmusic: unhandled exception c0000005 at 73C598FB

May 4, 2017

Re: [PATCH 04/10] d3dx9/tests: Use compare_float() in test_D3DXSHEvalSphericalLight().

by Henri Verbeet

On 5 May 2017 at 00:15, Matteo Bruni <matteo.mystral(a)gmail.com> wrote: > 2017-05-04 12:05 GMT+02:00 Henri Verbeet <hverbeet(a)codeweavers.com>: > >> - ok(relative_error(expected, test[l].red_received[j]) < 0.0005f, >> - "Red: case %u, order %u: expected[%u] = %f, received %f\n", l, order, j, expected, test[l].red_received[j]); >> + equal = compare_float(expected, test[l].red_received[j], 512); >> + ok(equal || (fabs(expected) < 1.0e-6f && fabs(test[l].red_received[j]) < 1.0e-6f), >> + "Red: case %u, order %u: expected[%u] = %.8e, received %.8e.\n", >> + l, order, j, expected, test[l].red_received[j]); > > I guess those are mostly to make our implementation pass the test. Did > you have a look at it by any chance? > In this case, yes, but the one in test_D3DXSHRotateZ() actually has large differences between Windows versions as well. I did briefly look into it, but decided it was going to be more trouble than I cared for to fix. My guess would be that it would mostly be a matter of being more careful in weightedcapintegrale() and D3DXSHEvalDirection() on the one hand, and perhaps picking more reasonable inputs on the other.

May 4, 2017

Re: [PATCH 04/10] d3dx9/tests: Use compare_float() in test_D3DXSHEvalSphericalLight().

by Matteo Bruni

2017-05-04 12:05 GMT+02:00 Henri Verbeet <hverbeet(a)codeweavers.com>: > - ok(relative_error(expected, test[l].red_received[j]) < 0.0005f, > - "Red: case %u, order %u: expected[%u] = %f, received %f\n", l, order, j, expected, test[l].red_received[j]); > + equal = compare_float(expected, test[l].red_received[j], 512); > + ok(equal || (fabs(expected) < 1.0e-6f && fabs(test[l].red_received[j]) < 1.0e-6f), > + "Red: case %u, order %u: expected[%u] = %.8e, received %.8e.\n", > + l, order, j, expected, test[l].red_received[j]); I guess those are mostly to make our implementation pass the test. Did you have a look at it by any chance?

May 4, 2017

Re: [v2 4/5] d3dx9: Do not set active pass if BeginPass() failed.

by Matteo Bruni

2017-05-04 0:33 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > if (technique && pass < technique->pass_count && !effect->active_pass) > { > + HRESULT hr; > + > effect->active_pass = &technique->passes[pass]; > memset(effect->current_light, 0, sizeof(effect->current_light)); > memset(&effect->current_material, 0, sizeof(effect->current_material)); > - return d3dx9_apply_pass_states(effect, effect->active_pass, TRUE); > + hr = d3dx9_apply_pass_states(effect, effect->active_pass, TRUE); > + if (FAILED(hr)) > + effect->active_pass = NULL; > + return hr; > } Can't you just set active_pass only if d3dx9_apply_pass_states() succeeds, instead?

May 4, 2017

Re: [PATCH] d3dx9: Return shader functions in d3dx9_base_effect_get_pass_desc().

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=30788 Your paranoid android. === build (build) === Patch failed to apply

May 4, 2017

Re: [v4 PATCH 1/4] mfplat: Implement MFTRegister

by Alexandre Julliard

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > + if (cinput && input_types) > + { > + size = cinput * sizeof(MFT_REGISTER_TYPE_INFO); > + types = HeapAlloc(GetProcessHeap(), 0, size); > + if (!types) goto err; > + > + memcpy(types, input_types, size); > + > + ret = RegSetValueExW(hclsid, inputtypesW, 0, REG_BINARY, (BYTE *)types, size); > + HeapFree(GetProcessHeap(), 0, types); Why do you need to make a copy? > + if (coutput && output_types) > + { > + size = cinput * sizeof(MFT_REGISTER_TYPE_INFO); I'm guessing you want coutput here. -- Alexandre Julliard julliard(a)winehq.org

May 4, 2017

pulse/alsa option in wine cfg audio tab

by CARLOS RODRIGUEZ

>Are there bugs reported for those?>Yeah has been reported sometime agohttps://bugs.winehq.org/show_bug.cgi?id=41147

May 4, 2017

Re: [v6 PATCH 07/21] x86/insn-eval: Add utility function to get segment descriptor

by Borislav Petkov

On Wed, Apr 26, 2017 at 02:51:56PM -0700, Ricardo Neri wrote: > > > + seg >= current->active_mm->context.ldt->size)) { > > > > ldt->size is the size of the descriptor table but you've shifted seg by > > 3. That selector index is shifted by 3 (to the left) to form an offset > > into the descriptor table because the entries there are 8 bytes. > > I double-checked the ldt code and it seems to me that size refers to the > number of entries in the table; it is always multiplied by > LDT_ENTRY_SIZE [1], [2]. Am I missing something? No, you're not. I fell into that wrongly named struct member trap. So ldt_struct.size should actually be called ldt_struct.n_entries or similar. Because what's in there is now is not "size". And then code like new_ldt->size * LDT_ENTRY_SIZE would make much more sense if written like this: new_ldt->n_entries * LDT_ENTRY_SIZE Would you fix that in a prepatch pls? Thanks. -- Regards/Gruss, Boris. SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg) --

May 4, 2017

Re: [v2 5/5] d3dx9: Match native out of bounds array selector index handling.

by Paul Gofman

Sorry, please ignore this last patch in the series. I found it is not correct for some cases and I will come up with more tests and corrected version separately. On 05/04/2017 01:33 AM, Paul Gofman wrote: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/effect.c | 25 ++++++++++++++++--------- > dlls/d3dx9_36/tests/effect.c | 17 ++++++----------- > 2 files changed, 22 insertions(+), 20 deletions(-) > > diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c > index 1ecd32e..a3511c8 100644 > --- a/dlls/d3dx9_36/effect.c > +++ b/dlls/d3dx9_36/effect.c > @@ -1056,7 +1056,7 @@ static HRESULT d3dx9_base_effect_get_pass_desc(struct d3dx9_base_effect *base, > BOOL param_dirty; > > if (FAILED(hr = d3dx9_get_param_value_ptr(pass, &pass->states[i], &param_value, &param, > - TRUE, &param_dirty))) > + FALSE, &param_dirty))) > return hr; > > if (!param->object_id) > @@ -2647,7 +2647,9 @@ static HRESULT d3dx9_get_param_value_ptr(struct d3dx_pass *pass, struct d3dx_sta > FIXME("Preshader structure is null.\n"); > return D3DERR_INVALIDCALL; > } > - if (update_all || is_param_eval_input_dirty(param->param_eval)) > + /* According to the tests, native d3dx handles the case of array index evaluated to -1 > + * in a specific way. */ > + if (is_param_eval_input_dirty(param->param_eval) || state->index == 0xffffffffu) > { > if (FAILED(hr = d3dx_evaluate_parameter(param->param_eval, &array_idx_param, > &array_idx, update_all))) > @@ -2660,6 +2662,11 @@ static HRESULT d3dx9_get_param_value_ptr(struct d3dx_pass *pass, struct d3dx_sta > ref_param = param->referenced_param; > TRACE("Array index %u, stored array index %u, element_count %u.\n", array_idx, state->index, > ref_param->element_count); > + if (array_idx == 0xffffffffu) > + { > + WARN("Array index is -1, setting to 0.\n"); > + array_idx = 0; > + } > > if (array_idx >= ref_param->element_count) > { > @@ -2920,13 +2927,11 @@ static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pas > if (FAILED(hr = d3dx9_get_param_value_ptr(pass, state, &param_value, &param, > update_all, &param_dirty))) > { > - if (hr == E_FAIL) > + if (!update_all && hr == E_FAIL) > { > - /* Native d3dx9 returns D3D_OK from BeginPass or Commit involving > + /* Native d3dx9 returns D3D_OK from Commit involving > * out of bounds array access and does not touch the affected > - * state, except for BeginPass when the out of bounds array index > - * depends on dirty parameters. The latter case is supposed to > - * return E_FAIL but is currently TODO. */ > + * state. */ > WARN("Returning D3D_OK on out of bounds array access.\n"); > return D3D_OK; > } > @@ -6101,6 +6106,7 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * > if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr))) > return hr; > hr = d3dx9_parse_array_selector(base, param); > + state->index = 0xffffffffu; > break; > > default: > @@ -6226,10 +6232,11 @@ static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *da > > for (i = 0; i < base->parameter_count; ++i) > { > - if (FAILED(hr = d3dx_pool_sync_shared_parameter(base->pool, &base->parameters[i]))) > - goto err_out; > walk_parameter_tree(&base->parameters[i], param_set_top_level_param, > &base->parameters[i]); > + set_dirty(&base->parameters[i]); > + if (FAILED(hr = d3dx_pool_sync_shared_parameter(base->pool, &base->parameters[i]))) > + goto err_out; > } > return D3D_OK; > > diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c > index 7f7487e..c6713af 100644 > --- a/dlls/d3dx9_36/tests/effect.c > +++ b/dlls/d3dx9_36/tests/effect.c > @@ -4658,14 +4658,12 @@ static void test_effect_out_of_bounds_selector(IDirect3DDevice9 *device) > ok(hr == D3D_OK, "Got result %#x.\n", hr); > > hr = effect->lpVtbl->BeginPass(effect, 1); > - todo_wine ok(hr == E_FAIL, "Got result %#x.\n", hr); > - if (SUCCEEDED(hr)) > - effect->lpVtbl->EndPass(effect); > + ok(hr == E_FAIL, "Got result %#x.\n", hr); > > hr = effect->lpVtbl->BeginPass(effect, 1); > ok(hr == D3D_OK, "Got result %#x.\n", hr); > > - test_effect_preshader_compare_shader(device, 2, TRUE); > + test_effect_preshader_compare_shader(device, 2, FALSE); > > hr = effect->lpVtbl->EndPass(effect); > ok(hr == D3D_OK, "Got result %#x.\n", hr); > @@ -4678,9 +4676,7 @@ static void test_effect_out_of_bounds_selector(IDirect3DDevice9 *device) > ok(hr == D3D_OK, "Got result %#x.\n", hr); > > hr = effect->lpVtbl->BeginPass(effect, 1); > - todo_wine ok(hr == E_FAIL, "Got result %#x.\n", hr); > - if (SUCCEEDED(hr)) > - hr = effect->lpVtbl->EndPass(effect); > + ok(hr == E_FAIL, "Got result %#x.\n", hr); > > hr = IDirect3DDevice9_GetVertexShader(device, &vshader); > ok(hr == D3D_OK, "Got result %#x.\n", hr); > @@ -4689,7 +4685,7 @@ static void test_effect_out_of_bounds_selector(IDirect3DDevice9 *device) > hr = effect->lpVtbl->BeginPass(effect, 1); > ok(hr == D3D_OK, "Got result %#x.\n", hr); > > - test_effect_preshader_compare_shader(device, 2, TRUE); > + test_effect_preshader_compare_shader(device, 2, FALSE); > > hr = effect->lpVtbl->EndPass(effect); > ok(hr == D3D_OK, "Got result %#x.\n", hr); > @@ -4701,7 +4697,7 @@ static void test_effect_out_of_bounds_selector(IDirect3DDevice9 *device) > hr = effect->lpVtbl->BeginPass(effect, 1); > ok(hr == D3D_OK, "Got result %#x.\n", hr); > > - test_effect_preshader_compare_shader(device, 0, TRUE); > + test_effect_preshader_compare_shader(device, 0, FALSE); > > hr = IDirect3DDevice9_SetVertexShader(device, NULL); > ok(hr == D3D_OK, "Got result %#x.\n", hr); > @@ -6266,10 +6262,9 @@ static void test_effect_get_pass_desc(IDirect3DDevice9 *device) > ok(hr == D3D_OK, "Got result %#x.\n", hr); > > hr = effect->lpVtbl->GetPassDesc(effect, pass, &desc); > - todo_wine > ok(hr == D3D_OK, "Got result %#x.\n", hr); > > - test_effect_preshader_compare_shader_bytecode(desc.pVertexShaderFunction, 0, 0, TRUE); > + test_effect_preshader_compare_shader_bytecode(desc.pVertexShaderFunction, 0, 0, FALSE); > > fvect.z = 2.0f; > hr = effect->lpVtbl->SetVector(effect, "g_iVect", &fvect);

May 4, 2017