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

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

02 Mar '16

I am curious. Are the test failures here because of the 32bit vs 64bi? It seems strange. We are going to want to find a way that these done introduce more failures into our winetest runs. -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(+) > > > >

1 0

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

02 Mar '16

On Mar 2, 2016, at 11:28 AM, Aric Stewart <aric(a)codeweavers.com> wrote: > > dlls/winejoystick.drv/joystick_osx.c | 40 +++++++++++++++++++++++++++++++++--- > 1 file changed, 37 insertions(+), 3 deletions(-) > - IOHIDDeviceGetValue(device, button, &valueRef); > + ret = IOHIDDeviceGetValue(device, button, &valueRef); > + if (ret != kIOReturnSuccess) > + { > + switch (ret) > + { > + case kIOReturnNotAttached: > + return JOYERR_UNPLUGGED; > + default: > + ERR("IOHIDDeviceGetValue returned 0x%x\n",ret); > + return JOYERR_NOCANDO; > + } > + } The above sort of change is repeated three times. Seems like a case for a helper function. -Ken

1 0

Re: [v2 6/6] d3dx9: implement state save and restore in effect.
by Matteo Bruni 02 Mar '16

02 Mar '16

2016-03-01 18:10 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/effect.c | 66 ++++++++++++++++++++++++++++++++------------ > dlls/d3dx9_36/tests/effect.c | 8 +++--- > 2 files changed, 53 insertions(+), 21 deletions(-) > > diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c > index 8a359d0..a7611fe 100644 > --- a/dlls/d3dx9_36/effect.c > +++ b/dlls/d3dx9_36/effect.c > @@ -162,6 +162,8 @@ struct d3dx_technique > > struct d3dx_parameter *annotations; > struct d3dx_pass *passes; > + > + struct IDirect3DStateBlock9 *saved_state; > }; > > struct param_table > @@ -642,6 +644,12 @@ static void free_technique(struct d3dx_technique *technique) > if (!technique) > return; > > + if (technique->saved_state) > + { > + IDirect3DStateBlock9_Release(technique->saved_state); > + technique->saved_state = NULL; > + } > + What happens if the effect is released while inside a Begin() / End() pair? Is the state restored or not? > if (technique->annotations) > { > for (i = 0; i < technique->annotation_count; ++i) > @@ -3467,8 +3475,8 @@ static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDL > > static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DWORD flags) > { > - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); > - struct d3dx_technique *technique = This->active_technique; > + struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); > + struct d3dx_technique *technique = effect->active_technique; > > TRACE("iface %p, passes %p, flags %#x.\n", iface, passes, flags); > > @@ -3477,18 +3485,34 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW > if (flags & ~(D3DXFX_DONOTSAVESTATE | D3DXFX_DONOTSAVESAMPLERSTATE | D3DXFX_DONOTSAVESHADERSTATE)) > WARN("Invalid flags (%#x) specified.\n", flags); > > - if (This->manager || flags & D3DXFX_DONOTSAVESTATE) > + if (effect->manager || flags & D3DXFX_DONOTSAVESTATE) > { > TRACE("State capturing disabled.\n"); > } > else > { > - FIXME("State capturing not supported, yet!\n"); > + HRESULT hr; > + int i; > + > + if (!technique->saved_state) > + { > + hr = IDirect3DDevice9_BeginStateBlock(effect->device); > + if (FAILED(hr)) > + ERR("BeginStateBlock failed: %#x.\n",hr); > + for (i = 0; i < technique->pass_count; i++) > + d3dx9_apply_pass_states(effect, &technique->passes[i]); > + hr = IDirect3DDevice9_EndStateBlock(effect->device, &technique->saved_state); > + if (FAILED(hr)) > + ERR("EndStateBlock failed: %#x.\n",hr); > + } > + hr = IDirect3DStateBlock9_Capture(technique->saved_state); > + if (FAILED(hr)) > + ERR("StateBlock Capture failed: %#x.\n",hr); > } > > *passes = technique->pass_count; > - This->started = TRUE; > - This->flags = flags; > + effect->started = TRUE; > + effect->flags = flags; > > return D3D_OK; > } > @@ -3518,17 +3542,15 @@ static HRESULT WINAPI ID3DXEffectImpl_BeginPass(ID3DXEffect *iface, UINT pass) > > static HRESULT WINAPI ID3DXEffectImpl_CommitChanges(ID3DXEffect* iface) > { > - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); > - > - FIXME("(%p)->(): stub\n", This); > + struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); Implementing CommitChanges should be a separate patch. Also please turn the FIXME into a TRACE instead of dropping it entirely. > > - if (!This->active_pass) > + if (!effect->active_pass) > { > WARN("Called without an active pass.\n"); > return D3D_OK; > } > - > - return E_NOTIMPL; > + /* TODO: apply only changed states */ > + return d3dx9_apply_pass_states(effect, effect->active_pass); > } > > static HRESULT WINAPI ID3DXEffectImpl_EndPass(ID3DXEffect *iface) > @@ -3550,23 +3572,33 @@ static HRESULT WINAPI ID3DXEffectImpl_EndPass(ID3DXEffect *iface) > > static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect *iface) > { > - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); > + struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); > + struct d3dx_technique *technique = effect->active_technique; > > TRACE("iface %p.\n", iface); > > - if (!This->started) > + if (!effect->started) > return D3D_OK; > > - if (This->manager || This->flags & D3DXFX_DONOTSAVESTATE) > + if (effect->manager || effect->flags & D3DXFX_DONOTSAVESTATE) > { > TRACE("State restoring disabled.\n"); > } > else > { > - FIXME("State restoring not supported, yet!\n"); > + HRESULT hr; > + > + if (technique && technique->saved_state) > + { > + hr = IDirect3DStateBlock9_Apply(technique->saved_state); > + if (FAILED(hr)) > + ERR("State block apply failed: %#x.\n",hr); > + } > + else > + ERR("No saved state."); Missing '\n'. > } > > - This->started = FALSE; > + effect->started = FALSE; > > return D3D_OK; > } > diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c > index a052bce..3d0e01c 100644 > --- a/dlls/d3dx9_36/tests/effect.c > +++ b/dlls/d3dx9_36/tests/effect.c > @@ -2850,7 +2850,7 @@ static void test_effect_states(IDirect3DDevice9 *device) > > 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); > + 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); > > @@ -2862,7 +2862,7 @@ static void test_effect_states(IDirect3DDevice9 *device) > 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); > + 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); > > @@ -2940,12 +2940,12 @@ static void test_effect_states(IDirect3DDevice9 *device) > > 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.m, sizeof(mat)), "World matrix not restored.\n"); > + ok(!memcmp(mat.m, test_mat.m, sizeof(mat)), "World matrix not restored.\n"); > > hr = IDirect3DDevice9_GetLightEnable(device, 2, &bval); > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > if (hr == D3D_OK) > - todo_wine ok(!bval,"Got result %u, expected 0.\n", bval); > + ok(!bval,"Got result %u, expected 0.\n", bval); > > if (effect) > effect->lpVtbl->Release(effect); > -- > 2.5.0

2 1

Re: [v2 5/6] d3dx9: implement sampler and texture effect states application.
by Matteo Bruni 02 Mar '16

02 Mar '16

2016-03-01 18:10 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/effect.c | 37 +++++++++++++++++++++++++++++++++++-- > dlls/d3dx9_36/tests/effect.c | 2 +- > 2 files changed, 36 insertions(+), 3 deletions(-) > > diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c > index decc048..8a359d0 100644 > --- a/dlls/d3dx9_36/effect.c > +++ b/dlls/d3dx9_36/effect.c > @@ -2676,7 +2676,7 @@ HRESULT d3dx_set_shader_const_state(IDirect3DDevice9 *device, enum SHADER_CONSTA > return D3D_OK; > } > > -static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, struct d3dx_state *state) > +static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, struct d3dx_state *state, int parent_index) > { > IDirect3DDevice9 *device = effect->device; > struct d3dx_parameter *param; > @@ -2696,9 +2696,42 @@ static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pas > case SC_FVF: > TRACE("%s: value %#x.\n", state_table[state->operation].name, *(DWORD *)param_value); > return IDirect3DDevice9_SetFVF(device, *(DWORD *)param_value); > + case SC_TEXTURE: > + { > + UINT sampler; Technically this would be a texture unit (or texture stage) more than a sampler index. > + > + sampler = parent_index == -1 ? state->index : parent_index; > + TRACE("%s: sampler %u value %p.\n", state_table[state->operation].name, sampler, *(IDirect3DBaseTexture9 **)param_value); > + return IDirect3DDevice9_SetTexture(device, sampler, *(IDirect3DBaseTexture9 **)param_value); > + } > case SC_TEXTURESTAGE: > TRACE("%s: stage %u value %u.\n", state_table[state->operation].name, state->index, *(DWORD *)param_value); > return IDirect3DDevice9_SetTextureStageState(device, state->index, state_table[state->operation].op, *(DWORD *)param_value); > + case SC_SETSAMPLER: > + { > + struct d3dx_sampler *sampler; > + HRESULT ret, hr; > + int i; > + > + sampler = (struct d3dx_sampler *)param_value; > + TRACE("%s: sampler %u applying %u states.\n", state_table[state->operation].name, state->index, sampler->state_count); > + ret = D3D_OK; > + for (i = 0; i < sampler->state_count; i++) > + { > + hr = d3dx9_apply_state(effect, pass, &sampler->states[i], state->index); > + if (FAILED(hr)) > + ret = hr; > + } > + return ret; > + } > + case SC_SAMPLERSTATE: > + { > + UINT sampler; > + > + sampler = parent_index == -1 ? state->index : parent_index; > + TRACE("%s sampler %u:%u.\n", state_table[state->operation].name, sampler, *(DWORD *)param_value); Please use the same trace style you're using for the other states. > + return IDirect3DDevice9_SetSamplerState(device, sampler, state_table[state->operation].op, *(DWORD *)param_value); > + } > case SC_VERTEXSHADER: > TRACE("%s vertex shader %p.\n", state_table[state->operation].name, *(IDirect3DVertexShader9 **)param_value); > hr = IDirect3DDevice9_SetVertexShader(device, *(IDirect3DVertexShader9 **)param_value); > @@ -2772,7 +2805,7 @@ static HRESULT d3dx9_apply_pass_states(struct ID3DXEffectImpl *effect, struct d3 > { > HRESULT hr; > > - hr = d3dx9_apply_state(effect, pass, &pass->states[i]); > + hr = d3dx9_apply_state(effect, pass, &pass->states[i], -1); > if (FAILED(hr)) > { > WARN("Error applying state: %#x.\n", hr); > diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c > index 3184f26..a052bce 100644 > --- a/dlls/d3dx9_36/tests/effect.c > +++ b/dlls/d3dx9_36/tests/effect.c > @@ -2929,7 +2929,7 @@ static void test_effect_states(IDirect3DDevice9 *device) > > 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); > + 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); > -- > 2.5.0

1 0

Re: [v2 3/6] d3dx9: implement light and material effect states application.
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/effect.c | 139 +++++++++++++++++++++++++++++++++++++++++++ > dlls/d3dx9_36/tests/effect.c | 8 +-- > 2 files changed, 143 insertions(+), 4 deletions(-) > More nitpicks on this one... > diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c > index 7ccdb36..16110c5 100644 > --- a/dlls/d3dx9_36/effect.c > +++ b/dlls/d3dx9_36/effect.c > @@ -2514,6 +2514,114 @@ static HRESULT d3dx9_get_param_value_ptr(struct ID3DXEffectImpl *effect, struct > return E_NOTIMPL; > } > > +static void d3dx9_set_light_parameter(enum LIGHT_TYPE op, D3DLIGHT9 *light, void *value) > +{ > + static const struct > + { > + int off; I'd prefer "unsigned int offset;". > + const char *name; > + } light_tbl[] = I think the wined3d style is to put the closing '}' on its own line. > + { > + {FIELD_OFFSET(D3DLIGHT9, Type), "LC_TYPE"}, > + {FIELD_OFFSET(D3DLIGHT9, Diffuse), "LT_DIFFUSE"}, > + {FIELD_OFFSET(D3DLIGHT9, Specular), "LT_SPECULAR"}, > + {FIELD_OFFSET(D3DLIGHT9, Ambient), "LT_AMBIENT"}, > + {FIELD_OFFSET(D3DLIGHT9, Position), "LT_POSITION"}, > + {FIELD_OFFSET(D3DLIGHT9, Direction), "LT_DIRECTION"}, > + {FIELD_OFFSET(D3DLIGHT9, Range), "LT_RANGE"}, > + {FIELD_OFFSET(D3DLIGHT9, Falloff), "LT_FALLOFF"}, > + {FIELD_OFFSET(D3DLIGHT9, Attenuation0), "LT_ATTENUATION0"}, > + {FIELD_OFFSET(D3DLIGHT9, Attenuation1), "LT_ATTENUATION1"}, > + {FIELD_OFFSET(D3DLIGHT9, Attenuation2), "LT_ATTENUATION2"}, > + {FIELD_OFFSET(D3DLIGHT9, Theta), "LT_THETA"}, > + {FIELD_OFFSET(D3DLIGHT9, Phi), "LT_PHI"} > + }; > + switch (op) > + { > + case LT_TYPE: > + TRACE("LT_TYPE %u.\n", *(D3DLIGHTTYPE *)value); > + light->Type = *(D3DLIGHTTYPE *)value; > + break; > + case LT_DIFFUSE: > + case LT_SPECULAR: > + case LT_AMBIENT: > + { > + D3DCOLORVALUE c = *(D3DCOLORVALUE *)value; > + > + TRACE("%s (%f %f %f %f).\n", light_tbl[op].name, c.r, c.g, c.b, c.a); > + *(D3DCOLORVALUE *)((char *)light + light_tbl[op].off) = c; > + break; > + } > + case LT_POSITION: > + case LT_DIRECTION: > + { > + D3DVECTOR v = *(D3DVECTOR *)value; > + > + TRACE("%s (%f %f %f).\n", light_tbl[op].name, v.x, v.y, v.z); > + *(D3DVECTOR *)((char *)light + light_tbl[op].off) = v; > + break; > + } > + case LT_RANGE: > + case LT_FALLOFF: > + case LT_ATTENUATION0: > + case LT_ATTENUATION1: > + case LT_ATTENUATION2: > + case LT_THETA: > + case LT_PHI: > + { > + float v = *(float *)value; > + TRACE("%s %f.\n", light_tbl[op].name, v); > + *(float *)((char *)light + light_tbl[op].off) = v; > + break; > + } > + default: > + FIXME("Unknown light parameter %u.\n",op); > + break; > + } > +} > + > +static void d3dx9_set_material_parameter(enum MATERIAL_TYPE op, D3DMATERIAL9 *material, void *value) > +{ > + static const struct > + { > + int off; > + const char *name; > + } material_tbl[] = Same as above. > + { > + {FIELD_OFFSET(D3DMATERIAL9, Diffuse), "MT_DIFFUSE"}, > + {FIELD_OFFSET(D3DMATERIAL9, Ambient), "MT_AMBIENT"}, > + {FIELD_OFFSET(D3DMATERIAL9, Specular), "MT_SPECULAR"}, > + {FIELD_OFFSET(D3DMATERIAL9, Emissive), "MT_EMISSIVE"}, > + {FIELD_OFFSET(D3DMATERIAL9, Power), "MT_POWER"} > + }; > + > + if (op < 0 || op > MT_POWER) > + { > + FIXME("Unknown material parameter %u.\n",op); > + return; > + } > + > + switch (op) > + { > + case MT_POWER: > + { > + float v = *(float *)value; > + > + TRACE("%s %f.\n", material_tbl[op].name, v); > + material->Power = v; > + break; > + } > + default: > + { > + D3DCOLORVALUE c = *(D3DCOLORVALUE *)value; > + > + TRACE("%s (%f %f %f %f).\n", material_tbl[op].name, c.r, c.g, c.b, c.a); > + *(D3DCOLORVALUE *)((char *)material + material_tbl[op].off) = c; > + break; > + } > + } > +} I probably prefer if you write this in the same fashion as with the light parameter above (explicit cases for the 4 color values, error message in the default case of the switch). Actually the error message should probably be a WARN() instead since I don't think values different from the ones you're handling are ever legitimate so there is nothing to fix for us (but the value comes from the application so it's not an ERR). > + > static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, struct d3dx_state *state) > { > IDirect3DDevice9 *device = effect->device; > @@ -2554,6 +2662,37 @@ static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pas > case SC_TRANSFORM: > TRACE("%s %u.\n", state_table[state->operation].name, state->index); > return IDirect3DDevice9_SetTransform(device, state_table[state->operation].op + state->index, (D3DMATRIX *)param_value); > + case SC_LIGHTENABLE: > + TRACE("%s index %u %u.\n", state_table[state->operation].name, state->index, *(BOOL *)param_value); > + return IDirect3DDevice9_LightEnable(device, state->index, *(BOOL *)param_value); > + case SC_LIGHT: > + { > + D3DLIGHT9 light; > + > + TRACE("%s op %u index %u.\n", state_table[state->operation].name, state_table[state->operation].op, state->index); > + hr = IDirect3DDevice9_GetLight(device, state->index, &light); > + if (FAILED(hr)) > + { > + WARN("Could not get light: %#x.\n", hr); > + memset(&light, 0, sizeof light); Please parenthesize the sizeof argument. > + } > + d3dx9_set_light_parameter(state_table[state->operation].op, &light, param_value); > + return IDirect3DDevice9_SetLight(device, state->index, &light); > + } > + case SC_MATERIAL: > + { > + D3DMATERIAL9 material; > + > + TRACE("%s op %u index %u.\n", state_table[state->operation].name, state_table[state->operation].op, state->index); > + hr = IDirect3DDevice9_GetMaterial(device, &material); > + if (FAILED(hr)) > + { > + WARN("Could not get material: %#x.\n", hr); > + memset(&material, 0, sizeof material); > + } > + d3dx9_set_material_parameter(state_table[state->operation].op, &material, param_value); > + return IDirect3DDevice9_SetMaterial(device, &material); > + } > case SC_NPATCHMODE: > TRACE("%s %f.\n", state_table[state->operation].name, *(float *)param_value); > return IDirect3DDevice9_SetNPatchMode(device, *(float *)param_value); > diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c > index e415a3c..3eaddb7 100644 > --- a/dlls/d3dx9_36/tests/effect.c > +++ b/dlls/d3dx9_36/tests/effect.c > @@ -2903,11 +2903,11 @@ static void test_effect_states(IDirect3DDevice9 *device) > } > > hr = IDirect3DDevice9_GetLightEnable(device, 2, &bval); > - todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + 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); > + 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); > @@ -2943,9 +2943,9 @@ static void test_effect_states(IDirect3DDevice9 *device) > todo_wine 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); > + 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); > + todo_wine ok(!bval,"Got result %u, expected 0.\n", bval); > > if (effect) > effect->lpVtbl->Release(effect); > -- > 2.5.0

1 0

Re: [v2 2/6] d3dx9: implement simple effect states application.
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/effect.c | 111 +++++++++++++++++++++++++++++++++++++++---- > dlls/d3dx9_36/tests/effect.c | 16 +++---- > 2 files changed, 110 insertions(+), 17 deletions(-) > > diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c > index f0bbd0b..7ccdb36 100644 > --- a/dlls/d3dx9_36/effect.c > +++ b/dlls/d3dx9_36/effect.c > @@ -2490,6 +2490,102 @@ static HRESULT d3dx9_base_effect_set_array_range(struct d3dx9_base_effect *base, > return E_NOTIMPL; > } > > +static HRESULT d3dx9_get_param_value_ptr(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, struct d3dx_state *state, void **param_value, struct d3dx_parameter **out_param) Please break lines so they stay under 100 - 120 characters. > +{ > + struct d3dx_parameter *param; > + param = state->parameter.referenced_param ? state->parameter.referenced_param : &state->parameter; > + > + switch (state->type) > + { > + case ST_CONSTANT: > + case ST_PARAMETER: > + *param_value = param->data; > + *out_param = param; > + return D3D_OK; > + case ST_ARRAY_SELECTOR: > + FIXME("Array selector.\n"); > + break; > + case ST_FXLC: > + FIXME("FXLC not supported yet.\n"); > + break; > + } > + *param_value = NULL; > + *out_param = NULL; > + return E_NOTIMPL; > +} > + > +static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, struct d3dx_state *state) > +{ > + IDirect3DDevice9 *device = effect->device; > + struct d3dx_parameter *param; > + void *param_value; > + HRESULT hr; > + > + TRACE("operation %u, index %u, type %u.\n", state->operation, state->index, state->type); > + hr = d3dx9_get_param_value_ptr(effect, pass, state, &param_value, &param); > + if (FAILED(hr)) > + return hr; > + > + switch (state_table[state->operation].class) > + { > + case SC_RENDERSTATE: > + TRACE("%s: operation %u value %u.\n", state_table[state->operation].name, state_table[state->operation].op, *(DWORD *)param_value); You're not being entirely consistent with those traces. I'd use the style you're using here throughout the file but without the ':'. > + return IDirect3DDevice9_SetRenderState(device, state_table[state->operation].op, *(DWORD *)param_value); > + case SC_FVF: > + TRACE("%s: value %#x.\n", state_table[state->operation].name, *(DWORD *)param_value); > + return IDirect3DDevice9_SetFVF(device, *(DWORD *)param_value); > + case SC_TEXTURESTAGE: > + TRACE("%s: stage %u value %u.\n", state_table[state->operation].name, state->index, *(DWORD *)param_value); > + return IDirect3DDevice9_SetTextureStageState(device, state->index, state_table[state->operation].op, *(DWORD *)param_value); > + case SC_VERTEXSHADER: > + TRACE("%s vertex shader %p.\n", state_table[state->operation].name, *(IDirect3DVertexShader9 **)param_value); > + hr = IDirect3DDevice9_SetVertexShader(device, *(IDirect3DVertexShader9 **)param_value); > + if (FAILED(hr)) > + ERR("Could not set vertex shader.\n"); > + FIXME("Not executing preshader and not setting constants.\n"); > + return hr; > + case SC_PIXELSHADER: > + TRACE("%s pixel shader %p.\n", state_table[state->operation].name, *(IDirect3DPixelShader9 **)param_value); > + hr = IDirect3DDevice9_SetPixelShader(device, *(IDirect3DPixelShader9 **)param_value); > + if (FAILED(hr)) > + ERR("Could not set pixel shader.\n"); > + FIXME("Not executing preshader and not setting constants.\n"); > + return hr; > + case SC_TRANSFORM: > + TRACE("%s %u.\n", state_table[state->operation].name, state->index); > + return IDirect3DDevice9_SetTransform(device, state_table[state->operation].op + state->index, (D3DMATRIX *)param_value); > + case SC_NPATCHMODE: > + TRACE("%s %f.\n", state_table[state->operation].name, *(float *)param_value); > + return IDirect3DDevice9_SetNPatchMode(device, *(float *)param_value); > + default: > + FIXME("%s not handled.\n", state_table[state->operation].name); > + break; > + } > + return D3D_OK; > +} > + > +static HRESULT d3dx9_apply_pass_states(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass) > +{ > + UINT i; I'd prefer "unsigned int" for these kind of loop variables, here and elsewhere in those patches. > + HRESULT ret; > + > + TRACE("Effect %p, pass %p, state_count=%u.\n", effect, pass, pass->state_count); Please drop the '='. While at it, use lowercase for "effect". > + > + ret = D3D_OK; > + for (i = 0; i < pass->state_count; i++) > + { > + HRESULT hr; > + > + hr = d3dx9_apply_state(effect, pass, &pass->states[i]); > + if (FAILED(hr)) > + { > + WARN("Error applying state: %#x.\n", hr); > + ret = hr; > + } > + } > + return ret; > +} > + > static inline struct ID3DXEffectImpl *impl_from_ID3DXEffect(ID3DXEffect *iface) > { > return CONTAINING_RECORD(iface, struct ID3DXEffectImpl, ID3DXEffect_iface); > @@ -3175,18 +3271,15 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW > > static HRESULT WINAPI ID3DXEffectImpl_BeginPass(ID3DXEffect *iface, UINT pass) > { > - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); > - struct d3dx_technique *technique = This->active_technique; > + struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); > + struct d3dx_technique *technique = effect->active_technique; > > - TRACE("iface %p, pass %u\n", This, pass); > + TRACE("iface %p, pass %u\n", effect, pass); > > - if (technique && pass < technique->pass_count && !This->active_pass) > + if (technique && pass < technique->pass_count && !effect->active_pass) > { > - This->active_pass = &technique->passes[pass]; > - > - FIXME("No states applied, yet!\n"); > - > - return D3D_OK; > + effect->active_pass = &technique->passes[pass]; > + return d3dx9_apply_pass_states(effect, effect->active_pass); > } > > WARN("Invalid argument supplied.\n"); > diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c > index 6dd3e00..e415a3c 100644 > --- a/dlls/d3dx9_36/tests/effect.c > +++ b/dlls/d3dx9_36/tests/effect.c > @@ -2875,11 +2875,11 @@ static void test_effect_states(IDirect3DDevice9 *device) > ok(mat.m[0][0] == test_mat.m[0][0], "Unexpected value: %f.\n", mat.m[0][0]); > > hr = effect->lpVtbl->BeginPass(effect, 0); > - ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); > + todo_wine 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"); > + 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); > @@ -2887,11 +2887,11 @@ static void test_effect_states(IDirect3DDevice9 *device) > > 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); > + 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"); > + ok(vshader != NULL, "Got NULL vshader.\n"); > if (vshader) > { > byte_code_size = sizeof(test_effect_states_vshader_buf); > @@ -2921,11 +2921,11 @@ static void test_effect_states(IDirect3DDevice9 *device) > 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); > + 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); > + 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); > @@ -2933,14 +2933,14 @@ static void test_effect_states(IDirect3DDevice9 *device) > > 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); > + 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"); > + todo_wine 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); > -- > 2.5.0

1 0

Re: [PATCH 2/3 try2] user32: Added more dialog owner tests.
by Marvin 02 Mar '16

02 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=21102 Your paranoid android. === w1064 (32 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different === w864 (64 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different === w1064 (64 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different

1 0

Re: [5/5] imm32: Destroy default IME window when all other windows are destroyed in the thread.
by Marvin 02 Mar '16

02 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=21100 Your paranoid android. === wvistau64 (32 bit imm32) === imm32.c:851: Test failed: Expected IME window existence imm32.c:852: Test failed: Expected 00000000, got 00040196 === w2008s64 (32 bit imm32) === imm32.c:851: Test failed: Expected IME window existence imm32.c:852: Test failed: Expected 00000000, got 000800FE === wvistau64 (64 bit imm32) === imm32.c:851: Test failed: Expected IME window existence imm32.c:852: Test failed: Expected 0000000000000000, got 0000000000040196 === w2008s64 (64 bit imm32) === imm32.c:851: Test failed: Expected IME window existence imm32.c:852: Test failed: Expected 0000000000000000, got 00000000000C0108

1 0

Re: [PATCH 2/6] dxgi: Add feature level support.
by Józef Kucia 02 Mar '16

02 Mar '16

On Wed, Mar 2, 2016 at 12:50 AM, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> > --- > dlls/d3d11/d3d11_main.c | 21 +++++++++++--- > dlls/d3d11/d3d11_private.h | 5 +++- > dlls/dxgi/adapter.c | 3 +- > dlls/dxgi/device.c | 10 +++++-- > dlls/dxgi/dxgi.spec | 2 +- > dlls/dxgi/dxgi_main.c | 10 ++++--- > dlls/dxgi/dxgi_private.h | 7 +++-- > dlls/dxgi/utils.c | 71 ++++++++++++++++++++++++++++++++++++++++------ > 8 files changed, 104 insertions(+), 25 deletions(-) > > diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c > index 8602f00..0eeaf9f 100644 > --- a/dlls/d3d11/d3d11_main.c > +++ b/dlls/d3d11/d3d11_main.c > @@ -101,11 +101,26 @@ static HRESULT WINAPI layer_create(enum dxgi_device_layer_id id, void **layer_ba > return S_OK; > } > > +static void WINAPI layer_set_max_sm(enum dxgi_device_layer_id id, void *device, unsigned int max_sm) > +{ > + struct d3d_device *d3d_device = device; > + > + TRACE("id %#x, device %p, max_sm %u.\n", id, device, max_sm); > + > + if (id != DXGI_DEVICE_LAYER_D3D10_DEVICE) > + { > + WARN("Unknown layer id %#x.\n", id); > + return; > + } > + > + d3d_device->max_sm = max_sm; > +} > + > HRESULT WINAPI D3D11CoreRegisterLayers(void) > { > static const struct dxgi_device_layer layers[] = > { > - {DXGI_DEVICE_LAYER_D3D10_DEVICE, layer_init, layer_get_size, layer_create}, > + {DXGI_DEVICE_LAYER_D3D10_DEVICE, layer_init, layer_get_size, layer_create, layer_set_max_sm}, > }; > > DXGID3D10RegisterLayers(layers, sizeof(layers)/sizeof(*layers)); > @@ -123,10 +138,8 @@ HRESULT WINAPI D3D11CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapte > TRACE("factory %p, adapter %p, flags %#x, feature_levels %p, levels %u, device %p.\n", > factory, adapter, flags, feature_levels, levels, device); > > - FIXME("Ignoring feature levels.\n"); > - > d3d11 = GetModuleHandleA("d3d11.dll"); > - hr = DXGID3D10CreateDevice(d3d11, factory, adapter, flags, 0, (void **)&dxgi_device); > + hr = DXGID3D10CreateDevice(d3d11, factory, adapter, flags, feature_levels, levels, (void **)&dxgi_device); > if (FAILED(hr)) > { > WARN("Failed to create device, returning %#x.\n", hr); > diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h > index 9d5fd8f..606d84a 100644 > --- a/dlls/d3d11/d3d11_private.h > +++ b/dlls/d3d11/d3d11_private.h > @@ -394,6 +394,8 @@ struct d3d_device > IUnknown *outer_unk; > LONG refcount; > > + unsigned int max_sm; > + > struct d3d11_immediate_context immediate_context; > > struct wined3d_device_parent device_parent; > @@ -453,10 +455,11 @@ struct dxgi_device_layer > UINT (WINAPI *get_size)(enum dxgi_device_layer_id id, struct layer_get_size_args *args, DWORD unknown0); > HRESULT (WINAPI *create)(enum dxgi_device_layer_id id, void **layer_base, DWORD unknown0, > void *device_object, REFIID riid, void **device_layer); > + void (WINAPI *set_max_sm)(enum dxgi_device_layer_id id, void *device, unsigned int max_sm); > }; > > HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, IDXGIAdapter *adapter, > - UINT flags, void *unknown0, void **device); > + unsigned int flags, const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count, void **device); > HRESULT WINAPI DXGID3D10RegisterLayers(const struct dxgi_device_layer *layers, UINT layer_count); > > #endif /* __WINE_D3D11_PRIVATE_H */ > diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c > index 3e58fd2..91a8048 100644 > --- a/dlls/dxgi/adapter.c > +++ b/dlls/dxgi/adapter.c > @@ -200,6 +200,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IDXGIAdapter1 *iface, DXGI > static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IDXGIAdapter1 *iface, > REFGUID guid, LARGE_INTEGER *umd_version) > { > + static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_10_0; > struct dxgi_adapter *adapter = impl_from_IDXGIAdapter1(iface); > struct wined3d_adapter_identifier adapter_id; > HRESULT hr; > @@ -214,7 +215,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IDXGIAdapter > return DXGI_ERROR_UNSUPPORTED; > } > > - if (FAILED(hr = dxgi_check_d3d10_support(adapter->parent, adapter))) > + if (FAILED(hr = dxgi_check_feature_level_support(adapter->parent, adapter, &feature_level, 1))) > return DXGI_ERROR_UNSUPPORTED; > > if (umd_version) > diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c > index 8645b02..9929c22 100644 > --- a/dlls/dxgi/device.c > +++ b/dlls/dxgi/device.c > @@ -366,13 +366,15 @@ static const struct IWineDXGIDeviceVtbl dxgi_device_vtbl = > }; > > HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *layer, > - IDXGIFactory *factory, IDXGIAdapter *adapter) > + IDXGIFactory *factory, IDXGIAdapter *adapter, > + const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) > { > struct wined3d_device_parent *wined3d_device_parent; > struct wined3d_swapchain_desc swapchain_desc; > IWineDXGIDeviceParent *dxgi_device_parent; > struct dxgi_adapter *dxgi_adapter; > struct dxgi_factory *dxgi_factory; > + unsigned int max_sm; > void *layer_base; > HRESULT hr; > > @@ -416,12 +418,12 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l > wined3d_device_parent = IWineDXGIDeviceParent_get_wined3d_device_parent(dxgi_device_parent); > IWineDXGIDeviceParent_Release(dxgi_device_parent); > > - if (FAILED(hr = dxgi_check_d3d10_support(dxgi_factory, dxgi_adapter))) > + if (!(max_sm = dxgi_check_feature_level_support(dxgi_factory, dxgi_adapter, feature_levels, level_count))) > { > IUnknown_Release(device->child_layer); > wined3d_private_store_cleanup(&device->private_store); > wined3d_mutex_unlock(); > - return hr; > + return E_FAIL; > } > > FIXME("Ignoring adapter type.\n"); > @@ -437,6 +439,8 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l > return hr; > } > > + layer->set_max_sm(layer->id, device->child_layer, max_sm); > + > memset(&swapchain_desc, 0, sizeof(swapchain_desc)); > swapchain_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; > swapchain_desc.device_window = dxgi_factory_get_device_window(dxgi_factory); > diff --git a/dlls/dxgi/dxgi.spec b/dlls/dxgi/dxgi.spec > index 2232f88..3270a53 100644 > --- a/dlls/dxgi/dxgi.spec > +++ b/dlls/dxgi/dxgi.spec > @@ -1,4 +1,4 @@ > @ stdcall CreateDXGIFactory(ptr ptr) > @ stdcall CreateDXGIFactory1(ptr ptr) > -@ stdcall DXGID3D10CreateDevice(ptr ptr ptr long ptr ptr) > +@ stdcall DXGID3D10CreateDevice(ptr ptr ptr long ptr long ptr) > @ stdcall DXGID3D10RegisterLayers(ptr long) > diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c > index c8d049a..a4c1362 100644 > --- a/dlls/dxgi/dxgi_main.c > +++ b/dlls/dxgi/dxgi_main.c > @@ -125,7 +125,7 @@ static HRESULT register_d3d10core_layers(HMODULE d3d10core) > } > > HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, IDXGIAdapter *adapter, > - UINT flags, void *unknown0, void **device) > + unsigned int flags, const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count, void **device) > { > struct layer_get_size_args get_size_args; > struct dxgi_device *dxgi_device; > @@ -134,8 +134,10 @@ HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, I > DWORD count; > HRESULT hr; > > - TRACE("d3d10core %p, factory %p, adapter %p, flags %#x, unknown0 %p, device %p.\n", > - d3d10core, factory, adapter, flags, unknown0, device); > + TRACE("d3d10core %p, factory %p, adapter %p, flags %#x, feature_levels %p, level_count %u, device %p.\n", > + d3d10core, factory, adapter, flags, feature_levels, level_count, device); > + > + FIXME("Ignoring flags.\n"); > > hr = register_d3d10core_layers(d3d10core); > if (FAILED(hr)) > @@ -178,7 +180,7 @@ HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, I > return E_OUTOFMEMORY; > } > > - hr = dxgi_device_init(dxgi_device, &d3d10_layer, factory, adapter); > + hr = dxgi_device_init(dxgi_device, &d3d10_layer, factory, adapter, feature_levels, level_count); > if (FAILED(hr)) > { > WARN("Failed to initialize device, hr %#x.\n", hr); > diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h > index 59b436b..22910cf 100644 > --- a/dlls/dxgi/dxgi_private.h > +++ b/dlls/dxgi/dxgi_private.h > @@ -73,6 +73,7 @@ struct dxgi_device_layer > UINT (WINAPI *get_size)(enum dxgi_device_layer_id id, struct layer_get_size_args *args, DWORD unknown0); > HRESULT (WINAPI *create)(enum dxgi_device_layer_id id, void **layer_base, DWORD unknown0, > void *device_object, REFIID riid, void **device_layer); > + void (WINAPI *set_max_sm)(enum dxgi_device_layer_id id, void *device, unsigned int max_sm); > }; > > /* TRACE helper functions */ > @@ -120,7 +121,8 @@ struct dxgi_device > }; > > HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *layer, > - IDXGIFactory *factory, IDXGIAdapter *adapter) DECLSPEC_HIDDEN; > + IDXGIFactory *factory, IDXGIAdapter *adapter, > + const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) DECLSPEC_HIDDEN; > > /* IDXGIOutput */ > struct dxgi_output > @@ -174,6 +176,7 @@ struct dxgi_surface > HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, > IUnknown *outer, struct wined3d_resource *wined3d_resource) DECLSPEC_HIDDEN; > > -HRESULT dxgi_check_d3d10_support(struct dxgi_factory *factory, struct dxgi_adapter *adapter) DECLSPEC_HIDDEN; > +HRESULT dxgi_check_feature_level_support(struct dxgi_factory *factory, struct dxgi_adapter *adapter, > + const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) DECLSPEC_HIDDEN; > > #endif /* __WINE_DXGI_PRIVATE_H */ > diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c > index 92a049f..d71eb31 100644 > --- a/dlls/dxgi/utils.c > +++ b/dlls/dxgi/utils.c > @@ -434,24 +434,77 @@ HRESULT dxgi_set_private_data_interface(struct wined3d_private_store *store, > return hr; > } > > -HRESULT dxgi_check_d3d10_support(struct dxgi_factory *factory, struct dxgi_adapter *adapter) > +HRESULT dxgi_check_feature_level_support(struct dxgi_factory *factory, struct dxgi_adapter *adapter, > + const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) > { > + static const struct > + { > + D3D_FEATURE_LEVEL feature_level; > + unsigned int sm; > + } > + feature_levels_sm[] = > + { > + {D3D_FEATURE_LEVEL_11_1, 5}, > + {D3D_FEATURE_LEVEL_11_0, 5}, > + {D3D_FEATURE_LEVEL_10_1, 4}, > + {D3D_FEATURE_LEVEL_10_0, 4}, > + {D3D_FEATURE_LEVEL_9_3, 3}, > + {D3D_FEATURE_LEVEL_9_2, 2}, > + {D3D_FEATURE_LEVEL_9_1, 2}, > + }; > + static const D3D_FEATURE_LEVEL default_feature_levels[] = > + { > + D3D_FEATURE_LEVEL_11_0, > + D3D_FEATURE_LEVEL_10_1, > + D3D_FEATURE_LEVEL_10_0, > + D3D_FEATURE_LEVEL_9_3, > + D3D_FEATURE_LEVEL_9_2, > + D3D_FEATURE_LEVEL_9_1, > + }; > + unsigned int selected_sm = 0; > + unsigned int i, j; > WINED3DCAPS caps; > HRESULT hr; > > FIXME("Ignoring adapter type.\n"); > > + if (!feature_levels) > + { > + feature_levels = default_feature_levels; > + level_count = sizeof(default_feature_levels) / sizeof(default_feature_levels[0]); > + } > + > wined3d_mutex_lock(); > hr = wined3d_get_device_caps(factory->wined3d, adapter->ordinal, WINED3D_DEVICE_TYPE_HAL, &caps); > - if (FAILED(hr) || caps.VertexShaderVersion < 4 || caps.PixelShaderVersion < 4) > + wined3d_mutex_unlock(); > + > + if (FAILED(hr)) > + level_count = 0; > + > + for (i = 0; i < level_count; ++i) > { > - FIXME_(winediag)("Direct3D 10 is not supported on this GPU with the current shader backend.\n"); > - if (SUCCEEDED(hr)) > - hr = E_FAIL; > - wined3d_mutex_unlock(); > - return hr; > + for (j = 0; j < sizeof(feature_levels_sm) / sizeof(feature_levels_sm[0]); ++j) > + { > + if (feature_levels[i] == feature_levels_sm[j].feature_level) > + { > + if (caps.VertexShaderVersion >= feature_levels_sm[j].sm > + && caps.PixelShaderVersion >= feature_levels_sm[j].sm) > + { > + selected_sm = feature_levels_sm[j].sm; > + TRACE("Choosing supported feature level %#x (SM%u).\n", feature_levels[i], selected_sm); > + } > + break; > + } > + } > + if (selected_sm) > + break; > + > + if (j == sizeof(feature_levels_sm) / sizeof(feature_levels_sm[0])) > + FIXME("Unexpected feature level %#x.\n", feature_levels[i]); > } > - wined3d_mutex_unlock(); > + if (!selected_sm) > + FIXME_(winediag)("None of the requested D3D feature levels is supported on this GPU " > + "with the current shader backend.\n"); > > - return S_OK; > + return selected_sm; > } > -- > 2.4.10 > > > Not that this is necessarily bad way to implement feature levels, but have you considered exposing wined3d_d3d_level from wined3d?

3 2

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

02 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=21099 Your paranoid android. === wvistau64 (32 bit imm32) === imm32.c:851: Test failed: Expected IME window existence imm32.c:852: Test failed: Expected 00000000, got 00040196 === w2008s64 (32 bit imm32) === imm32.c:851: Test failed: Expected IME window existence imm32.c:852: Test failed: Expected 00000000, got 000800FE === wvistau64 (64 bit imm32) === imm32.c:851: Test failed: Expected IME window existence imm32.c:852: Test failed: Expected 0000000000000000, got 0000000000040170 === w2008s64 (64 bit imm32) === imm32.c:851: Test failed: Expected IME window existence imm32.c:852: Test failed: Expected 0000000000000000, got 00000000000C0108

1 0