May 2021 - Wine-commits - list.winehq.org

Jacek Caban : winepulse: Move pulse main loop to unix lib.
by Alexandre Julliard 12 May '21

12 May '21

Module: wine Branch: master Commit: 8df72bade54d1ef7a6d9e79f20ee0a2697019c13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8df72bade54d1ef7a6d9e79f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 11 18:30:17 2021 +0200 winepulse: Move pulse main loop to unix lib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 170 +++++++----------------------------------- dlls/winepulse.drv/pulse.c | 81 ++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 2 + 3 files changed, 109 insertions(+), 144 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8df72bade54d1ef7a6d9…

1 0

Jacek Caban : winepulse: Store channel count directly in ACImpl.
by Alexandre Julliard 12 May '21

12 May '21

Module: wine Branch: master Commit: fa097243e06b3855a240c866a028add722025ead URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa097243e06b3855a240c866… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 11 18:30:28 2021 +0200 winepulse: Store channel count directly in ACImpl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 0bb3491a577..0c5e08c54e6 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -148,6 +148,7 @@ struct ACImpl { LONG ref; EDataFlow dataflow; + UINT32 channel_count; DWORD flags; AUDCLNT_SHAREMODE share; HANDLE event, timer; @@ -1170,7 +1171,7 @@ static HRESULT pulse_spec_from_waveformat(ACImpl *This, const WAVEFORMATEX *fmt) WARN("Unhandled tag %x\n", fmt->wFormatTag); return AUDCLNT_E_UNSUPPORTED_FORMAT; } - This->ss.channels = This->map.channels; + This->channel_count = This->ss.channels = This->map.channels; if (!pa_channel_map_valid(&This->map) || This->ss.format == PA_SAMPLE_INVALID) { ERR("Invalid format! Channel spec valid: %i, format: %i\n", pa_channel_map_valid(&This->map), This->ss.format); return AUDCLNT_E_UNSUPPORTED_FORMAT; @@ -2470,7 +2471,7 @@ static HRESULT WINAPI AudioStreamVolume_GetChannelCount( if (!out) return E_POINTER; - *out = This->ss.channels; + *out = This->channel_count; return S_OK; } @@ -2492,7 +2493,7 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( if (!levels) return E_POINTER; - if (count != This->ss.channels) + if (count != This->channel_count) return E_INVALIDARG; pulse->lock(); @@ -2520,7 +2521,7 @@ static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( if (!levels) return E_POINTER; - if (count != This->ss.channels) + if (count != This->channel_count) return E_INVALIDARG; pulse->lock(); @@ -2548,13 +2549,13 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( if (level < 0.f || level > 1.f) return E_INVALIDARG; - if (index >= This->ss.channels) + if (index >= This->channel_count) return E_INVALIDARG; - hr = AudioStreamVolume_GetAllVolumes(iface, This->ss.channels, volumes); + hr = AudioStreamVolume_GetAllVolumes(iface, This->channel_count, volumes); volumes[index] = level; if (SUCCEEDED(hr)) - hr = AudioStreamVolume_SetAllVolumes(iface, This->ss.channels, volumes); + hr = AudioStreamVolume_SetAllVolumes(iface, This->channel_count, volumes); return hr; } @@ -2570,10 +2571,10 @@ static HRESULT WINAPI AudioStreamVolume_GetChannelVolume( if (!level) return E_POINTER; - if (index >= This->ss.channels) + if (index >= This->channel_count) return E_INVALIDARG; - hr = AudioStreamVolume_GetAllVolumes(iface, This->ss.channels, volumes); + hr = AudioStreamVolume_GetAllVolumes(iface, This->channel_count, volumes); if (SUCCEEDED(hr)) *level = volumes[index]; return hr;

1 0

Jacek Caban : winepulse: Introduce pulse_stream struct.
by Alexandre Julliard 12 May '21

12 May '21

Module: wine Branch: master Commit: 5477f2b0156d16952a286dd0df148c2f60b71fe6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5477f2b0156d16952a286dd0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 11 18:31:24 2021 +0200 winepulse: Introduce pulse_stream struct. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 586 +++++++++++++++++++++--------------------- dlls/winepulse.drv/pulse.c | 1 + dlls/winepulse.drv/unixlib.h | 30 +++ 3 files changed, 319 insertions(+), 298 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5477f2b0156d16952a28…

1 0

Jacek Caban : winepulse: Move pulse stream destruction to unix lib.
by Alexandre Julliard 12 May '21

12 May '21

Module: wine Branch: master Commit: 0eeefec6c56084a0677403aee46493e2c03a1dca URL: https://source.winehq.org/git/wine.git/?a=commit;h=0eeefec6c56084a0677403ae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 11 18:31:34 2021 +0200 winepulse: Move pulse stream destruction to unix lib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 19 ++----------------- dlls/winepulse.drv/pulse.c | 24 ++++++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 1 + 3 files changed, 27 insertions(+), 17 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 1531a2c0075..4c962069c97 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -868,24 +868,9 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) TRACE("(%p) Refcount now %u\n", This, ref); if (!ref) { if (This->pulse_stream) { - if(This->timer) { - This->pulse_stream->please_quit = TRUE; - WaitForSingleObject(This->timer, INFINITE); - CloseHandle(This->timer); - } - - pulse->lock(); - if (PA_STREAM_IS_GOOD(pa_stream_get_state(This->pulse_stream->stream))) { - pa_stream_disconnect(This->pulse_stream->stream); - while (PA_STREAM_IS_GOOD(pa_stream_get_state(This->pulse_stream->stream))) - pulse->cond_wait(); - } - pa_stream_unref(This->pulse_stream->stream); - HeapFree(GetProcessHeap(), 0, This->pulse_stream->tmp_buffer); - HeapFree(GetProcessHeap(), 0, This->pulse_stream->peek_buffer); - HeapFree(GetProcessHeap(), 0, This->pulse_stream->local_buffer); - HeapFree(GetProcessHeap(), 0, This->pulse_stream); + pulse->release_stream(This->pulse_stream, This->timer); This->pulse_stream = NULL; + pulse->lock(); list_remove(&This->entry); pulse->unlock(); } diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 5f4998e641f..23b362c8689 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -477,6 +477,29 @@ fail: return E_FAIL; } +static void WINAPI pulse_release_stream(struct pulse_stream *stream, HANDLE timer) +{ + if(timer) { + stream->please_quit = TRUE; + NtWaitForSingleObject(timer, FALSE, NULL); + NtClose(timer); + } + + pulse_lock(); + if (PA_STREAM_IS_GOOD(pa_stream_get_state(stream->stream))) { + pa_stream_disconnect(stream->stream); + while (PA_STREAM_IS_GOOD(pa_stream_get_state(stream->stream))) + pulse_cond_wait(); + } + pa_stream_unref(stream->stream); + pulse_unlock(); + + RtlFreeHeap(GetProcessHeap(), 0, stream->tmp_buffer); + RtlFreeHeap(GetProcessHeap(), 0, stream->peek_buffer); + RtlFreeHeap(GetProcessHeap(), 0, stream->local_buffer); + RtlFreeHeap(GetProcessHeap(), 0, stream); +} + static const struct unix_funcs unix_funcs = { pulse_lock, @@ -485,6 +508,7 @@ static const struct unix_funcs unix_funcs = pulse_broadcast, pulse_main_loop, pulse_connect, + pulse_release_stream, pulse_test_connect, }; diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index 89d3c05611a..d02ab4fdf07 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -65,5 +65,6 @@ struct unix_funcs void (WINAPI *broadcast)(void); void (WINAPI *main_loop)(void); HRESULT (WINAPI *connect)(const char *name, pa_context **ret); + void (WINAPI *release_stream)(struct pulse_stream *stream, HANDLE timer); HRESULT (WINAPI *test_connect)(const char *name, struct pulse_config *config); };

1 0

Jacek Caban : winepulse: Move pulse stream initialization to unix lib.
by Alexandre Julliard 12 May '21

12 May '21

Module: wine Branch: master Commit: ebd344f2922f4044117904e024a0a87576a3eff1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebd344f2922f4044117904e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 11 18:31:45 2021 +0200 winepulse: Move pulse stream initialization to unix lib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 339 +-------------------------------------- dlls/winepulse.drv/pulse.c | 363 +++++++++++++++++++++++++++++++++++++++++- dlls/winepulse.drv/unixlib.h | 13 +- 3 files changed, 377 insertions(+), 338 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ebd344f2922f40441179…

1 0

Ziqing Hui : windowscodecs/tests: Test DDS parameters for encoder.
by Alexandre Julliard 12 May '21

12 May '21

Module: wine Branch: master Commit: 795d5aeb4c5c6c71f7a5471778acb308ee4df47c URL: https://source.winehq.org/git/wine.git/?a=commit;h=795d5aeb4c5c6c71f7a54717… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed May 12 13:07:39 2021 +0800 windowscodecs/tests: Test DDS parameters for encoder. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 81 ++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 16adbb92726..681a73cf6de 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -1310,9 +1310,90 @@ end: if (encoder) IWICBitmapEncoder_Release(encoder); } +static void test_dds_encoder_params(IWICBitmapEncoder *encoder, IWICDdsEncoder *dds_encoder) +{ + WICDdsParameters params, params_set = { 4, 4, 4, 3, 1, DXGI_FORMAT_BC1_UNORM, + WICDdsTexture3D, WICDdsAlphaModePremultiplied }; + HRESULT hr; + + hr = IWICDdsEncoder_GetParameters(dds_encoder, NULL); + todo_wine + ok(hr == E_INVALIDARG, "GetParameters got unexpected hr %#x\n", hr); + + hr = IWICDdsEncoder_GetParameters(dds_encoder, &params); + todo_wine + ok(hr == S_OK, "GetParameters failed, hr %#x\n", hr); + if (hr != S_OK) return; + + /* default DDS parameters for encoder */ + ok(params.Width == 1, "Got unexpected Width %u\n", params.Width); + ok(params.Height == 1, "Got unexpected Height %u\n", params.Height); + ok(params.Depth == 1, "Got unexpected Depth %u\n", params.Depth); + ok(params.MipLevels == 1, "Got unexpected MipLevels %u\n", params.MipLevels); + ok(params.ArraySize == 1, "Got unexpected ArraySize %u\n", params.ArraySize); + ok(params.DxgiFormat == DXGI_FORMAT_BC3_UNORM, "Got unexpected DxgiFormat %#x\n", params.DxgiFormat); + ok(params.Dimension == WICDdsTexture2D, "Got unexpected Dimension %#x\n", params.Dimension); + ok(params.AlphaMode == WICDdsAlphaModeUnknown, "Got unexpected AlphaMode %#x\n", params.AlphaMode); + + hr = IWICDdsEncoder_SetParameters(dds_encoder, NULL); + todo_wine + ok(hr == E_INVALIDARG, "SetParameters got unexpected hr %#x\n", hr); + + hr = IWICDdsEncoder_SetParameters(dds_encoder, &params_set); + todo_wine + ok(hr == S_OK, "SetParameters failed, hr %#x\n", hr); + if (hr != S_OK) return; + + IWICDdsEncoder_GetParameters(dds_encoder, &params); + + ok(params.Width == params_set.Width, + "Expected Width %u, got %u\n", params_set.Width, params.Width); + ok(params.Height == params_set.Height, + "Expected Height %u, got %u\n", params_set.Height, params.Height); + ok(params.Depth == params_set.Depth, + "Expected Depth %u, got %u\n", params_set.Depth, params.Depth); + ok(params.MipLevels == params_set.MipLevels, + "Expected MipLevels %u, got %u\n", params_set.MipLevels, params.MipLevels); + ok(params.ArraySize == params_set.ArraySize, + "Expected ArraySize %u, got %u\n", params_set.ArraySize, params.ArraySize); + ok(params.DxgiFormat == params_set.DxgiFormat, + "Expected DxgiFormat %u, got %#x\n", params_set.DxgiFormat, params.DxgiFormat); + ok(params.Dimension == params_set.Dimension, + "Expected Dimension %u, got %#x\n", params_set.Dimension, params.Dimension); + ok(params.AlphaMode == params_set.AlphaMode, + "Expected AlphaMode %u, got %#x\n", params_set.AlphaMode, params.AlphaMode); +} + static void test_dds_encoder(void) { + IWICDdsEncoder *dds_encoder = NULL; + IWICBitmapEncoder *encoder = NULL; + IWICStream *stream = NULL; + BYTE buffer[1024]; + HRESULT hr; + test_dds_encoder_initialize(); + + encoder = create_encoder(); + if (!encoder) goto end; + + stream = create_stream(buffer, sizeof(buffer)); + if (!stream) goto end; + + hr = IWICBitmapEncoder_Initialize(encoder, (IStream *)stream, WICBitmapEncoderNoCache); + ok(hr == S_OK, "Initialize failed, hr %#x\n", hr); + if (hr != S_OK) goto end; + + hr = IWICBitmapEncoder_QueryInterface(encoder, &IID_IWICDdsEncoder, (void **)&dds_encoder); + ok(hr == S_OK, "QueryInterface failed, hr %#x\n", hr); + if (hr != S_OK) goto end; + + test_dds_encoder_params(encoder, dds_encoder); + +end: + if (dds_encoder) IWICDdsEncoder_Release(dds_encoder); + if (stream) IWICStream_Release(stream); + if (encoder) IWICBitmapEncoder_Release(encoder); } START_TEST(ddsformat)

1 0

Ziqing Hui : windowscodecs: Implement IWICDdsEncoder_GetParameters.
by Alexandre Julliard 12 May '21

12 May '21

Module: wine Branch: master Commit: 8e8b70b9d3892d952ca5be879e663504af825168 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e8b70b9d3892d952ca5be87… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed May 12 13:07:49 2021 +0800 windowscodecs: Implement IWICDdsEncoder_GetParameters. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 50 ++++++++++++++++++++++++++++++++++-- dlls/windowscodecs/tests/ddsformat.c | 2 -- 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index a102d4883cd..8f505aed993 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -168,6 +168,7 @@ typedef struct DdsEncoder { UINT frame_count; BOOL uncommitted_frame; BOOL committed; + dds_info info; } DdsEncoder; typedef struct DdsFrameEncode { @@ -1740,8 +1741,39 @@ static HRESULT WINAPI DdsEncoder_Dds_SetParameters(IWICDdsEncoder *iface, static HRESULT WINAPI DdsEncoder_Dds_GetParameters(IWICDdsEncoder *iface, WICDdsParameters *parameters) { - FIXME("(%p,%p): stub.\n", iface, parameters); - return E_NOTIMPL; + DdsEncoder *This = impl_from_IWICDdsEncoder(iface); + HRESULT hr; + + TRACE("(%p,%p)\n", iface, parameters); + + if (!parameters) return E_INVALIDARG; + + EnterCriticalSection(&This->lock); + + if (!This->stream) + { + hr = WINCODEC_ERR_WRONGSTATE; + goto end; + } + + parameters->Width = This->info.width; + parameters->Height = This->info.height; + parameters->Depth = This->info.depth; + parameters->MipLevels = This->info.mip_levels; + parameters->ArraySize = This->info.array_size; + parameters->DxgiFormat = This->info.format; + parameters->Dimension = This->info.dimension; + parameters->AlphaMode = This->info.alpha_mode; + + TRACE("(%p,%p) -> (%dx%d depth=%u mipLevels=%u arraySize=%u dxgiFormat=%#x dimension=%#x alphaMode=%#x)\n", + iface, parameters, parameters->Width, parameters->Height, parameters->Depth, parameters->MipLevels, + parameters->ArraySize, parameters->DxgiFormat, parameters->Dimension, parameters->AlphaMode); + + hr = S_OK; + +end: + LeaveCriticalSection(&This->lock); + return hr; } static HRESULT WINAPI DdsEncoder_Dds_CreateNewFrame(IWICDdsEncoder *iface, @@ -1835,6 +1867,20 @@ static HRESULT WINAPI DdsEncoder_Initialize(IWICBitmapEncoder *iface, This->stream = stream; IStream_AddRef(stream); + This->info.width = 1; + This->info.height = 1; + This->info.depth = 1; + This->info.mip_levels = 1; + This->info.array_size = 1; + This->info.frame_count = 1; + This->info.data_offset = 0; + This->info.bytes_per_block = get_bytes_per_block_from_format(DXGI_FORMAT_BC3_UNORM); + This->info.format = DXGI_FORMAT_BC3_UNORM; + This->info.dimension = WICDdsTexture2D; + This->info.alpha_mode = WICDdsAlphaModeUnknown; + This->info.pixel_format = &GUID_WICPixelFormatUndefined; + This->info.pixel_format_bpp = 0; + hr = S_OK; end: diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 681a73cf6de..dc8333a433f 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -1317,11 +1317,9 @@ static void test_dds_encoder_params(IWICBitmapEncoder *encoder, IWICDdsEncoder * HRESULT hr; hr = IWICDdsEncoder_GetParameters(dds_encoder, NULL); - todo_wine ok(hr == E_INVALIDARG, "GetParameters got unexpected hr %#x\n", hr); hr = IWICDdsEncoder_GetParameters(dds_encoder, &params); - todo_wine ok(hr == S_OK, "GetParameters failed, hr %#x\n", hr); if (hr != S_OK) return;

1 0

Ziqing Hui : windowscodecs: Implement IWICDdsEncoder_SetParameters.
by Alexandre Julliard 12 May '21

12 May '21

Module: wine Branch: master Commit: 0e7e1a7ee0531cc356eba59b05f4a0671c076779 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e7e1a7ee0531cc356eba59b… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed May 12 13:07:56 2021 +0800 windowscodecs: Implement IWICDdsEncoder_SetParameters. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 77 +++++++++++++++++++++++++++--------- dlls/windowscodecs/tests/ddsformat.c | 2 - 2 files changed, 58 insertions(+), 21 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 8f505aed993..af062de06f2 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -487,6 +487,30 @@ static UINT get_bytes_per_block_from_format(DXGI_FORMAT format) } } +static UINT get_frame_count(UINT depth, UINT mip_levels, UINT array_size, WICDdsDimension dimension) +{ + UINT frame_count, i; + + if (depth == 1) + { + frame_count = mip_levels; + } + else + { + frame_count = 0; + for (i = 0; i < mip_levels; i++) + { + frame_count += depth; + if (depth > 1) depth /= 2; + } + } + + frame_count *= array_size; + if (dimension == WICDdsTextureCube) frame_count *= 6; + + return frame_count; +} + static const GUID *dxgi_format_to_wic_format(DXGI_FORMAT dxgi_format) { UINT i; @@ -512,8 +536,6 @@ static BOOL is_compressed(DXGI_FORMAT format) static void get_dds_info(dds_info* info, DDS_HEADER *header, DDS_HEADER_DXT10 *header_dxt10) { - int i; - UINT depth; struct dds_format *format_info; info->width = header->width; @@ -554,21 +576,7 @@ static void get_dds_info(dds_info* info, DDS_HEADER *header, DDS_HEADER_DXT10 *h info->bytes_per_block = get_bytes_per_block_from_format(info->format); } - /* get frame count */ - - if (info->depth == 1) { - info->frame_count = info->array_size * info->mip_levels; - } else { - info->frame_count = 0; - depth = info->depth; - for (i = 0; i < info->mip_levels; i++) - { - info->frame_count += depth; - if (depth > 1) depth /= 2; - } - info->frame_count *= info->array_size; - } - if (info->dimension == WICDdsTextureCube) info->frame_count *= 6; + info->frame_count = get_frame_count(info->depth, info->mip_levels, info->array_size, info->dimension); } static void decode_block(const BYTE *block_data, UINT block_count, DXGI_FORMAT format, @@ -1734,8 +1742,39 @@ static ULONG WINAPI DdsEncoder_Dds_Release(IWICDdsEncoder *iface) static HRESULT WINAPI DdsEncoder_Dds_SetParameters(IWICDdsEncoder *iface, WICDdsParameters *parameters) { - FIXME("(%p,%p): stub.\n", iface, parameters); - return E_NOTIMPL; + DdsEncoder *This = impl_from_IWICDdsEncoder(iface); + HRESULT hr; + + TRACE("(%p,%p)\n", iface, parameters); + + if (!parameters) return E_INVALIDARG; + + EnterCriticalSection(&This->lock); + + if (!This->stream) + { + hr = WINCODEC_ERR_WRONGSTATE; + goto end; + } + + This->info.width = parameters->Width; + This->info.height = parameters->Height; + This->info.depth = parameters->Depth; + This->info.mip_levels = parameters->MipLevels; + This->info.array_size = parameters->ArraySize; + This->info.format = parameters->DxgiFormat; + This->info.dimension = parameters->Dimension; + This->info.alpha_mode = parameters->AlphaMode; + + This->info.bytes_per_block = get_bytes_per_block_from_format(This->info.format); + This->info.frame_count = get_frame_count(This->info.depth, This->info.mip_levels, + This->info.array_size, This->info.dimension); + + hr = S_OK; + +end: + LeaveCriticalSection(&This->lock); + return hr; } static HRESULT WINAPI DdsEncoder_Dds_GetParameters(IWICDdsEncoder *iface, diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index dc8333a433f..52828e6bf43 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -1334,11 +1334,9 @@ static void test_dds_encoder_params(IWICBitmapEncoder *encoder, IWICDdsEncoder * ok(params.AlphaMode == WICDdsAlphaModeUnknown, "Got unexpected AlphaMode %#x\n", params.AlphaMode); hr = IWICDdsEncoder_SetParameters(dds_encoder, NULL); - todo_wine ok(hr == E_INVALIDARG, "SetParameters got unexpected hr %#x\n", hr); hr = IWICDdsEncoder_SetParameters(dds_encoder, &params_set); - todo_wine ok(hr == S_OK, "SetParameters failed, hr %#x\n", hr); if (hr != S_OK) return;

1 0

Zebediah Figura : d3d11/tests: Add more tests for state clear and restore via FinishCommandList and ExecuteCommandList.
by Alexandre Julliard 12 May '21

12 May '21

Module: wine Branch: master Commit: b20908a549c26e329f0be74e78009b570e4c627a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b20908a549c26e329f0be74e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 11 23:00:05 2021 -0500 d3d11/tests: Add more tests for state clear and restore via FinishCommandList and ExecuteCommandList. 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/d3d11/tests/d3d11.c | 213 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 202 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b20908a549c26e329f0b…

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_feature_level().
by Alexandre Julliard 12 May '21

12 May '21

Module: wine Branch: master Commit: 51dc6dc614a10897244f3da2471cda294297e2e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51dc6dc614a10897244f3da2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 12 11:09:58 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_feature_level(). 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/wined3d/cs.c | 7 ++++--- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 5d9d19a85af..36bf39cf789 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2055,15 +2055,16 @@ static void wined3d_cs_exec_set_feature_level(struct wined3d_cs *cs, const void cs->state.feature_level = op->level; } -void wined3d_cs_emit_set_feature_level(struct wined3d_cs *cs, enum wined3d_feature_level level) +void wined3d_device_context_emit_set_feature_level(struct wined3d_device_context *context, + enum wined3d_feature_level level) { struct wined3d_cs_set_feature_level *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_FEATURE_LEVEL; op->level = level; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static const struct diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 38ab2aed900..ff1d03de0f8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1748,7 +1748,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 TRACE("device %p, state %p.\n", device, state); device->cs->c.state = state; - wined3d_cs_emit_set_feature_level(device->cs, state->feature_level); + wined3d_device_context_emit_set_feature_level(context, state->feature_level); for (i = 0; i < WINED3D_MAX_RENDER_TARGETS; ++i) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6565b2044df..3babb23f75a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4750,7 +4750,6 @@ void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const struct wined3d_vec4 *plane) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture *texture, WORD flags, const struct wined3d_color_key *color_key) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_feature_level(struct wined3d_cs *cs, enum wined3d_feature_level level) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_light(struct wined3d_cs *cs, const struct wined3d_light_info *light) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_light_enable(struct wined3d_cs *cs, unsigned int idx, BOOL enable) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_material *material) DECLSPEC_HIDDEN; @@ -4805,6 +4804,8 @@ void wined3d_device_context_emit_set_depth_stencil_state(struct wined3d_device_c struct wined3d_depth_stencil_state *state, unsigned int stencil_ref) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_depth_stencil_view(struct wined3d_device_context *context, struct wined3d_rendertarget_view *view) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_feature_level(struct wined3d_device_context *context, + enum wined3d_feature_level level) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_index_buffer(struct wined3d_device_context *context, struct wined3d_buffer *buffer, enum wined3d_format_id format_id, unsigned int offset) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_predication(struct wined3d_device_context *context,

1 0