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

Francois Gouget : winspool.drv/tests: Fix the spelling of a variable name.
by Alexandre Julliard 30 Aug '22

30 Aug '22

Module: wine Branch: master Commit: c0ad6d745e511da6e1459fb6a5b51ac307205c24 URL: https://gitlab.winehq.org/wine/wine/-/commit/c0ad6d745e511da6e1459fb6a5b51a… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 25 11:57:45 2022 +0200 winspool.drv/tests: Fix the spelling of a variable name. --- dlls/winspool.drv/tests/info.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 47f602b7de3..58ab581ed25 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2679,7 +2679,7 @@ static void test_DocumentProperties(void) LONG dm_size, ret; DEVMODEA *dm; char empty_str[] = ""; - char non_existing_str[] = "non existing printer"; + char nonexistent_str[] = "nonexistent printer"; if (!default_printer) { @@ -2708,7 +2708,7 @@ static void test_DocumentProperties(void) ret = DocumentPropertiesA(0, hprn, empty_str, dm, dm, DM_OUT_BUFFER); ok(ret == IDOK, "DocumentPropertiesA ret value %ld != expected IDOK\n", ret); - ret = DocumentPropertiesA(0, hprn, non_existing_str, dm, dm, DM_OUT_BUFFER); + ret = DocumentPropertiesA(0, hprn, nonexistent_str, dm, dm, DM_OUT_BUFFER); ok(ret == IDOK, "DocumentPropertiesA ret value %ld != expected IDOK\n", ret); test_DEVMODEA(dm, dm_size, default_printer);

1 0

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

30 Aug '22

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

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

30 Aug '22

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

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

30 Aug '22

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

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

30 Aug '22

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

Jacek Caban : user32: Call winproc_init before dpiaware_init.
by Alexandre Julliard 30 Aug '22

30 Aug '22

Module: wine Branch: master Commit: 55db1dbb32594bc4de994c8911c5462e631345da URL: https://gitlab.winehq.org/wine/wine/-/commit/55db1dbb32594bc4de994c8911c546… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 30 14:19:10 2022 +0200 user32: Call winproc_init before dpiaware_init. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53601 --- dlls/user32/user_main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index bb728907b01..963f07b70ef 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -222,10 +222,8 @@ static BOOL process_attach(void) { NtCurrentTeb()->Peb->KernelCallbackTable = kernel_callback_table; - dpiaware_init(); winproc_init(); - - /* Initialize system colors and metrics */ + dpiaware_init(); SYSPARAMS_Init(); return TRUE;

1 0

Connor McAdams : combase: Omit thread ID from the stub manager ipid for MTA objects.
by Alexandre Julliard 30 Aug '22

30 Aug '22

Module: wine Branch: master Commit: 00c8117a7277b5c798ca6078a4f50badeec756ad URL: https://gitlab.winehq.org/wine/wine/-/commit/00c8117a7277b5c798ca6078a4f50b… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Aug 24 12:29:46 2022 -0500 combase: Omit thread ID from the stub manager ipid for MTA objects. It is possible for a thread that creates an MTA to call CoUninitialize() and not destroy the MTA if another thread has entered the MTA in the meantime. If the original thread then creates an STA, subsequent attempts to find the MTA with 'apartment_findfromtid' will get the original thread's STA. To avoid this, don't set a TID value in the stub manager IPID value to indicate that the stub resides in the MTA. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/combase/stubmanager.c | 6 +++-- dlls/ole32/tests/marshal.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/combase/stubmanager.c b/dlls/combase/stubmanager.c index 59782b8c623..5bb87c60c1d 100644 --- a/dlls/combase/stubmanager.c +++ b/dlls/combase/stubmanager.c @@ -46,7 +46,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); /* generates an ipid in the following format (similar to native version): * Data1 = apartment-local ipid counter - * Data2 = apartment creator thread ID + * Data2 = apartment creator thread ID, or 0 for an MTA. * Data3 = process ID * Data4 = random value */ @@ -62,7 +62,7 @@ static inline HRESULT generate_ipid(struct stub_manager *m, IPID *ipid) } ipid->Data1 = InterlockedIncrement(&m->apt->ipidc); - ipid->Data2 = (USHORT)m->apt->tid; + ipid->Data2 = !m->apt->multi_threaded ? (USHORT)m->apt->tid : 0; ipid->Data3 = (USHORT)GetCurrentProcessId(); return S_OK; } @@ -499,6 +499,8 @@ static HRESULT ipid_to_ifstub(const IPID *ipid, struct apartment **stub_apt, /* FIXME: hack for IRemUnknown */ if (ipid->Data2 == 0xffff) *stub_apt = apartment_findfromoxid(*(const OXID *)ipid->Data4); + else if (!ipid->Data2) + *stub_apt = apartment_get_mta(); else *stub_apt = apartment_findfromtid(ipid->Data2); if (!*stub_apt) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 6e21ed1889b..7a69ad9ed15 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -4489,6 +4489,63 @@ static void test_channel_hook(void) ok_ole_success(hr, CoRegisterMessageFilter); } +static DWORD CALLBACK second_mta_thread_proc(void *param) +{ + struct implicit_mta_marshal_data *data = param; + HRESULT hr; + + /* Second thread now keeps MTA created on first thread alive. */ + CoInitializeEx(NULL, COINIT_MULTITHREADED); + hr = CoMarshalInterface(data->stream, &IID_IClassFactory, + (IUnknown *)&Test_ClassFactory, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok_ole_success(hr, CoMarshalInterface); + + SetEvent(data->start); + + ok(!WaitForSingleObject(data->stop, 1000), "wait failed\n"); + CoUninitialize(); + return 0; +} + +static void test_mta_creation_thread_change_apartment(void) +{ + struct implicit_mta_marshal_data data; + IClassFactory *cf; + IUnknown *proxy; + HANDLE thread; + HRESULT hr; + + CoInitializeEx(NULL, COINIT_MULTITHREADED); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &data.stream); + ok_ole_success(hr, CreateStreamOnHGlobal); + + data.start = CreateEventA(NULL, FALSE, FALSE, NULL); + data.stop = CreateEventA(NULL, FALSE, FALSE, NULL); + + thread = CreateThread(NULL, 0, second_mta_thread_proc, &data, 0, NULL); + ok(!WaitForSingleObject(data.start, 1000), "wait failed\n"); + CoUninitialize(); + + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + IStream_Seek(data.stream, ullZero, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(data.stream, &IID_IClassFactory, (void **)&cf); + ok_ole_success(hr, CoUnmarshalInterface); + + hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void **)&proxy); + ok_ole_success(hr, IClassFactory_CreateInstance); + + IUnknown_Release(proxy); + IStream_Release(data.stream); + + SetEvent(data.stop); + ok(!WaitForSingleObject(thread, 1000), "wait failed\n"); + CloseHandle(thread); + + CoUninitialize(); +} + START_TEST(marshal) { HMODULE hOle32 = GetModuleHandleA("ole32"); @@ -4511,6 +4568,7 @@ START_TEST(marshal) test_cocreateinstance_proxy(); test_implicit_mta(); + test_mta_creation_thread_change_apartment(); CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);

1 0

Piotr Caban : d3dx10: Factor out image format conversion function.
by Alexandre Julliard 30 Aug '22

30 Aug '22

Module: wine Branch: master Commit: 82bb308f7acc783a486700e533d16331ebd31587 URL: https://gitlab.winehq.org/wine/wine/-/commit/82bb308f7acc783a486700e533d163… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 13 14:26:34 2022 +0200 d3dx10: Factor out image format conversion function. --- dlls/d3dx10_43/texture.c | 76 ++++++++++++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 31 deletions(-) diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 88efdf585b4..fa7918a0778 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -766,11 +766,53 @@ void init_load_info(const D3DX10_IMAGE_LOAD_INFO *load_info, D3DX10_IMAGE_LOAD_I out->pSrcInfo = NULL; } +static HRESULT convert_image(IWICImagingFactory *factory, IWICBitmapFrameDecode *frame, + const GUID *dst_format, unsigned int stride, unsigned int frame_size, BYTE *buffer) +{ + IWICFormatConverter *converter; + BOOL can_convert; + GUID src_format; + HRESULT hr; + + if (FAILED(hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &src_format))) + return hr; + + if (IsEqualGUID(&src_format, dst_format)) + { + if (FAILED(hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, stride, frame_size, buffer))) + return hr; + return S_OK; + } + + if (FAILED(hr = IWICImagingFactory_CreateFormatConverter(factory, &converter))) + return hr; + if (FAILED(hr = IWICFormatConverter_CanConvert(converter, &src_format, dst_format, &can_convert))) + { + IWICFormatConverter_Release(converter); + return hr; + } + if (!can_convert) + { + WARN("Format converting %s to %s is not supported by WIC.\n", + debugstr_guid(&src_format), debugstr_guid(dst_format)); + IWICFormatConverter_Release(converter); + return E_NOTIMPL; + } + if (FAILED(hr = IWICFormatConverter_Initialize(converter, (IWICBitmapSource *)frame, dst_format, + WICBitmapDitherTypeErrorDiffusion, 0, 0, WICBitmapPaletteTypeCustom))) + { + IWICFormatConverter_Release(converter); + return hr; + } + hr = IWICFormatConverter_CopyPixels(converter, NULL, stride, frame_size, buffer); + IWICFormatConverter_Release(converter); + return hr; +} + HRESULT load_texture_data(const void *data, SIZE_T size, D3DX10_IMAGE_LOAD_INFO *load_info, D3D10_SUBRESOURCE_DATA **resource_data) { unsigned int frame_count, width, height, stride, frame_size; - IWICFormatConverter *converter = NULL; IWICDdsFrameDecode *dds_frame = NULL; IWICBitmapFrameDecode *frame = NULL; IWICImagingFactory *factory = NULL; @@ -779,8 +821,6 @@ HRESULT load_texture_data(const void *data, SIZE_T size, D3DX10_IMAGE_LOAD_INFO D3DX10_IMAGE_INFO img_info; IWICStream *stream = NULL; const GUID *dst_format; - BOOL can_convert; - GUID src_format; HRESULT hr; if (load_info->Width != D3DX10_DEFAULT) @@ -835,8 +875,6 @@ HRESULT load_texture_data(const void *data, SIZE_T size, D3DX10_IMAGE_LOAD_INFO goto end; if (FAILED(hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame))) goto end; - if (FAILED(hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &src_format))) - goto end; width = img_info.Width; height = img_info.Height; @@ -870,30 +908,8 @@ HRESULT load_texture_data(const void *data, SIZE_T size, D3DX10_IMAGE_LOAD_INFO FIXME("Unsupported DXGI format %#x.\n", img_info.Format); goto end; } - - if (IsEqualGUID(&src_format, dst_format)) - { - if (FAILED(hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, stride, frame_size, buffer))) - goto end; - } - else - { - if (FAILED(hr = IWICImagingFactory_CreateFormatConverter(factory, &converter))) - goto end; - if (FAILED(hr = IWICFormatConverter_CanConvert(converter, &src_format, dst_format, &can_convert))) - goto end; - if (!can_convert) - { - WARN("Format converting %s to %s is not supported by WIC.\n", - debugstr_guid(&src_format), debugstr_guid(dst_format)); - goto end; - } - if (FAILED(hr = IWICFormatConverter_Initialize(converter, (IWICBitmapSource *)frame, dst_format, - WICBitmapDitherTypeErrorDiffusion, 0, 0, WICBitmapPaletteTypeCustom))) - goto end; - if (FAILED(hr = IWICFormatConverter_CopyPixels(converter, NULL, stride, frame_size, buffer))) - goto end; - } + if (FAILED(hr = convert_image(factory, frame, dst_format, stride, frame_size, buffer))) + goto end; } load_info->Width = width; @@ -913,8 +929,6 @@ HRESULT load_texture_data(const void *data, SIZE_T size, D3DX10_IMAGE_LOAD_INFO hr = S_OK; end: - if (converter) - IWICFormatConverter_Release(converter); if (dds_frame) IWICDdsFrameDecode_Release(dds_frame); free(res_data);

1 0

Piotr Caban : d3dx10: Use WIC functions to obtain info about DDS image.
by Alexandre Julliard 30 Aug '22

30 Aug '22

Module: wine Branch: master Commit: 77d0bd8267d3b4c862bba5e6bcc287b844798945 URL: https://gitlab.winehq.org/wine/wine/-/commit/77d0bd8267d3b4c862bba5e6bcc287… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 13 15:33:01 2022 +0200 d3dx10: Use WIC functions to obtain info about DDS image. --- dlls/d3dx10_43/texture.c | 96 ++++++++++++++++++++++++++++-------------------- 1 file changed, 56 insertions(+), 40 deletions(-) diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index fa7918a0778..a530bd6b7f0 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -71,17 +71,6 @@ wic_pixel_formats[] = { &GUID_WICPixelFormat128bppRGBAFloat, DXGI_FORMAT_R32G32B32A32_FLOAT } }; -static const DXGI_FORMAT block_compressed_formats[] = -{ - DXGI_FORMAT_BC1_TYPELESS, DXGI_FORMAT_BC1_UNORM, DXGI_FORMAT_BC1_UNORM_SRGB, - DXGI_FORMAT_BC2_TYPELESS, DXGI_FORMAT_BC2_UNORM, DXGI_FORMAT_BC2_UNORM_SRGB, - DXGI_FORMAT_BC3_TYPELESS, DXGI_FORMAT_BC3_UNORM, DXGI_FORMAT_BC3_UNORM_SRGB, - DXGI_FORMAT_BC4_TYPELESS, DXGI_FORMAT_BC4_UNORM, DXGI_FORMAT_BC4_SNORM, - DXGI_FORMAT_BC5_TYPELESS, DXGI_FORMAT_BC5_UNORM, DXGI_FORMAT_BC5_SNORM, - DXGI_FORMAT_BC6H_TYPELESS, DXGI_FORMAT_BC6H_UF16, DXGI_FORMAT_BC6H_SF16, - DXGI_FORMAT_BC7_TYPELESS, DXGI_FORMAT_BC7_UNORM, DXGI_FORMAT_BC7_UNORM_SRGB -}; - static const DXGI_FORMAT to_be_converted_format[] = { DXGI_FORMAT_UNKNOWN, @@ -135,17 +124,6 @@ static D3D10_RESOURCE_DIMENSION wic_dimension_to_d3dx10_dimension(WICDdsDimensio } } -static BOOL is_block_compressed(DXGI_FORMAT format) -{ - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(block_compressed_formats); ++i) - if (format == block_compressed_formats[i]) - return TRUE; - - return FALSE; -} - static unsigned int get_bpp_from_format(DXGI_FORMAT format) { switch (format) @@ -876,32 +854,70 @@ HRESULT load_texture_data(const void *data, SIZE_T size, D3DX10_IMAGE_LOAD_INFO if (FAILED(hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame))) goto end; - width = img_info.Width; - height = img_info.Height; - if (is_block_compressed(img_info.Format)) + if (img_info.ImageFileFormat == D3DX10_IFF_DDS) { - width = (width + 3) & ~3; - height = (height + 3) & ~3; - } - stride = (width * get_bpp_from_format(img_info.Format) + 7) / 8; - frame_size = stride * height; + WICDdsFormatInfo format_info; - if (!(res_data = malloc(sizeof(**resource_data) + frame_size))) - { - hr = E_FAIL; - goto end; - } - buffer = res_data + sizeof(**resource_data); - - if (is_block_compressed(img_info.Format)) - { if (FAILED(hr = IWICBitmapFrameDecode_QueryInterface(frame, &IID_IWICDdsFrameDecode, (void **)&dds_frame))) goto end; - if (FAILED(hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, stride * 4, frame_size, buffer))) + if (FAILED(hr = IWICDdsFrameDecode_GetFormatInfo(dds_frame, &format_info))) + goto end; + if (FAILED(hr = IWICDdsFrameDecode_GetSizeInBlocks(dds_frame, &width, &height))) + goto end; + + if (img_info.Format == format_info.DxgiFormat) + { + stride = width * format_info.BytesPerBlock; + frame_size = stride * height; + width *= format_info.BlockWidth; + height *= format_info.BlockHeight; + } + else + { + width *= format_info.BlockWidth; + height *= format_info.BlockHeight; + stride = (width * get_bpp_from_format(img_info.Format) + 7) / 8; + frame_size = stride * height; + } + + if (!(res_data = malloc(sizeof(**resource_data) + frame_size))) + { + hr = E_FAIL; goto end; + } + buffer = res_data + sizeof(**resource_data); + + 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; + } } else { + width = img_info.Width; + height = img_info.Height; + stride = (width * get_bpp_from_format(img_info.Format) + 7) / 8; + frame_size = stride * height; + + if (!(res_data = malloc(sizeof(**resource_data) + frame_size))) + { + hr = E_FAIL; + goto end; + } + buffer = res_data + sizeof(**resource_data); + if (!(dst_format = dxgi_format_to_wic_guid(img_info.Format))) { hr = E_FAIL;

1 0

Piotr Caban : d3dx10: Add support for texture cubes in D3DX10CreateTexture functions.
by Alexandre Julliard 30 Aug '22

30 Aug '22

Module: wine Branch: master Commit: 3265019d7cb24bb655130491e3ef87ede923e901 URL: https://gitlab.winehq.org/wine/wine/-/commit/3265019d7cb24bb655130491e3ef87… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 13 18:42:26 2022 +0200 d3dx10: Add support for texture cubes in D3DX10CreateTexture functions. --- dlls/d3dx10_43/tests/d3dx10.c | 7 -- dlls/d3dx10_43/texture.c | 155 ++++++++++++++++++++++++++++-------------- 2 files changed, 104 insertions(+), 58 deletions(-)

1 0