March 2020 - Wine-commits - list.winehq.org

Zebediah Figura : ddraw: Retrieve lights from the primary stateblock.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: e7cac8496a75e45d0308fd4a0d4f488b54020413 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7cac8496a75e45d0308fd4a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 28 14:18:45 2020 -0600 ddraw: Retrieve lights from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 9e234fd065..56debb7175 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5579,17 +5579,17 @@ static HRESULT WINAPI d3d_device7_SetLight_FPUPreserve(IDirect3DDevice7 *iface, static HRESULT d3d_device7_GetLight(IDirect3DDevice7 *iface, DWORD light_idx, D3DLIGHT7 *light) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); - HRESULT rc; + BOOL enabled; + HRESULT hr; TRACE("iface %p, light_idx %u, light %p.\n", iface, light_idx, light); wined3d_mutex_lock(); /* Note: D3DLIGHT7 is compatible with struct wined3d_light. */ - rc = wined3d_device_get_light(device->wined3d_device, light_idx, (struct wined3d_light *)light); + hr = wined3d_stateblock_get_light(device->state, light_idx, (struct wined3d_light *)light, &enabled); wined3d_mutex_unlock(); - /* Translate the result. WineD3D returns other values than D3D7 */ - return hr_ddraw_from_wined3d(rc); + return hr_ddraw_from_wined3d(hr); } static HRESULT WINAPI d3d_device7_GetLight_FPUSetup(IDirect3DDevice7 *iface, DWORD light_idx, D3DLIGHT7 *light) @@ -6460,6 +6460,7 @@ static HRESULT WINAPI d3d_device7_LightEnable_FPUPreserve(IDirect3DDevice7 *ifac static HRESULT d3d_device7_GetLightEnable(IDirect3DDevice7 *iface, DWORD light_idx, BOOL *enabled) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); + struct wined3d_light light; HRESULT hr; TRACE("iface %p, light_idx %u, enabled %p.\n", iface, light_idx, enabled); @@ -6468,7 +6469,7 @@ static HRESULT d3d_device7_GetLightEnable(IDirect3DDevice7 *iface, DWORD light_i return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); - hr = wined3d_device_get_light_enable(device->wined3d_device, light_idx, enabled); + hr = wined3d_stateblock_get_light(device->state, light_idx, &light, enabled); wined3d_mutex_unlock(); return hr_ddraw_from_wined3d(hr);

1 0

Zebediah Figura : ddraw: Stop setting the device state in d3d_device7_SetLight() and d3d_device7_LightEnable().
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: 194b1234a97e9fa9b6cdc445d2e92bdbc638094c URL: https://source.winehq.org/git/wine.git/?a=commit;h=194b1234a97e9fa9b6cdc445… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 28 14:18:46 2020 -0600 ddraw: Stop setting the device state in d3d_device7_SetLight() and d3d_device7_LightEnable(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 56debb7175..39626157a5 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5539,8 +5539,6 @@ static HRESULT d3d_device7_SetLight(IDirect3DDevice7 *iface, DWORD light_idx, D3 wined3d_mutex_lock(); /* Note: D3DLIGHT7 is compatible with struct wined3d_light. */ hr = wined3d_stateblock_set_light(device->update_state, light_idx, (const struct wined3d_light *)light); - if (SUCCEEDED(hr) && !device->recording) - hr = wined3d_device_set_light(device->wined3d_device, light_idx, (const struct wined3d_light *)light); wined3d_mutex_unlock(); return hr_ddraw_from_wined3d(hr); @@ -6417,8 +6415,6 @@ static HRESULT d3d_device7_LightEnable(IDirect3DDevice7 *iface, DWORD light_idx, wined3d_mutex_lock(); hr = wined3d_stateblock_set_light_enable(device->update_state, light_idx, enabled); - if (SUCCEEDED(hr) && !device->recording) - hr = wined3d_device_set_light_enable(device->wined3d_device, light_idx, enabled); wined3d_mutex_unlock(); return hr_ddraw_from_wined3d(hr);

1 0

Matteo Bruni : wined3d: Introduce a stateblock flag for lights.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: 0d2a1eccedac5b615fbf1b28ae86ed36eab930a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d2a1eccedac5b615fbf1b28… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 2 14:02:45 2020 +0100 wined3d: Introduce a stateblock flag for lights. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 15 +++++++++------ dlls/wined3d/stateblock.c | 31 ++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 31 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 660ba777ef..639e94a624 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3904,14 +3904,17 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, wined3d_device_set_ps_consts_b(device, range.offset, range.size, &state->ps_consts_b[range.offset]); } - for (i = 0; i < ARRAY_SIZE(state->light_state->light_map); ++i) + if (changed->lights) { - const struct wined3d_light_info *light; - - LIST_FOR_EACH_ENTRY(light, &state->light_state->light_map[i], struct wined3d_light_info, entry) + for (i = 0; i < ARRAY_SIZE(state->light_state->light_map); ++i) { - wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); - wined3d_device_set_light_enable(device, light->OriginalIndex, light->glIndex != -1); + const struct wined3d_light_info *light; + + LIST_FOR_EACH_ENTRY(light, &state->light_state->light_map[i], struct wined3d_light_info, entry) + { + wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); + wined3d_device_set_light_enable(device, light->OriginalIndex, light->glIndex != -1); + } } } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 69210e1fba..c47a7323b1 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -209,6 +209,7 @@ static void stateblock_savedstates_set_all(struct wined3d_saved_states *states, states->vertexShader = 1; states->scissorRect = 1; states->blend_state = 1; + states->lights = 1; states->streamSource = 0xffff; states->streamFreq = 0xffff; @@ -262,6 +263,7 @@ static void stateblock_savedstates_set_vertex(struct wined3d_saved_states *state states->vertexDecl = 1; states->vertexShader = 1; states->blend_state = 1; + states->lights = 1; for (i = 0; i < ARRAY_SIZE(vertex_states_render); ++i) { @@ -982,7 +984,8 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, stateblock->stateblock_state.ps = state->ps; } - wined3d_state_record_lights(stateblock->stateblock_state.light_state, state->light_state); + if (stateblock->changed.lights) + wined3d_state_record_lights(stateblock->stateblock_state.light_state, state->light_state); if (stateblock->changed.blend_state && stateblock->stateblock_state.blend_state != state->blend_state) { @@ -1050,20 +1053,23 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, wined3d_device_set_vs_consts_b(device, idx, 1, &stateblock->stateblock_state.vs_consts_b[idx]); } - for (i = 0; i < ARRAY_SIZE(stateblock->stateblock_state.light_state->light_map); ++i) + if (stateblock->changed.lights) { - const struct wined3d_light_info *light; - struct wined3d_light_info *new_light; - - LIST_FOR_EACH_ENTRY(light, &stateblock->stateblock_state.light_state->light_map[i], struct wined3d_light_info, entry) + for (i = 0; i < ARRAY_SIZE(stateblock->stateblock_state.light_state->light_map); ++i) { - if (SUCCEEDED(wined3d_light_state_set_light(state->light_state, light->OriginalIndex, - &light->OriginalParms, &new_light))) + const struct wined3d_light_info *light; + struct wined3d_light_info *new_light; + + LIST_FOR_EACH_ENTRY(light, &stateblock->stateblock_state.light_state->light_map[i], struct wined3d_light_info, entry) { - wined3d_light_state_enable_light(state->light_state, &device->adapter->d3d_info, new_light, light->glIndex != -1); + if (SUCCEEDED(wined3d_light_state_set_light(state->light_state, light->OriginalIndex, + &light->OriginalParms, &new_light))) + { + wined3d_light_state_enable_light(state->light_state, &device->adapter->d3d_info, new_light, light->glIndex != -1); + } + wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); + wined3d_device_set_light_enable(device, light->OriginalIndex, light->glIndex != -1); } - wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); - wined3d_device_set_light_enable(device, light->OriginalIndex, light->glIndex != -1); } } @@ -1708,6 +1714,7 @@ HRESULT CDECL wined3d_stateblock_set_stream_source_freq(struct wined3d_statebloc stateblock->changed.streamFreq |= 1u << stream_idx; return WINED3D_OK; } + HRESULT CDECL wined3d_stateblock_set_light(struct wined3d_stateblock *stateblock, UINT light_idx, const struct wined3d_light *light) { @@ -1744,6 +1751,7 @@ HRESULT CDECL wined3d_stateblock_set_light(struct wined3d_stateblock *stateblock return WINED3DERR_INVALIDCALL; } + stateblock->changed.lights = 1; return wined3d_light_state_set_light(stateblock->stateblock_state.light_state, light_idx, light, &object); } @@ -1761,6 +1769,7 @@ HRESULT CDECL wined3d_stateblock_set_light_enable(struct wined3d_stateblock *sta return hr; } wined3d_light_state_enable_light(light_state, &stateblock->device->adapter->d3d_info, light_info, enable); + stateblock->changed.lights = 1; return S_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 744e647008..c658f5104c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3937,7 +3937,8 @@ struct wined3d_saved_states DWORD scissorRect : 1; DWORD store_stream_offset : 1; DWORD blend_state : 1; - DWORD padding : 3; + DWORD lights : 1; + DWORD padding : 2; }; struct StageState {

1 0

Matteo Bruni : wined3d: Introduce a global stateblock flag for transforms.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: a8c44bd94c9e4ff7cbbe07eed071f4413227f31e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8c44bd94c9e4ff7cbbe07ee… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 2 14:02:46 2020 +0100 wined3d: Introduce a global stateblock flag for transforms. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 15 +++++++++------ dlls/wined3d/stateblock.c | 26 ++++++++++++++++---------- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 27 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 639e94a624..99fbf21ada 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3977,14 +3977,17 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, } } - for (i = 0; i < ARRAY_SIZE(changed->transform); ++i) + if (changed->transforms) { - map = changed->transform[i]; - while (map) + for (i = 0; i < ARRAY_SIZE(changed->transform); ++i) { - j = wined3d_bit_scan(&map); - idx = i * word_bit_count + j; - wined3d_device_set_transform(device, idx, &state->transforms[idx]); + map = changed->transform[i]; + while (map) + { + j = wined3d_bit_scan(&map); + idx = i * word_bit_count + j; + wined3d_device_set_transform(device, idx, &state->transforms[idx]); + } } } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index c47a7323b1..6e3a473782 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -210,6 +210,7 @@ static void stateblock_savedstates_set_all(struct wined3d_saved_states *states, states->scissorRect = 1; states->blend_state = 1; states->lights = 1; + states->transforms = 1; states->streamSource = 0xffff; states->streamFreq = 0xffff; @@ -807,14 +808,16 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, stateblock->stateblock_state.ps_consts_b[idx] = state->ps_consts_b[idx]; } - /* Others + Render & Texture */ - for (i = 0; i < stateblock->num_contained_transform_states; ++i) + if (stateblock->changed.transforms) { - enum wined3d_transform_state transform = stateblock->contained_transform_states[i]; + for (i = 0; i < stateblock->num_contained_transform_states; ++i) + { + enum wined3d_transform_state transform = stateblock->contained_transform_states[i]; - TRACE("Updating transform %#x.\n", transform); + TRACE("Updating transform %#x.\n", transform); - stateblock->stateblock_state.transforms[transform] = state->transforms[transform]; + stateblock->stateblock_state.transforms[transform] = state->transforms[transform]; + } } if (stateblock->changed.indices @@ -1177,13 +1180,15 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, wined3d_device_set_sampler_state(device, stage, sampler_state, value); } - /* Transform states. */ - for (i = 0; i < stateblock->num_contained_transform_states; ++i) + if (stateblock->changed.transforms) { - enum wined3d_transform_state transform = stateblock->contained_transform_states[i]; + for (i = 0; i < stateblock->num_contained_transform_states; ++i) + { + enum wined3d_transform_state transform = stateblock->contained_transform_states[i]; - state->transforms[transform] = stateblock->stateblock_state.transforms[transform]; - wined3d_device_set_transform(device, transform, &stateblock->stateblock_state.transforms[transform]); + state->transforms[transform] = stateblock->stateblock_state.transforms[transform]; + wined3d_device_set_transform(device, transform, &stateblock->stateblock_state.transforms[transform]); + } } if (stateblock->changed.indices) @@ -1579,6 +1584,7 @@ void CDECL wined3d_stateblock_set_transform(struct wined3d_stateblock *statebloc stateblock->stateblock_state.transforms[d3dts] = *matrix; stateblock->changed.transform[d3dts >> 5] |= 1u << (d3dts & 0x1f); + stateblock->changed.transforms = 1; } void CDECL wined3d_stateblock_multiply_transform(struct wined3d_stateblock *stateblock, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c658f5104c..f266d2a690 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3938,7 +3938,8 @@ struct wined3d_saved_states DWORD store_stream_offset : 1; DWORD blend_state : 1; DWORD lights : 1; - DWORD padding : 2; + DWORD transforms : 1; + DWORD padding : 1; }; struct StageState {

1 0

Matteo Bruni : wined3d: Optimize setting shader constants in wined3d_stateblock_apply().
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: ac142679eec0322681839a4eecd4b2371cb792eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac142679eec0322681839a4e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 2 14:02:47 2020 +0100 wined3d: Optimize setting shader constants in wined3d_stateblock_apply(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 82 +++++++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 6e3a473782..2c3ff65222 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1005,12 +1005,12 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, struct wined3d_stateblock *device_state) { - const unsigned int word_bit_count = sizeof(*stateblock->changed.vs_consts_f) * CHAR_BIT; struct wined3d_stateblock_state *state = &device_state->stateblock_state; struct wined3d_device *device = stateblock->device; struct wined3d_blend_state *blend_state; struct wined3d_color colour; - unsigned int i, j, idx; + struct wined3d_range range; + unsigned int i, start; BOOL set_blend_state; DWORD map; @@ -1026,34 +1026,37 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, wined3d_device_set_vertex_shader(device, stateblock->stateblock_state.vs); } - for (i = 0; i < ARRAY_SIZE(stateblock->changed.vs_consts_f); ++i) + for (start = 0; ; start = range.offset + range.size) { - map = stateblock->changed.vs_consts_f[i]; - - while (map) - { - j = wined3d_bit_scan(&map); - idx = i * word_bit_count + j; + if (!wined3d_bitmap_get_range(stateblock->changed.vs_consts_f, WINED3D_MAX_VS_CONSTS_F, start, &range)) + break; - state->vs_consts_f[idx] = stateblock->stateblock_state.vs_consts_f[idx]; - wined3d_device_set_vs_consts_f(device, idx, 1, &stateblock->stateblock_state.vs_consts_f[idx]); - } + memcpy(&state->vs_consts_f[range.offset], &stateblock->stateblock_state.vs_consts_f[range.offset], + sizeof(*state->vs_consts_f) * range.size); + wined3d_device_set_vs_consts_f(device, range.offset, range.size, + &stateblock->stateblock_state.vs_consts_f[range.offset]); } map = stateblock->changed.vertexShaderConstantsI; - while (map) + for (start = 0; ; start = range.offset + range.size) { - idx = wined3d_bit_scan(&map); + if (!wined3d_bitmap_get_range(&map, WINED3D_MAX_CONSTS_I, start, &range)) + break; - state->vs_consts_i[idx] = stateblock->stateblock_state.vs_consts_i[idx]; - wined3d_device_set_vs_consts_i(device, idx, 1, &stateblock->stateblock_state.vs_consts_i[idx]); + memcpy(&state->vs_consts_i[range.offset], &stateblock->stateblock_state.vs_consts_i[range.offset], + sizeof(*state->vs_consts_i) * range.size); + wined3d_device_set_vs_consts_i(device, range.offset, range.size, + &stateblock->stateblock_state.vs_consts_i[range.offset]); } map = stateblock->changed.vertexShaderConstantsB; - while (map) + for (start = 0; ; start = range.offset + range.size) { - idx = wined3d_bit_scan(&map); + if (!wined3d_bitmap_get_range(&map, WINED3D_MAX_CONSTS_B, start, &range)) + break; - state->vs_consts_b[idx] = stateblock->stateblock_state.vs_consts_b[idx]; - wined3d_device_set_vs_consts_b(device, idx, 1, &stateblock->stateblock_state.vs_consts_b[idx]); + memcpy(&state->vs_consts_b[range.offset], &stateblock->stateblock_state.vs_consts_b[range.offset], + sizeof(*state->vs_consts_b) * range.size); + wined3d_device_set_vs_consts_b(device, range.offset, range.size, + &stateblock->stateblock_state.vs_consts_b[range.offset]); } if (stateblock->changed.lights) @@ -1086,34 +1089,37 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, wined3d_device_set_pixel_shader(device, stateblock->stateblock_state.ps); } - for (i = 0; i < ARRAY_SIZE(stateblock->changed.ps_consts_f); ++i) + for (start = 0; ; start = range.offset + range.size) { - map = stateblock->changed.ps_consts_f[i]; - - while (map) - { - j = wined3d_bit_scan(&map); - idx = i * word_bit_count + j; + if (!wined3d_bitmap_get_range(stateblock->changed.ps_consts_f, WINED3D_MAX_PS_CONSTS_F, start, &range)) + break; - state->ps_consts_f[idx] = stateblock->stateblock_state.ps_consts_f[idx]; - wined3d_device_set_ps_consts_f(device, idx, 1, &stateblock->stateblock_state.ps_consts_f[idx]); - } + memcpy(&state->ps_consts_f[range.offset], &stateblock->stateblock_state.ps_consts_f[range.offset], + sizeof(*state->ps_consts_f) * range.size); + wined3d_device_set_ps_consts_f(device, range.offset, range.size, + &stateblock->stateblock_state.ps_consts_f[range.offset]); } map = stateblock->changed.pixelShaderConstantsI; - while (map) + for (start = 0; ; start = range.offset + range.size) { - idx = wined3d_bit_scan(&map); + if (!wined3d_bitmap_get_range(&map, WINED3D_MAX_CONSTS_I, start, &range)) + break; - state->ps_consts_i[idx] = stateblock->stateblock_state.ps_consts_i[idx]; - wined3d_device_set_ps_consts_i(device, idx, 1, &stateblock->stateblock_state.ps_consts_i[idx]); + memcpy(&state->ps_consts_i[range.offset], &stateblock->stateblock_state.ps_consts_i[range.offset], + sizeof(*state->ps_consts_i) * range.size); + wined3d_device_set_ps_consts_i(device, range.offset, range.size, + &stateblock->stateblock_state.ps_consts_i[range.offset]); } map = stateblock->changed.pixelShaderConstantsB; - while (map) + for (start = 0; ; start = range.offset + range.size) { - idx = wined3d_bit_scan(&map); + if (!wined3d_bitmap_get_range(&map, WINED3D_MAX_CONSTS_B, start, &range)) + break; - state->ps_consts_b[idx] = stateblock->stateblock_state.ps_consts_b[idx]; - wined3d_device_set_ps_consts_b(device, idx, 1, &stateblock->stateblock_state.ps_consts_b[idx]); + memcpy(&state->ps_consts_b[range.offset], &stateblock->stateblock_state.ps_consts_b[range.offset], + sizeof(*state->ps_consts_b) * range.size); + wined3d_device_set_ps_consts_b(device, range.offset, range.size, + &stateblock->stateblock_state.ps_consts_b[range.offset]); } if ((set_blend_state = stateblock->changed.blend_state

1 0

Matteo Bruni : wined3d: Optimize setting shader constants in wined3d_stateblock_capture().
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: 7f2aee857088547099e91256e3ff66d7d1d1d17b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f2aee857088547099e91256… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 2 14:02:48 2020 +0100 wined3d: Optimize setting shader constants in wined3d_stateblock_capture(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 80 +++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 48 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 2c3ff65222..208a1f0606 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -720,9 +720,9 @@ static void wined3d_state_record_lights(struct wined3d_light_state *dst_state, void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, const struct wined3d_stateblock *device_state) { - const unsigned int word_bit_count = sizeof(*stateblock->changed.vs_consts_f) * CHAR_BIT; const struct wined3d_stateblock_state *state = &device_state->stateblock_state; - unsigned int i, j, idx; + struct wined3d_range range; + unsigned int i, start; DWORD map; TRACE("stateblock %p, device_state %p.\n", stateblock, device_state); @@ -738,74 +738,58 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, stateblock->stateblock_state.vs = state->vs; } - for (i = 0; i < ARRAY_SIZE(stateblock->changed.vs_consts_f); ++i) + for (start = 0; ; start = range.offset + range.size) { - map = stateblock->changed.vs_consts_f[i]; - - while (map) - { - j = wined3d_bit_scan(&map); - idx = i * word_bit_count + j; + if (!wined3d_bitmap_get_range(stateblock->changed.vs_consts_f, WINED3D_MAX_VS_CONSTS_F, start, &range)) + break; - TRACE("Setting vs_consts_f[%u] to %s.\n", idx, debug_vec4(&state->vs_consts_f[idx])); - stateblock->stateblock_state.vs_consts_f[idx] = state->vs_consts_f[idx]; - } + memcpy(&stateblock->stateblock_state.vs_consts_f[range.offset], &state->vs_consts_f[range.offset], + sizeof(*state->vs_consts_f) * range.size); } - map = stateblock->changed.vertexShaderConstantsI; - while (map) + for (start = 0; ; start = range.offset + range.size) { - idx = wined3d_bit_scan(&map); - - TRACE("Setting vs_consts_i[%u] to %s.\n", idx, debug_ivec4(&state->vs_consts_i[idx])); + if (!wined3d_bitmap_get_range(&map, WINED3D_MAX_CONSTS_I, start, &range)) + break; - stateblock->stateblock_state.vs_consts_i[idx] = state->vs_consts_i[idx]; + memcpy(&stateblock->stateblock_state.vs_consts_i[range.offset], &state->vs_consts_i[range.offset], + sizeof(*state->vs_consts_i) * range.size); } - map = stateblock->changed.vertexShaderConstantsB; - while (map) + for (start = 0; ; start = range.offset + range.size) { - idx = wined3d_bit_scan(&map); - - TRACE("Setting vs_consts_b[%u] to %s.\n", - idx, state->vs_consts_b[idx] ? "TRUE" : "FALSE"); + if (!wined3d_bitmap_get_range(&map, WINED3D_MAX_CONSTS_B, start, &range)) + break; - stateblock->stateblock_state.vs_consts_b[idx] = state->vs_consts_b[idx]; + memcpy(&stateblock->stateblock_state.vs_consts_b[range.offset], &state->vs_consts_b[range.offset], + sizeof(*state->vs_consts_b) * range.size); } - for (i = 0; i < ARRAY_SIZE(stateblock->changed.ps_consts_f); ++i) + for (start = 0; ; start = range.offset + range.size) { - map = stateblock->changed.ps_consts_f[i]; - - while (map) - { - j = wined3d_bit_scan(&map); - idx = i * word_bit_count + j; + if (!wined3d_bitmap_get_range(stateblock->changed.ps_consts_f, WINED3D_MAX_PS_CONSTS_F, start, &range)) + break; - TRACE("Setting ps_consts_f[%u] to %s.\n", idx, debug_vec4(&state->ps_consts_f[idx])); - stateblock->stateblock_state.ps_consts_f[idx] = state->ps_consts_f[idx]; - } + memcpy(&stateblock->stateblock_state.ps_consts_f[range.offset], &state->ps_consts_f[range.offset], + sizeof(*state->ps_consts_f) * range.size); } - map = stateblock->changed.pixelShaderConstantsI; - while (map) + for (start = 0; ; start = range.offset + range.size) { - idx = wined3d_bit_scan(&map); - - TRACE("Setting ps_consts_i[%u] to %s.\n", idx, debug_ivec4(&state->ps_consts_i[idx])); + if (!wined3d_bitmap_get_range(&map, WINED3D_MAX_CONSTS_I, start, &range)) + break; - stateblock->stateblock_state.ps_consts_i[idx] = state->ps_consts_i[idx]; + memcpy(&stateblock->stateblock_state.ps_consts_i[range.offset], &state->ps_consts_i[range.offset], + sizeof(*state->ps_consts_i) * range.size); } - map = stateblock->changed.pixelShaderConstantsB; - while (map) + for (start = 0; ; start = range.offset + range.size) { - idx = wined3d_bit_scan(&map); - - TRACE("Setting ps_consts_b[%u] to %s.\n", - idx, state->ps_consts_b[idx] ? "TRUE" : "FALSE"); + if (!wined3d_bitmap_get_range(&map, WINED3D_MAX_CONSTS_B, start, &range)) + break; - stateblock->stateblock_state.ps_consts_b[idx] = state->ps_consts_b[idx]; + memcpy(&stateblock->stateblock_state.ps_consts_b[range.offset], &state->ps_consts_b[range.offset], + sizeof(*state->ps_consts_b) * range.size); } if (stateblock->changed.transforms)

1 0

Zhiyi Zhang : wined3d: Introduce wined3d_get_adapter().
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: 81caeee85d0aff856780206b126a31de2d9e7d13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81caeee85d0aff856780206b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 3 22:17:46 2020 +0800 wined3d: Introduce wined3d_get_adapter(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 10 ++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 3 +++ 3 files changed, 14 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4d6f63c2ff..f710e85687 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -865,6 +865,16 @@ enum wined3d_pci_device wined3d_gpu_from_feature_level(enum wined3d_pci_vendor * return device_id; } +struct wined3d_adapter * CDECL wined3d_get_adapter(const struct wined3d *wined3d, unsigned int idx) +{ + TRACE("wined3d %p, idx %u.\n", wined3d, idx); + + if (idx >= wined3d->adapter_count) + return NULL; + + return wined3d->adapters[idx]; +} + UINT CDECL wined3d_get_adapter_count(const struct wined3d *wined3d) { TRACE("wined3d %p, reporting %u adapters.\n", diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 8538b3dcd6..0c30ffeac2 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -11,6 +11,7 @@ @ cdecl wined3d_decref(ptr) @ cdecl wined3d_enum_adapter_modes(ptr long long long long ptr) @ cdecl wined3d_find_closest_matching_adapter_mode(ptr long ptr) +@ cdecl wined3d_get_adapter(ptr long) @ cdecl wined3d_get_adapter_count(ptr) @ cdecl wined3d_get_adapter_display_mode(ptr long ptr ptr) @ cdecl wined3d_get_adapter_identifier(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 908a1c9266..2841aa2f2e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2178,6 +2178,7 @@ struct wined3d_parent_ops }; struct wined3d; +struct wined3d_adapter; struct wined3d_blend_state; struct wined3d_buffer; struct wined3d_device; @@ -2262,6 +2263,8 @@ HRESULT __cdecl wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT a UINT mode_idx, struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_find_closest_matching_adapter_mode(const struct wined3d *wined3d, unsigned int adapter_idx, struct wined3d_display_mode *mode); +struct wined3d_adapter * __cdecl wined3d_get_adapter(const struct wined3d *wined3d, + unsigned int idx); UINT __cdecl wined3d_get_adapter_count(const struct wined3d *wined3d); HRESULT __cdecl wined3d_get_adapter_display_mode(const struct wined3d *wined3d, UINT adapter_idx, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation);

1 0

Zhiyi Zhang : wined3d: Introduce wined3d_adapter_get_output_count().
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: 2f9037c75d9bc519685244a082deb8eeb98655be URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f9037c75d9bc519685244a0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 3 22:18:00 2020 +0800 wined3d: Introduce wined3d_adapter_get_output_count(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/directx.c | 13 ++++++++++--- dlls/d3d9/directx.c | 13 ++++++++++--- dlls/dxgi/adapter.c | 5 ++++- dlls/dxgi/dxgi_private.h | 1 + dlls/wined3d/directx.c | 8 ++++++++ dlls/wined3d/wined3d.spec | 2 ++ dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 2 ++ 8 files changed, 38 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index d1f8872d12..ab3a9e6810 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -93,15 +93,22 @@ static HRESULT WINAPI d3d8_RegisterSoftwareDevice(IDirect3D8 *iface, void *init_ static UINT WINAPI d3d8_GetAdapterCount(IDirect3D8 *iface) { struct d3d8 *d3d8 = impl_from_IDirect3D8(iface); - UINT count; + struct wined3d_adapter *wined3d_adapter; + unsigned int adapter_idx, adapter_count; + unsigned int output_count = 0; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - count = wined3d_get_adapter_count(d3d8->wined3d); + adapter_count = wined3d_get_adapter_count(d3d8->wined3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + wined3d_adapter = wined3d_get_adapter(d3d8->wined3d, adapter_idx); + output_count += wined3d_adapter_get_output_count(wined3d_adapter); + } wined3d_mutex_unlock(); - return count; + return output_count; } static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index b552c3b910..effaf3be25 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -108,15 +108,22 @@ static HRESULT WINAPI d3d9_RegisterSoftwareDevice(IDirect3D9Ex *iface, void *ini static UINT WINAPI d3d9_GetAdapterCount(IDirect3D9Ex *iface) { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); - UINT ret; + struct wined3d_adapter *wined3d_adapter; + unsigned int adapter_idx, adapter_count; + unsigned int output_count = 0; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - ret = wined3d_get_adapter_count(d3d9->wined3d); + adapter_count = wined3d_get_adapter_count(d3d9->wined3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + wined3d_adapter = wined3d_get_adapter(d3d9->wined3d, adapter_idx); + output_count += wined3d_adapter_get_output_count(wined3d_adapter); + } wined3d_mutex_unlock(); - return ret; + return output_count; } static HRESULT WINAPI d3d9_GetAdapterIdentifier(IDirect3D9Ex *iface, UINT adapter, diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 7cdf7bd0d6..ccc37e0980 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -124,6 +124,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac { struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); struct dxgi_output *output_object; + unsigned int output_count; HRESULT hr; TRACE("iface %p, output_idx %u, output %p.\n", iface, output_idx, output); @@ -131,7 +132,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac if (!output) return E_INVALIDARG; - if (output_idx > 0) + output_count = wined3d_adapter_get_output_count(adapter->wined3d_adapter); + if (output_idx >= output_count) { *output = NULL; return DXGI_ERROR_NOT_FOUND; @@ -450,6 +452,7 @@ static void dxgi_adapter_init(struct dxgi_adapter *adapter, struct dxgi_factory { adapter->IWineDXGIAdapter_iface.lpVtbl = &dxgi_adapter_vtbl; adapter->refcount = 1; + adapter->wined3d_adapter = wined3d_get_adapter(factory->wined3d, ordinal); wined3d_private_store_init(&adapter->private_store); adapter->ordinal = ordinal; adapter->factory = factory; diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 5b93449834..56939e2aaa 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -156,6 +156,7 @@ struct dxgi_adapter { IWineDXGIAdapter IWineDXGIAdapter_iface; LONG refcount; + struct wined3d_adapter *wined3d_adapter; struct wined3d_private_store private_store; UINT ordinal; struct dxgi_factory *factory; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f710e85687..95d1caed4d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -883,6 +883,13 @@ UINT CDECL wined3d_get_adapter_count(const struct wined3d *wined3d) return wined3d->adapter_count; } +unsigned int CDECL wined3d_adapter_get_output_count(const struct wined3d_adapter *adapter) +{ + TRACE("adapter %p, reporting %u outputs.\n", adapter, adapter->output_count); + + return adapter->output_count; +} + HRESULT CDECL wined3d_register_software_device(struct wined3d *wined3d, void *init_function) { FIXME("wined3d %p, init_function %p stub!\n", wined3d, init_function); @@ -2834,6 +2841,7 @@ BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, ERR("Failed to initialise output, hr %#x.\n", hr); return FALSE; } + adapter->output_count = 1; if (!AllocateLocallyUniqueId(&adapter->luid)) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 0c30ffeac2..b0eb60327f 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -26,6 +26,8 @@ @ cdecl wined3d_set_adapter_display_mode(ptr long ptr) @ cdecl wined3d_unregister_windows(ptr) +@ cdecl wined3d_adapter_get_output_count(ptr) + @ cdecl wined3d_blend_state_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_blend_state_decref(ptr) @ cdecl wined3d_blend_state_get_parent(ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f266d2a690..2966a08603 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2914,6 +2914,7 @@ struct wined3d_adapter struct wined3d_d3d_info d3d_info; struct wined3d_driver_info driver_info; struct wined3d_output output; + unsigned int output_count; UINT64 vram_bytes_used; GUID driver_uuid; GUID device_uuid; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2841aa2f2e..54af2e4785 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2287,6 +2287,8 @@ HRESULT __cdecl wined3d_set_adapter_display_mode(struct wined3d *wined3d, UINT adapter_idx, const struct wined3d_display_mode *mode); void __cdecl wined3d_unregister_windows(struct wined3d *wined3d); +unsigned int __cdecl wined3d_adapter_get_output_count(const struct wined3d_adapter *adapter); + HRESULT __cdecl wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer);

1 0

Alistair Leslie-Hughes : oledb32: Initialize data provider when switching tabs.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: 67a791270f35abb6d2aa13ef93cf77303f0ac95c URL: https://source.winehq.org/git/wine.git/?a=commit;h=67a791270f35abb6d2aa13ef… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Mar 3 00:01:21 2020 +0000 oledb32: Initialize data provider when switching tabs. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/dslocator.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/oledb32/resource.h | 1 + dlls/oledb32/version.rc | 1 + po/ar.po | 64 ++++++++++++++------------ po/ast.po | 64 ++++++++++++++------------ po/bg.po | 64 ++++++++++++++------------ po/ca.po | 64 ++++++++++++++------------ po/cs.po | 64 ++++++++++++++------------ po/da.po | 64 ++++++++++++++------------ po/de.po | 64 ++++++++++++++------------ po/el.po | 64 ++++++++++++++------------ po/en.po | 66 +++++++++++++++------------ po/en_US.po | 66 +++++++++++++++------------ po/eo.po | 64 ++++++++++++++------------ po/es.po | 64 ++++++++++++++------------ po/fa.po | 64 ++++++++++++++------------ po/fi.po | 64 ++++++++++++++------------ po/fr.po | 64 ++++++++++++++------------ po/he.po | 64 ++++++++++++++------------ po/hi.po | 64 ++++++++++++++------------ po/hr.po | 64 ++++++++++++++------------ po/hu.po | 64 ++++++++++++++------------ po/it.po | 64 ++++++++++++++------------ po/ja.po | 64 ++++++++++++++------------ po/ko.po | 64 ++++++++++++++------------ po/lt.po | 64 ++++++++++++++------------ po/ml.po | 64 ++++++++++++++------------ po/nb_NO.po | 64 ++++++++++++++------------ po/nl.po | 64 ++++++++++++++------------ po/or.po | 64 ++++++++++++++------------ po/pa.po | 64 ++++++++++++++------------ po/pl.po | 64 ++++++++++++++------------ po/pt_BR.po | 64 ++++++++++++++------------ po/pt_PT.po | 64 ++++++++++++++------------ po/rm.po | 64 ++++++++++++++------------ po/ro.po | 64 ++++++++++++++------------ po/ru.po | 64 ++++++++++++++------------ po/si.po | 64 ++++++++++++++------------ po/sk.po | 64 ++++++++++++++------------ po/sl.po | 64 ++++++++++++++------------ po/sr_RS(a)cyrillic.po | 64 ++++++++++++++------------ po/sr_RS(a)latin.po | 64 ++++++++++++++------------ po/sv.po | 64 ++++++++++++++------------ po/ta.po | 64 ++++++++++++++------------ po/te.po | 64 ++++++++++++++------------ po/th.po | 64 ++++++++++++++------------ po/tr.po | 64 ++++++++++++++------------ po/uk.po | 64 ++++++++++++++------------ po/wa.po | 64 ++++++++++++++------------ po/wine.pot | 64 ++++++++++++++------------ po/zh_CN.po | 64 ++++++++++++++------------ po/zh_TW.po | 64 ++++++++++++++------------ 52 files changed, 1834 insertions(+), 1423 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=67a791270f35abb6d2aa…

1 0

Nikolay Sivov : mf: Handle shutdown state in GetFullTopology().
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: 15a9ab9409f014ac5a91a34ae1ea94eb5ff2157e URL: https://source.winehq.org/git/wine.git/?a=commit;h=15a9ab9409f014ac5a91a34a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 3 12:24:58 2020 +0300 mf: Handle shutdown state in GetFullTopology(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 33 ++++++++++++++++++--------------- dlls/mf/tests/mf.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 15 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index a2a2ba6fe5..c5235e42a8 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1401,8 +1401,8 @@ static HRESULT WINAPI mfsession_GetFullTopology(IMFMediaSession *iface, DWORD fl { struct media_session *session = impl_from_IMFMediaSession(iface); struct queued_topology *queued; - HRESULT hr = S_OK; TOPOID topo_id; + HRESULT hr; TRACE("%p, %#x, %s, %p.\n", iface, flags, wine_dbgstr_longlong(id), topology); @@ -1410,27 +1410,30 @@ static HRESULT WINAPI mfsession_GetFullTopology(IMFMediaSession *iface, DWORD fl EnterCriticalSection(&session->cs); - if (flags & MFSESSION_GETFULLTOPOLOGY_CURRENT) + if (SUCCEEDED(hr = session_is_shut_down(session))) { - if (session->presentation.topo_status != MF_TOPOSTATUS_INVALID) - *topology = session->presentation.current_topology; + if (flags & MFSESSION_GETFULLTOPOLOGY_CURRENT) + { + if (session->presentation.topo_status != MF_TOPOSTATUS_INVALID) + *topology = session->presentation.current_topology; + else + hr = MF_E_INVALIDREQUEST; + } else - hr = MF_E_INVALIDREQUEST; - } - else - { - LIST_FOR_EACH_ENTRY(queued, &session->topologies, struct queued_topology, entry) { - if (SUCCEEDED(IMFTopology_GetTopologyID(queued->topology, &topo_id)) && topo_id == id) + LIST_FOR_EACH_ENTRY(queued, &session->topologies, struct queued_topology, entry) { - *topology = queued->topology; - break; + if (SUCCEEDED(IMFTopology_GetTopologyID(queued->topology, &topo_id)) && topo_id == id) + { + *topology = queued->topology; + break; + } } } - } - if (*topology) - IMFTopology_AddRef(*topology); + if (*topology) + IMFTopology_AddRef(*topology); + } LeaveCriticalSection(&session->cs); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 5f3114da32..5a690880d1 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1027,11 +1027,14 @@ static void test_media_session(void) IMFRateSupport *rate_support; IMFAttributes *attributes; IMFMediaSession *session; + IMFTopology *topology; + PROPVARIANT propvar; IMFGetService *gs; IMFClock *clock; IUnknown *unk; HRESULT hr; float rate; + DWORD caps; BOOL thin; hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); @@ -1115,12 +1118,40 @@ todo_wine hr = IMFMediaSession_Shutdown(session); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + hr = IMFMediaSession_ClearTopologies(session); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSession_Start(session, &GUID_NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + propvar.vt = VT_EMPTY; + hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSession_Pause(session); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSession_Stop(session); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFMediaSession_Close(session); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFMediaSession_GetClock(session, &clock); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFMediaSession_GetSessionCapabilities(session, &caps); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSession_GetSessionCapabilities(session, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSession_GetFullTopology(session, MFSESSION_GETFULLTOPOLOGY_CURRENT, 0, &topology); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSession_Shutdown(session); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + IMFMediaSession_Release(session); /* Custom topology loader, GUID is not registered. */

1 0