August 2022 - Wine-Commits - list.winehq.org

Andrey Gusev : d3dx10: Implement D3DX10PreprocessShaderFromMemory().
by Alexandre Julliard Aug. 30, 2022

Aug. 30, 2022

Module: wine Branch: master Commit: 8ffbd56a4380ff23381c5b2c137b4b4b2de4f61e URL: https://gitlab.winehq.org/wine/wine/-/commit/8ffbd56a4380ff23381c5b2c137b4b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun Aug 7 12:53:14 2022 +0300 d3dx10: Implement D3DX10PreprocessShaderFromMemory(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53427 --- dlls/d3dx10_43/async.c | 12 ------------ dlls/d3dx10_43/compiler.c | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index 667219b3500..62627886804 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -600,18 +600,6 @@ HRESULT WINAPI D3DX10CreateAsyncTextureProcessor(ID3D10Device *device, return S_OK; } -HRESULT WINAPI D3DX10PreprocessShaderFromMemory(const char *data, SIZE_T data_size, const char *filename, - const D3D10_SHADER_MACRO *defines, ID3DInclude *include, ID3DX10ThreadPump *pump, ID3D10Blob **shader_text, - ID3D10Blob **errors, HRESULT *hresult) -{ - FIXME("data %s, data_size %Iu, filename %s, defines %p, include %p, pump %p, shader_text %p, " - "errors %p, hresult %p stub!\n", - debugstr_an(data, data_size), data_size, debugstr_a(filename), defines, include, pump, - shader_text, errors, hresult); - - return E_NOTIMPL; -} - struct work_item { struct list entry; diff --git a/dlls/d3dx10_43/compiler.c b/dlls/d3dx10_43/compiler.c index c66eb679a8f..ad27783eabb 100644 --- a/dlls/d3dx10_43/compiler.c +++ b/dlls/d3dx10_43/compiler.c @@ -183,3 +183,26 @@ HRESULT WINAPI D3DX10CreateEffectFromResourceW(HMODULE module, const WCHAR *reso free(filename); return hr; } + +HRESULT WINAPI D3DX10PreprocessShaderFromMemory(const char *data, SIZE_T data_size, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3DInclude *include, ID3DX10ThreadPump *pump, ID3D10Blob **shader_text, + ID3D10Blob **errors, HRESULT *hresult) +{ + HRESULT hr; + + TRACE("data %s, data_size %Iu, filename %s, defines %p, include %p, pump %p, shader_text %p, " + "errors %p, hresult %p.\n", + debugstr_an(data, data_size), data_size, debugstr_a(filename), defines, include, pump, + shader_text, errors, hresult); + + if (!data) + return E_FAIL; + + if (pump) + FIXME("Unimplemented ID3DX10ThreadPump handling.\n"); + + hr = D3DPreprocess(data, data_size, filename, defines, include, shader_text, errors); + if (hresult) + *hresult = hr; + return hr; +}

1 0

Rémi Bernon : winemac.drv: Check for non-primary adapter earlier in macdrv_ChangeDisplaySettingsEx.
by Alexandre Julliard Aug. 30, 2022

Aug. 30, 2022

Module: wine Branch: master Commit: 75fa51e5552180445a4efd93d4921ee7226d1adf URL: https://gitlab.winehq.org/wine/wine/-/commit/75fa51e5552180445a4efd93d4921e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 30 12:06:02 2022 +0200 winemac.drv: Check for non-primary adapter earlier in macdrv_ChangeDisplaySettingsEx. --- dlls/winemac.drv/display.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index fa611a4c662..46246754005 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -840,6 +840,11 @@ LONG macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, devname = primary_adapter; devmode = &default_mode; } + else if (wcsicmp(primary_adapter, devname)) + { + FIXME("Changing non-primary adapter settings is currently unsupported.\n"); + return DISP_CHANGE_SUCCESSFUL; + } if (is_detached_mode(devmode)) { @@ -880,11 +885,6 @@ LONG macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, if (best_display_mode) { if (flags & (CDS_TEST | CDS_NORESET)) ret = DISP_CHANGE_SUCCESSFUL; - else if (wcsicmp(primary_adapter, devname)) - { - FIXME("Changing non-primary adapter settings is currently unsupported.\n"); - ret = DISP_CHANGE_SUCCESSFUL; - } else if (macdrv_set_display_mode(&displays[0], best_display_mode)) { int mode_bpp = display_mode_bits_per_pixel(best_display_mode);

1 0

Nikolay Sivov : evr/filter: Implement pin's connect/disconnect.
by Alexandre Julliard Aug. 30, 2022

Aug. 30, 2022

Module: wine Branch: master Commit: 24e90e4350c61ad6f967b1510928e27708ab061e URL: https://gitlab.winehq.org/wine/wine/-/commit/24e90e4350c61ad6f967b1510928e2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 29 22:56:15 2022 +0300 evr/filter: Implement pin's connect/disconnect. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/evr.c | 82 +++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 61 insertions(+), 21 deletions(-) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index 2f0eeb6a22d..d45bd361aff 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -224,29 +224,11 @@ static void evr_release_services(struct evr *filter) } } -static void evr_destroy(struct strmbase_renderer *iface) +static HRESULT evr_test_input_type(struct evr *filter, const AM_MEDIA_TYPE *mt, IMFMediaType **ret) { - struct evr *filter = impl_from_strmbase_renderer(iface); - - evr_uninitialize(filter); - strmbase_renderer_cleanup(&filter->renderer); - free(filter); -} - -static HRESULT evr_render(struct strmbase_renderer *iface, IMediaSample *sample) -{ - FIXME("Not implemented.\n"); - return E_NOTIMPL; -} - -static HRESULT evr_query_accept(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) -{ - struct evr *filter = impl_from_strmbase_renderer(iface); IMFMediaType *media_type; HRESULT hr = S_OK; - EnterCriticalSection(&filter->renderer.filter.filter_cs); - if (!filter->presenter) hr = evr_initialize(filter, NULL, NULL); @@ -261,14 +243,70 @@ static HRESULT evr_query_accept(struct strmbase_renderer *iface, const AM_MEDIA_ if (SUCCEEDED(hr = MFInitMediaTypeFromAMMediaType(media_type, mt))) { /* TODO: some pin -> mixer input mapping is necessary to test the substreams. */ - hr = IMFTransform_SetInputType(filter->mixer, 0, media_type, MFT_SET_TYPE_TEST_ONLY); + if (SUCCEEDED(hr = IMFTransform_SetInputType(filter->mixer, 0, media_type, MFT_SET_TYPE_TEST_ONLY))) + { + if (ret) + IMFMediaType_AddRef((*ret = media_type)); + } } IMFMediaType_Release(media_type); + } + + return hr; +} - evr_release_services(filter); +static HRESULT evr_connect(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) +{ + struct evr *filter = impl_from_strmbase_renderer(iface); + IMFMediaType *media_type; + HRESULT hr; + + if (SUCCEEDED(hr = evr_test_input_type(filter, mt, &media_type))) + { + if (SUCCEEDED(hr = IMFTransform_SetInputType(filter->mixer, 0, media_type, 0))) + hr = IMFVideoPresenter_ProcessMessage(filter->presenter, MFVP_MESSAGE_INVALIDATEMEDIATYPE, 0); + + IMFMediaType_Release(media_type); } + return hr; +} + +static void evr_disconnect(struct strmbase_renderer *iface) +{ + struct evr *filter = impl_from_strmbase_renderer(iface); + + if (filter->mixer) + IMFTransform_SetInputType(filter->mixer, 0, NULL, 0); + evr_release_services(filter); +} + +static void evr_destroy(struct strmbase_renderer *iface) +{ + struct evr *filter = impl_from_strmbase_renderer(iface); + + evr_uninitialize(filter); + strmbase_renderer_cleanup(&filter->renderer); + free(filter); +} + +static HRESULT evr_render(struct strmbase_renderer *iface, IMediaSample *sample) +{ + FIXME("Not implemented.\n"); + return E_NOTIMPL; +} + +static HRESULT evr_query_accept(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) +{ + struct evr *filter = impl_from_strmbase_renderer(iface); + HRESULT hr; + + EnterCriticalSection(&filter->renderer.filter.filter_cs); + + hr = evr_test_input_type(filter, mt, NULL); + evr_release_services(filter); + LeaveCriticalSection(&filter->renderer.filter.filter_cs); return hr; @@ -279,6 +317,8 @@ static const struct strmbase_renderer_ops renderer_ops = .renderer_query_accept = evr_query_accept, .renderer_render = evr_render, .renderer_query_interface = evr_query_interface, + .renderer_connect = evr_connect, + .renderer_disconnect = evr_disconnect, .renderer_destroy = evr_destroy, };

1 0

Rémi Bernon : winemac.drv: Support enumerating non-primary adapters display modes.
by Alexandre Julliard Aug. 30, 2022

Aug. 30, 2022

Module: wine Branch: master Commit: d82af2f3203ac00e44e59c6b79545b22a90568cd URL: https://gitlab.winehq.org/wine/wine/-/commit/d82af2f3203ac00e44e59c6b79545b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 29 10:29:28 2022 +0200 winemac.drv: Support enumerating non-primary adapters display modes. --- dlls/winemac.drv/display.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 206f91504de..7a319a56a7a 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -52,6 +52,7 @@ static const WCHAR pixelencodingW[] = {'P','i','x','e','l','E','n','c','o','d',' static CFArrayRef cached_modes; static DWORD cached_modes_flags; +static CGDirectDisplayID cached_modes_display_id; static BOOL cached_modes_has_8bpp, cached_modes_has_16bpp; static int cached_default_mode_bpp; static pthread_mutex_t cached_modes_mutex = PTHREAD_MUTEX_INITIALIZER; @@ -999,9 +1000,11 @@ BOOL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, LPDEVMODEW devmod struct macdrv_display *displays = NULL; int num_displays; CGDisplayModeRef display_mode; - int display_mode_bpp; + int display_mode_bpp, display_idx; BOOL synthesized = FALSE; + CGDirectDisplayID display_id; DWORD count, i; + WCHAR *end; TRACE("%s, %u, %p + %hu, %08x\n", debugstr_w(devname), mode, devmode, devmode->dmSize, flags); @@ -1010,13 +1013,23 @@ BOOL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, LPDEVMODEW devmod if (macdrv_get_displays(&displays, &num_displays)) goto failed; + display_idx = wcstol(devname + 11, &end, 10) - 1; + if (display_idx >= num_displays) + { + macdrv_free_displays(displays); + return FALSE; + } + + display_id = displays[display_idx].displayID; + pthread_mutex_lock(&cached_modes_mutex); - if (mode == 0 || !cached_modes || flags != cached_modes_flags) + if (mode == 0 || !cached_modes || flags != cached_modes_flags || display_id != cached_modes_display_id) { if (cached_modes) CFRelease(cached_modes); - cached_modes = copy_display_modes(displays[0].displayID, (flags & EDS_RAWMODE) != 0); + cached_modes = copy_display_modes(display_id, (flags & EDS_RAWMODE) != 0); cached_modes_has_8bpp = cached_modes_has_16bpp = FALSE; + cached_modes_display_id = display_id; cached_modes_flags = flags; if (cached_modes) @@ -1096,13 +1109,13 @@ BOOL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, LPDEVMODEW devmod if (!display_mode) goto failed; - display_mode_to_devmode(displays[0].displayID, display_mode, devmode); + display_mode_to_devmode(display_id, display_mode, devmode); devmode->dmBitsPerPel = display_mode_bpp; if (devmode->dmBitsPerPel) devmode->dmFields |= DM_BITSPERPEL; if (retina_enabled) { - struct display_mode_descriptor* desc = create_original_display_mode_descriptor(displays[0].displayID); + struct display_mode_descriptor* desc = create_original_display_mode_descriptor(display_id); if (display_mode_matches_descriptor(display_mode, desc)) { devmode->dmPelsWidth *= 2;

1 0

Rémi Bernon : winemac.drv: Support getting non-primary adapter current display mode.
by Alexandre Julliard Aug. 30, 2022

Aug. 30, 2022

Module: wine Branch: master Commit: 0f014f5030ed667d919b91b8de0402810dd07787 URL: https://gitlab.winehq.org/wine/wine/-/commit/0f014f5030ed667d919b91b8de0402… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 29 10:19:23 2022 +0200 winemac.drv: Support getting non-primary adapter current display mode. --- dlls/winemac.drv/display.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 46246754005..206f91504de 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1143,8 +1143,10 @@ failed: BOOL macdrv_GetCurrentDisplaySettings(LPCWSTR devname, LPDEVMODEW devmode) { struct macdrv_display *displays = NULL; - int num_displays; + int num_displays, display_idx; CGDisplayModeRef display_mode; + CGDirectDisplayID display_id; + WCHAR *end; TRACE("%s, %p + %hu\n", debugstr_w(devname), devmode, devmode->dmSize); @@ -1153,17 +1155,24 @@ BOOL macdrv_GetCurrentDisplaySettings(LPCWSTR devname, LPDEVMODEW devmode) if (macdrv_get_displays(&displays, &num_displays)) return FALSE; - display_mode = CGDisplayCopyDisplayMode(displays[0].displayID); + display_idx = wcstol(devname + 11, &end, 10) - 1; + if (display_idx >= num_displays) + { + macdrv_free_displays(displays); + return FALSE; + } + + display_id = displays[display_idx].displayID; + display_mode = CGDisplayCopyDisplayMode(display_id); - /* We currently only report modes for the primary display, so it's at (0, 0). */ - devmode->dmPosition.x = 0; - devmode->dmPosition.y = 0; + devmode->dmPosition.x = CGRectGetMinX(displays[display_idx].frame); + devmode->dmPosition.y = CGRectGetMinY(displays[display_idx].frame); devmode->dmFields |= DM_POSITION; - display_mode_to_devmode(displays[0].displayID, display_mode, devmode); + display_mode_to_devmode(display_id, display_mode, devmode); if (retina_enabled) { - struct display_mode_descriptor *desc = create_original_display_mode_descriptor(displays[0].displayID); + struct display_mode_descriptor *desc = create_original_display_mode_descriptor(display_id); if (display_mode_matches_descriptor(display_mode, desc)) { devmode->dmPelsWidth *= 2; @@ -1175,7 +1184,8 @@ BOOL macdrv_GetCurrentDisplaySettings(LPCWSTR devname, LPDEVMODEW devmode) CFRelease(display_mode); macdrv_free_displays(displays); - TRACE("current mode -- %dx%dx%dbpp @%d Hz", + TRACE("current mode -- %dx%d-%dx%dx%dbpp @%d Hz", + devmode->dmPosition.x, devmode->dmPosition.y, devmode->dmPelsWidth, devmode->dmPelsHeight, devmode->dmBitsPerPel, devmode->dmDisplayFrequency); if (devmode->dmDisplayOrientation)

1 0

Piotr Caban : d3dx10/tests: Improve cube textures data testing.
by Alexandre Julliard Aug. 30, 2022

Aug. 30, 2022

Module: wine Branch: master Commit: 6fc4b80e5dc6a1a3e6f44eb58467733721cc30ee URL: https://gitlab.winehq.org/wine/wine/-/commit/6fc4b80e5dc6a1a3e6f44eb5846773… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 14 14:23:57 2022 +0200 d3dx10/tests: Improve cube textures data testing. --- dlls/d3dx10_43/tests/d3dx10.c | 46 +++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index fb56ec1c365..f750d0d3667 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -511,6 +511,11 @@ static const BYTE test_dds_cube[] = }; static const BYTE test_dds_cube_data[] = { + 0xf5, 0xa7, 0x08, 0x69, 0x74, 0xc0, 0xbf, 0xd7, + 0xf5, 0xa7, 0x08, 0x69, 0x74, 0xc0, 0xbf, 0xd7, + 0xf5, 0xa7, 0x08, 0x69, 0x74, 0xc0, 0xbf, 0xd7, + 0xf5, 0xa7, 0x08, 0x69, 0x74, 0xc0, 0xbf, 0xd7, + 0xf5, 0xa7, 0x08, 0x69, 0x74, 0xc0, 0xbf, 0xd7, 0xf5, 0xa7, 0x08, 0x69, 0x74, 0xc0, 0xbf, 0xd7 }; @@ -1211,10 +1216,11 @@ static void check_resource_info(ID3D10Resource *resource, const struct test_imag static void check_resource_data(ID3D10Resource *resource, const struct test_image *image, unsigned int line) { - unsigned int width, height, stride, i; + unsigned int width, height, stride, i, array_slice; D3D10_MAPPED_TEXTURE2D map; D3D10_TEXTURE2D_DESC desc; ID3D10Texture2D *readback; + const BYTE *expected_data; BOOL line_match; HRESULT hr; @@ -1233,26 +1239,32 @@ static void check_resource_data(ID3D10Resource *resource, const struct test_imag height = (height + 3) / 4; } - hr = ID3D10Texture2D_Map(readback, 0, D3D10_MAP_READ, 0, &map); - ok_(__FILE__, line)(hr == S_OK, "Map failed, hr %#lx.\n", hr); - if (hr != S_OK) + expected_data = image->expected_data; + for (array_slice = 0; array_slice < desc.ArraySize; ++array_slice) { - ID3D10Texture2D_Release(readback); - return; - } + hr = ID3D10Texture2D_Map(readback, array_slice * desc.MipLevels, D3D10_MAP_READ, 0, &map); + ok_(__FILE__, line)(hr == S_OK, "Map failed, hr %#lx.\n", hr); + if (hr != S_OK) + { + ID3D10Texture2D_Release(readback); + return; + } - for (i = 0; i < height; ++i) - { - line_match = !memcmp(image->expected_data + stride * i, - (BYTE *)map.pData + map.RowPitch * i, stride); - todo_wine_if(is_block_compressed(image->expected_info.Format) - && (image->expected_info.Width % 4 != 0 || image->expected_info.Height % 4 != 0)) - ok_(__FILE__, line)(line_match, "Data mismatch for line %u.\n", i); - if (!line_match) - break; + for (i = 0; i < height; ++i) + { + line_match = !memcmp(expected_data + stride * i, + (BYTE *)map.pData + map.RowPitch * i, stride); + todo_wine_if(is_block_compressed(image->expected_info.Format) + && (image->expected_info.Width % 4 != 0 || image->expected_info.Height % 4 != 0)) + ok_(__FILE__, line)(line_match, "Data mismatch for line %u, array slice %u.\n", i, array_slice); + if (!line_match) + break; + } + expected_data += stride * height; + + ID3D10Texture2D_Unmap(readback, 0); } - ID3D10Texture2D_Unmap(readback, 0); ID3D10Texture2D_Release(readback); }

1 0

Piotr Caban : d3dx10: Add support for loading MipLevels data in load_texture_data.
by Alexandre Julliard Aug. 30, 2022

Aug. 30, 2022

Module: wine Branch: master Commit: 13801e63c96398e6820213df9c7886ed06644826 URL: https://gitlab.winehq.org/wine/wine/-/commit/13801e63c96398e6820213df9c7886… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 13 19:47:57 2022 +0200 d3dx10: Add support for loading MipLevels data in load_texture_data. --- dlls/d3dx10_43/tests/d3dx10.c | 2 +- dlls/d3dx10_43/texture.c | 102 +++++++++++++++++++++++------------------- 2 files changed, 56 insertions(+), 48 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index fd6226fa5a8..fb56ec1c365 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1138,7 +1138,7 @@ static void check_resource_info(ID3D10Resource *resource, const struct test_imag ok_(__FILE__, line)(desc_2d.Height == expected_height, "Got unexpected Height %u, expected %u.\n", desc_2d.Height, expected_height); - todo_wine_if(expected_mip_levels != 1) + todo_wine_if(expected_mip_levels != image->expected_info.MipLevels) ok_(__FILE__, line)(desc_2d.MipLevels == expected_mip_levels, "Got unexpected MipLevels %u, expected %u.\n", desc_2d.MipLevels, expected_mip_levels); diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index e1c7742b409..0439808e468 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -816,7 +816,7 @@ static HRESULT convert_image(IWICImagingFactory *factory, IWICBitmapFrameDecode HRESULT load_texture_data(const void *data, SIZE_T size, D3DX10_IMAGE_LOAD_INFO *load_info, D3D10_SUBRESOURCE_DATA **resource_data) { - unsigned int stride, frame_size, i; + unsigned int stride, frame_size, i, j; IWICDdsFrameDecode *dds_frame = NULL; IWICBitmapFrameDecode *frame = NULL; IWICImagingFactory *factory = NULL; @@ -884,25 +884,29 @@ HRESULT load_texture_data(const void *data, SIZE_T size, D3DX10_IMAGE_LOAD_INFO for (i = 0; i < img_info.ArraySize; ++i) { - if (FAILED(hr = IWICDdsDecoder_GetFrame(dds_decoder, i, 0, 0, &frame))) - goto end; - if (FAILED(hr = IWICBitmapFrameDecode_QueryInterface(frame, &IID_IWICDdsFrameDecode, (void **)&dds_frame))) - goto end; - if (FAILED(hr = dds_get_frame_info(dds_frame, &img_info, &format_info, &stride, &frame_size))) - goto end; - - if (!i) + for (j = 0; j < img_info.MipLevels; ++j) { - img_info.Width = (img_info.Width + format_info.BlockWidth - 1) & ~(format_info.BlockWidth - 1); - img_info.Height = (img_info.Height + format_info.BlockHeight - 1) & ~(format_info.BlockHeight - 1); - } + if (FAILED(hr = IWICDdsDecoder_GetFrame(dds_decoder, i, j, 0, &frame))) + goto end; + if (FAILED(hr = IWICBitmapFrameDecode_QueryInterface(frame, + &IID_IWICDdsFrameDecode, (void **)&dds_frame))) + goto end; + if (FAILED(hr = dds_get_frame_info(dds_frame, &img_info, &format_info, &stride, &frame_size))) + goto end; - size += sizeof(**resource_data) + frame_size; + if (!i && !j) + { + img_info.Width = (img_info.Width + format_info.BlockWidth - 1) & ~(format_info.BlockWidth - 1); + img_info.Height = (img_info.Height + format_info.BlockHeight - 1) & ~(format_info.BlockHeight - 1); + } - IWICDdsFrameDecode_Release(dds_frame); - dds_frame = NULL; - IWICBitmapFrameDecode_Release(frame); - frame = NULL; + size += sizeof(**resource_data) + frame_size; + + IWICDdsFrameDecode_Release(dds_frame); + dds_frame = NULL; + IWICBitmapFrameDecode_Release(frame); + frame = NULL; + } } if (!(res_data = malloc(size))) @@ -915,41 +919,45 @@ HRESULT load_texture_data(const void *data, SIZE_T size, D3DX10_IMAGE_LOAD_INFO size = 0; for (i = 0; i < img_info.ArraySize; ++i) { - if (FAILED(hr = IWICDdsDecoder_GetFrame(dds_decoder, i, 0, 0, &frame))) - goto end; - if (FAILED(hr = IWICBitmapFrameDecode_QueryInterface(frame, &IID_IWICDdsFrameDecode, (void **)&dds_frame))) - goto end; - if (FAILED(hr = dds_get_frame_info(dds_frame, &img_info, &format_info, &stride, &frame_size))) - goto end; - - buffer = res_data + sizeof(**resource_data) * img_info.ArraySize + size; - size += frame_size; - - if (img_info.Format == format_info.DxgiFormat) + for (j = 0; j < img_info.MipLevels; ++j) { - if (FAILED(hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, stride, frame_size, buffer))) + if (FAILED(hr = IWICDdsDecoder_GetFrame(dds_decoder, i, j, 0, &frame))) goto end; - } - else - { - if (!(dst_format = dxgi_format_to_wic_guid(img_info.Format))) - { - hr = E_FAIL; - FIXME("Unsupported DXGI format %#x.\n", img_info.Format); + if (FAILED(hr = IWICBitmapFrameDecode_QueryInterface(frame, + &IID_IWICDdsFrameDecode, (void **)&dds_frame))) goto end; - } - if (FAILED(hr = convert_image(factory, frame, dst_format, stride, frame_size, buffer))) + if (FAILED(hr = dds_get_frame_info(dds_frame, &img_info, &format_info, &stride, &frame_size))) goto end; - } - IWICDdsFrameDecode_Release(dds_frame); - dds_frame = NULL; - IWICBitmapFrameDecode_Release(frame); - frame = NULL; + buffer = res_data + sizeof(**resource_data) * img_info.ArraySize * img_info.MipLevels + size; + size += frame_size; - (*resource_data)[i].pSysMem = buffer; - (*resource_data)[i].SysMemPitch = stride; - (*resource_data)[i].SysMemSlicePitch = frame_size; + if (img_info.Format == format_info.DxgiFormat) + { + if (FAILED(hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, stride, frame_size, buffer))) + goto end; + } + else + { + if (!(dst_format = dxgi_format_to_wic_guid(img_info.Format))) + { + hr = E_FAIL; + FIXME("Unsupported DXGI format %#x.\n", img_info.Format); + goto end; + } + if (FAILED(hr = convert_image(factory, frame, dst_format, stride, frame_size, buffer))) + goto end; + } + + IWICDdsFrameDecode_Release(dds_frame); + dds_frame = NULL; + IWICBitmapFrameDecode_Release(frame); + frame = NULL; + + (*resource_data)[i * img_info.MipLevels + j].pSysMem = buffer; + (*resource_data)[i * img_info.MipLevels + j].SysMemPitch = stride; + (*resource_data)[i * img_info.MipLevels + j].SysMemSlicePitch = frame_size; + } } } else @@ -984,7 +992,7 @@ HRESULT load_texture_data(const void *data, SIZE_T size, D3DX10_IMAGE_LOAD_INFO load_info->Width = img_info.Width; load_info->Height = img_info.Height; - load_info->MipLevels = 1; + load_info->MipLevels = img_info.MipLevels; load_info->Format = img_info.Format; load_info->Usage = D3D10_USAGE_DEFAULT; load_info->BindFlags = D3D10_BIND_SHADER_RESOURCE;

1 0

Rémi Bernon : winemac.drv: Invalidate mode cache when enum flags changes.
by Alexandre Julliard Aug. 30, 2022

Aug. 30, 2022

Module: wine Branch: master Commit: 4571201f2ee05cbeaee2ad73546439d46abe1d87 URL: https://gitlab.winehq.org/wine/wine/-/commit/4571201f2ee05cbeaee2ad73546439… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 29 10:18:21 2022 +0200 winemac.drv: Invalidate mode cache when enum flags changes. --- dlls/winemac.drv/display.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 76a9d67be20..d2164f997d9 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -54,6 +54,7 @@ static const WCHAR initial_mode_keyW[] = {'I','n','i','t','i','a','l',' ','D','i static const WCHAR pixelencodingW[] = {'P','i','x','e','l','E','n','c','o','d','i','n','g',0}; static CFArrayRef cached_modes; +static DWORD cached_modes_flags; static BOOL cached_modes_has_8bpp, cached_modes_has_16bpp; static int cached_default_mode_bpp; static pthread_mutex_t cached_modes_mutex = PTHREAD_MUTEX_INITIALIZER; @@ -1014,11 +1015,12 @@ BOOL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, LPDEVMODEW devmod pthread_mutex_lock(&cached_modes_mutex); - if (mode == 0 || !cached_modes) + if (mode == 0 || !cached_modes || flags != cached_modes_flags) { if (cached_modes) CFRelease(cached_modes); cached_modes = copy_display_modes(displays[0].displayID, (flags & EDS_RAWMODE) != 0); cached_modes_has_8bpp = cached_modes_has_16bpp = FALSE; + cached_modes_flags = flags; if (cached_modes) {

1 0

Rémi Bernon : winemac.drv: Remove unnecessary macdrv_EnumDisplaySettingsEx declaration.
by Alexandre Julliard Aug. 30, 2022

Aug. 30, 2022

Module: wine Branch: master Commit: 66a051d29a60b8c0a5a2c963a3a9a9814ee65a31 URL: https://gitlab.winehq.org/wine/wine/-/commit/66a051d29a60b8c0a5a2c963a3a9a9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 26 22:08:57 2022 +0200 winemac.drv: Remove unnecessary macdrv_EnumDisplaySettingsEx declaration. --- dlls/winemac.drv/display.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index d2164f997d9..fa611a4c662 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -46,9 +46,6 @@ struct display_mode_descriptor CFStringRef pixel_encoding; }; - -BOOL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, LPDEVMODEW devmode, DWORD flags); - static const WCHAR initial_mode_keyW[] = {'I','n','i','t','i','a','l',' ','D','i','s','p','l','a','y', ' ','M','o','d','e'}; static const WCHAR pixelencodingW[] = {'P','i','x','e','l','E','n','c','o','d','i','n','g',0};

1 0

Rémi Bernon : winemac.drv: Rename display modes cache variables.
by Alexandre Julliard Aug. 30, 2022

Aug. 30, 2022

Module: wine Branch: master Commit: 557270355f5b1a3d866ead1af528f5dc866be02c URL: https://gitlab.winehq.org/wine/wine/-/commit/557270355f5b1a3d866ead1af528f5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 26 22:08:26 2022 +0200 winemac.drv: Rename display modes cache variables. --- dlls/winemac.drv/display.c | 58 +++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 2d7b9656103..76a9d67be20 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -53,10 +53,10 @@ static const WCHAR initial_mode_keyW[] = {'I','n','i','t','i','a','l',' ','D','i ' ','M','o','d','e'}; static const WCHAR pixelencodingW[] = {'P','i','x','e','l','E','n','c','o','d','i','n','g',0}; -static CFArrayRef modes; -static BOOL modes_has_8bpp, modes_has_16bpp; -static int default_mode_bpp; -static pthread_mutex_t modes_mutex = PTHREAD_MUTEX_INITIALIZER; +static CFArrayRef cached_modes; +static BOOL cached_modes_has_8bpp, cached_modes_has_16bpp; +static int cached_default_mode_bpp; +static pthread_mutex_t cached_modes_mutex = PTHREAD_MUTEX_INITIALIZER; static BOOL inited_original_display_mode; @@ -397,20 +397,20 @@ static int get_default_bpp(void) { int ret; - if (!default_mode_bpp) + if (!cached_default_mode_bpp) { CGDisplayModeRef mode = CGDisplayCopyDisplayMode(kCGDirectMainDisplay); if (mode) { - default_mode_bpp = display_mode_bits_per_pixel(mode); + cached_default_mode_bpp = display_mode_bits_per_pixel(mode); CFRelease(mode); } - if (!default_mode_bpp) - default_mode_bpp = 32; + if (!cached_default_mode_bpp) + cached_default_mode_bpp = 32; } - ret = default_mode_bpp; + ret = cached_default_mode_bpp; TRACE(" -> %d\n", ret); return ret; @@ -859,9 +859,9 @@ LONG macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, return DISP_CHANGE_FAILED; } - pthread_mutex_lock(&modes_mutex); + pthread_mutex_lock(&cached_modes_mutex); bpp = get_default_bpp(); - pthread_mutex_unlock(&modes_mutex); + pthread_mutex_unlock(&cached_modes_mutex); if ((devmode->dmFields & DM_BITSPERPEL) && devmode->dmBitsPerPel != bpp) TRACE("using default %d bpp instead of caller's request %d bpp\n", bpp, devmode->dmBitsPerPel); @@ -1012,39 +1012,39 @@ BOOL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, LPDEVMODEW devmod if (macdrv_get_displays(&displays, &num_displays)) goto failed; - pthread_mutex_lock(&modes_mutex); + pthread_mutex_lock(&cached_modes_mutex); - if (mode == 0 || !modes) + if (mode == 0 || !cached_modes) { - if (modes) CFRelease(modes); - modes = copy_display_modes(displays[0].displayID, (flags & EDS_RAWMODE) != 0); - modes_has_8bpp = modes_has_16bpp = FALSE; + if (cached_modes) CFRelease(cached_modes); + cached_modes = copy_display_modes(displays[0].displayID, (flags & EDS_RAWMODE) != 0); + cached_modes_has_8bpp = cached_modes_has_16bpp = FALSE; - if (modes) + if (cached_modes) { - count = CFArrayGetCount(modes); - for (i = 0; i < count && !(modes_has_8bpp && modes_has_16bpp); i++) + count = CFArrayGetCount(cached_modes); + for (i = 0; i < count && !(cached_modes_has_8bpp && cached_modes_has_16bpp); i++) { - CGDisplayModeRef mode = (CGDisplayModeRef)CFArrayGetValueAtIndex(modes, i); + CGDisplayModeRef mode = (CGDisplayModeRef)CFArrayGetValueAtIndex(cached_modes, i); int bpp = display_mode_bits_per_pixel(mode); if (bpp == 8) - modes_has_8bpp = TRUE; + cached_modes_has_8bpp = TRUE; else if (bpp == 16) - modes_has_16bpp = TRUE; + cached_modes_has_16bpp = TRUE; } } } display_mode = NULL; - if (modes) + if (cached_modes) { int default_bpp; DWORD seen_modes = 0; - count = CFArrayGetCount(modes); + count = CFArrayGetCount(cached_modes); for (i = 0; i < count; i++) { - CGDisplayModeRef candidate = (CGDisplayModeRef)CFArrayGetValueAtIndex(modes, i); + CGDisplayModeRef candidate = (CGDisplayModeRef)CFArrayGetValueAtIndex(cached_modes, i); seen_modes++; if (seen_modes > mode) @@ -1058,10 +1058,10 @@ BOOL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, LPDEVMODEW devmod default_bpp = get_default_bpp(); /* If all the real modes are exhausted, synthesize lower bpp modes. */ - if (!display_mode && (!modes_has_16bpp || !modes_has_8bpp)) + if (!display_mode && (!cached_modes_has_16bpp || !cached_modes_has_8bpp)) { /* We want to synthesize higher depths first. */ - int synth_bpps[] = { modes_has_16bpp ? 0 : 16, modes_has_8bpp ? 0 : 8 }; + int synth_bpps[] = { cached_modes_has_16bpp ? 0 : 16, cached_modes_has_8bpp ? 0 : 8 }; size_t synth_bpp_idx; for (synth_bpp_idx = 0; synth_bpp_idx < 2; synth_bpp_idx++) { @@ -1071,7 +1071,7 @@ BOOL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, LPDEVMODEW devmod for (i = 0; i < count; i++) { - CGDisplayModeRef candidate = (CGDisplayModeRef)CFArrayGetValueAtIndex(modes, i); + CGDisplayModeRef candidate = (CGDisplayModeRef)CFArrayGetValueAtIndex(cached_modes, i); /* We only synthesize modes from those having the default bpp. */ if (display_mode_bits_per_pixel(candidate) != default_bpp) continue; @@ -1092,7 +1092,7 @@ BOOL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, LPDEVMODEW devmod } } - pthread_mutex_unlock(&modes_mutex); + pthread_mutex_unlock(&cached_modes_mutex); if (!display_mode) goto failed;

1 0