wine-commits

wine-commits@winehq.org

1 participants
185885 discussions

Hans Leidekker : wmic: Add csproduct and systemenclosure aliases.
by Alexandre Julliard 03 Jun '24

03 Jun '24

Module: wine Branch: master Commit: cd780fe609baacbba389f5f63b823542cdcbc4c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/cd780fe609baacbba389f5f63b8235… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 3 09:41:37 2024 +0200 wmic: Add csproduct and systemenclosure aliases. --- programs/wmic/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index 6fa90981521..02a07f03d2e 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -47,6 +47,7 @@ alias_map[] = { L"bios", L"Win32_BIOS" }, { L"computersystem", L"Win32_ComputerSystem" }, { L"cpu", L"Win32_Processor" }, + { L"csproduct", L"Win32_ComputerSystemProduct" }, { L"diskdrive", L"Win32_DiskDrive" }, { L"logicaldisk", L"Win32_LogicalDisk" }, { L"memorychip", L"Win32_PhysicalMemory" }, @@ -54,6 +55,7 @@ alias_map[] = { L"nicconfig", L"Win32_NetworkAdapterConfiguration" }, { L"os", L"Win32_OperatingSystem" }, { L"process", L"Win32_Process" }, + { L"systemenclosure", L"Win32_SystemEnclosure" }, }; static const WCHAR *find_class( const WCHAR *alias )

1 0

Hans Leidekker : wmic: Sort the alias list.
by Alexandre Julliard 03 Jun '24

03 Jun '24

Module: wine Branch: master Commit: a293b2f23a454c9c36dc64ff36b0e2739b811102 URL: https://gitlab.winehq.org/wine/wine/-/commit/a293b2f23a454c9c36dc64ff36b0e2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 3 11:40:44 2024 +0200 wmic: Sort the alias list. --- programs/wmic/main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index f996d8018f4..6fa90981521 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -43,17 +43,17 @@ static const struct } alias_map[] = { + { L"baseboard", L"Win32_BaseBoard" }, { L"bios", L"Win32_BIOS" }, { L"computersystem", L"Win32_ComputerSystem" }, { L"cpu", L"Win32_Processor" }, - { L"LogicalDisk", L"Win32_LogicalDisk" }, - { L"nic", L"Win32_NetworkAdapter" }, - { L"os", L"Win32_OperatingSystem" }, - { L"process", L"Win32_Process" }, - { L"baseboard", L"Win32_BaseBoard" }, { L"diskdrive", L"Win32_DiskDrive" }, + { L"logicaldisk", L"Win32_LogicalDisk" }, { L"memorychip", L"Win32_PhysicalMemory" }, + { L"nic", L"Win32_NetworkAdapter" }, { L"nicconfig", L"Win32_NetworkAdapterConfiguration" }, + { L"os", L"Win32_OperatingSystem" }, + { L"process", L"Win32_Process" }, }; static const WCHAR *find_class( const WCHAR *alias )

1 0

Danyil Blyschak : wineps.drv: Call ResetDCW() to update Devmode in the Unix interface.
by Alexandre Julliard 03 Jun '24

03 Jun '24

Module: wine Branch: master Commit: a3e33d40a846e570f673294fa523b52925e80d8b URL: https://gitlab.winehq.org/wine/wine/-/commit/a3e33d40a846e570f673294fa523b5… Author: Danyil Blyschak <dblyschak(a)codeweavers.com> Date: Mon Jun 3 09:58:17 2024 -0500 wineps.drv: Call ResetDCW() to update Devmode in the Unix interface. Previously, PSDRV_ResetDC() only updated the devmode contained in the print context, which could cause the devmode in the unix interface to be inconsistent with the print context's devmode. This can cause problems later when PostScript is being outputted, as get_device_caps() in the unix interface would reference this inconsistent devmode. By calling ResetDCW() in PSDRV_ResetDC(), these two devmodes remain in-sync. --- dlls/wineps.drv/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 10e8e77e52d..ec4dc174cf9 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -467,7 +467,7 @@ BOOL PSDRV_ResetDC( print_ctx *ctx, const DEVMODEW *devmode ) dump_devmode( devmode ); PSDRV_MergeDevmodes( ctx->Devmode, devmode, ctx->pi ); } - return TRUE; + return !!ResetDCW( ctx->hdc, devmode ); } static PRINTER_ENUM_VALUESW *load_font_sub_table( HANDLE printer, DWORD *num_entries )

1 0

Connor McAdams : d3dx9: Use d3dx_load_pixels_from_pixels() in D3DXLoadVolumeFromMemory().
by Alexandre Julliard 03 Jun '24

03 Jun '24

Module: wine Branch: master Commit: 242be50f01231b3ef2744525d490ac66245ef4c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/242be50f01231b3ef2744525d490ac… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu May 30 10:34:04 2024 -0400 d3dx9: Use d3dx_load_pixels_from_pixels() in D3DXLoadVolumeFromMemory(). Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/d3dx9_private.h | 8 +++ dlls/d3dx9_36/surface.c | 105 +++++++++++++++++++------------ dlls/d3dx9_36/tests/volume.c | 2 +- dlls/d3dx9_36/volume.c | 142 ++++++++++++++---------------------------- 4 files changed, 122 insertions(+), 135 deletions(-)

1 0

Connor McAdams : d3dx9: Use d3dx_pixels structure in decompression helper function.
by Alexandre Julliard 03 Jun '24

03 Jun '24

Module: wine Branch: master Commit: 3241270b85f4cf20dc5d963613d2de79ccb7a8d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/3241270b85f4cf20dc5d963613d2de… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Sun May 26 08:21:20 2024 -0400 d3dx9: Use d3dx_pixels structure in decompression helper function. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/surface.c | 52 +++++++++++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 327af791489..a249fedde84 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1901,12 +1901,12 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic } } -static HRESULT d3dx_image_decompress(const void *memory, uint32_t row_pitch, const RECT *rect, - const RECT *unaligned_rect, const struct volume *size, const struct pixel_format_desc *desc, - void **out_memory, uint32_t *out_row_pitch, RECT *out_rect, const struct pixel_format_desc **out_desc) +static HRESULT d3dx_pixels_decompress(struct d3dx_pixels *pixels, const struct pixel_format_desc *desc, + BOOL is_dst, void **out_memory, uint32_t *out_row_pitch, const struct pixel_format_desc **out_desc) { void (*fetch_dxt_texel)(int srcRowStride, const BYTE *pixdata, int i, int j, void *texel); const struct pixel_format_desc *uncompressed_desc = NULL; + const struct volume *size = &pixels->size; uint32_t x, y, tmp_pitch; BYTE *uncompressed_mem; @@ -1934,11 +1934,26 @@ static HRESULT d3dx_image_decompress(const void *memory, uint32_t row_pitch, con if (!(uncompressed_mem = malloc(size->width * size->height * size->depth * uncompressed_desc->bytes_per_pixel))) return E_OUTOFMEMORY; - if (unaligned_rect && EqualRect(rect, unaligned_rect)) - goto exit; + /* + * For compressed destination pixels, width/height will represent + * the entire set of compressed blocks our destination rectangle touches. + * If we're only updating a sub-area of any blocks, we need to decompress + * the pixels outside of the sub-area. + */ + if (is_dst) + { + const RECT aligned_rect = { 0, 0, size->width, size->height }; - TRACE("Decompressing image.\n"); - tmp_pitch = row_pitch * desc->block_width / desc->block_byte_count; + /* + * If our destination covers the entire set of blocks, no + * decompression needs to be done, just return the allocated memory. + */ + if (EqualRect(&aligned_rect, &pixels->unaligned_rect)) + goto exit; + } + + TRACE("Decompressing pixels.\n"); + tmp_pitch = pixels->row_pitch * desc->block_width / desc->block_byte_count; for (y = 0; y < size->height; ++y) { BYTE *ptr = &uncompressed_mem[y * size->width * uncompressed_desc->bytes_per_pixel]; @@ -1946,8 +1961,11 @@ static HRESULT d3dx_image_decompress(const void *memory, uint32_t row_pitch, con { const POINT pt = { x, y }; - if (!PtInRect(unaligned_rect, pt)) - fetch_dxt_texel(tmp_pitch, (BYTE *)memory, x + rect->left, y + rect->top, ptr); + if (!is_dst) + fetch_dxt_texel(tmp_pitch, (BYTE *)pixels->data, x + pixels->unaligned_rect.left, + y + pixels->unaligned_rect.top, ptr); + else if (!PtInRect(&pixels->unaligned_rect, pt)) + fetch_dxt_texel(tmp_pitch, (BYTE *)pixels->data, x, y, ptr); ptr += uncompressed_desc->bytes_per_pixel; } } @@ -1955,10 +1973,6 @@ static HRESULT d3dx_image_decompress(const void *memory, uint32_t row_pitch, con exit: *out_memory = uncompressed_mem; *out_row_pitch = size->width * uncompressed_desc->bytes_per_pixel; - if (unaligned_rect) - *out_rect = *unaligned_rect; - else - SetRect(out_rect, 0, 0, size->width, size->height); *out_desc = uncompressed_desc; return S_OK; @@ -2069,10 +2083,9 @@ static HRESULT d3dx_load_pixels_from_pixels(struct d3dx_pixels *dst_pixels, const struct pixel_format_desc *uncompressed_desc; uint32_t uncompressed_row_pitch; void *uncompressed_mem = NULL; - RECT uncompressed_rect; - hr = d3dx_image_decompress(src_pixels->data, src_pixels->row_pitch, &src_pixels->unaligned_rect, NULL, - &src_size, src_desc, &uncompressed_mem, &uncompressed_row_pitch, &uncompressed_rect, &uncompressed_desc); + hr = d3dx_pixels_decompress(src_pixels, src_desc, FALSE, &uncompressed_mem, &uncompressed_row_pitch, + &uncompressed_desc); if (SUCCEEDED(hr)) { struct d3dx_pixels uncompressed_pixels; @@ -2093,14 +2106,11 @@ static HRESULT d3dx_load_pixels_from_pixels(struct d3dx_pixels *dst_pixels, { const struct pixel_format_desc *uncompressed_desc; struct d3dx_pixels uncompressed_pixels; - RECT uncompressed_rect, aligned_rect; uint32_t uncompressed_row_pitch; void *uncompressed_mem = NULL; - SetRect(&aligned_rect, 0, 0, dst_pixels->size.width, dst_pixels->size.height); - hr = d3dx_image_decompress(dst_pixels->data, dst_pixels->row_pitch, &aligned_rect, - &dst_pixels->unaligned_rect, &dst_size_aligned, dst_desc, &uncompressed_mem, &uncompressed_row_pitch, - &uncompressed_rect, &uncompressed_desc); + hr = d3dx_pixels_decompress(dst_pixels, dst_desc, TRUE, &uncompressed_mem, &uncompressed_row_pitch, + &uncompressed_desc); if (FAILED(hr)) goto exit;

1 0

Connor McAdams : d3dx9: Introduce d3dx_load_pixels_from_pixels() helper function.
by Alexandre Julliard 03 Jun '24

03 Jun '24

Module: wine Branch: master Commit: 4a98510663e9d4029213f84658b3fb96aab32d41 URL: https://gitlab.winehq.org/wine/wine/-/commit/4a98510663e9d4029213f84658b3fb… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Sun May 26 08:05:55 2024 -0400 d3dx9: Introduce d3dx_load_pixels_from_pixels() helper function. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/d3dx9_private.h | 13 +++ dlls/d3dx9_36/surface.c | 178 +++++++++++++++++++++++++++++------------- 2 files changed, 136 insertions(+), 55 deletions(-)

1 0

Connor McAdams : d3dx9: Use d3dx_image structure in D3DXLoadSurfaceFromFileInMemory().
by Alexandre Julliard 03 Jun '24

03 Jun '24

Module: wine Branch: master Commit: 5473dd6963c66f0e58f8b1fb8265d93001e5df12 URL: https://gitlab.winehq.org/wine/wine/-/commit/5473dd6963c66f0e58f8b1fb8265d9… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Sun May 26 07:43:56 2024 -0400 d3dx9: Use d3dx_image structure in D3DXLoadSurfaceFromFileInMemory(). Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/d3dx9_private.h | 28 ++++ dlls/d3dx9_36/surface.c | 348 +++++++++++++++++++----------------------- 2 files changed, 183 insertions(+), 193 deletions(-)

1 0

Connor McAdams : d3dx9: Introduce d3dx_image structure for use in D3DXGetImageInfoFromFileInMemory().
by Alexandre Julliard 03 Jun '24

03 Jun '24

Module: wine Branch: master Commit: 4e83d4a49fa4d0634d7ac76b9f7f7d501dba2063 URL: https://gitlab.winehq.org/wine/wine/-/commit/4e83d4a49fa4d0634d7ac76b9f7f7d… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri May 24 08:25:52 2024 -0400 d3dx9: Introduce d3dx_image structure for use in D3DXGetImageInfoFromFileInMemory(). Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/d3dx9_private.h | 13 +++ dlls/d3dx9_36/surface.c | 193 +++++++++++++++++++++--------------------- 2 files changed, 109 insertions(+), 97 deletions(-)

1 0

Connor McAdams : d3dx9: Refactor WIC image info retrieval code in D3DXGetImageInfoFromFileInMemory().
by Alexandre Julliard 03 Jun '24

03 Jun '24

Module: wine Branch: master Commit: a034bf0c7b510eb7f20cb6d8438d7070f4deb6f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/a034bf0c7b510eb7f20cb6d8438d70… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Apr 26 10:51:45 2024 -0400 d3dx9: Refactor WIC image info retrieval code in D3DXGetImageInfoFromFileInMemory(). Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/surface.c | 197 ++++++++++++++++++++++++++---------------------- 1 file changed, 106 insertions(+), 91 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 483cb61dd4e..892cffba363 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -976,6 +976,110 @@ static const char *debug_d3dx_image_file_format(D3DXIMAGE_FILEFORMAT format) } } +static HRESULT get_image_info_from_wic(const void *src_data, uint32_t src_data_size, D3DXIMAGE_INFO *info) +{ + IWICBitmapFrameDecode *bitmap_frame = NULL; + IWICBitmapDecoder *bitmap_decoder = NULL; + uint32_t src_image_size = src_data_size; + IWICImagingFactory *wic_factory = NULL; + const void *src_image = src_data; + WICPixelFormatGUID pixel_format; + IWICStream *wic_stream = NULL; + uint32_t frame_count = 0; + GUID container_format; + BOOL is_dib = FALSE; + HRESULT hr; + + hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &wic_factory); + if (FAILED(hr)) + return hr; + + is_dib = convert_dib_to_bmp(&src_image, &src_image_size); + hr = IWICImagingFactory_CreateStream(wic_factory, &wic_stream); + if (FAILED(hr)) + goto exit; + + hr = IWICStream_InitializeFromMemory(wic_stream, (BYTE *)src_image, src_image_size); + if (FAILED(hr)) + goto exit; + + hr = IWICImagingFactory_CreateDecoderFromStream(wic_factory, (IStream *)wic_stream, NULL, 0, &bitmap_decoder); + if (FAILED(hr)) + { + if ((src_image_size >= 2) && (!memcmp(src_image, "P3", 2) || !memcmp(src_image, "P6", 2))) + FIXME("File type PPM is not supported yet.\n"); + else if ((src_image_size >= 10) && !memcmp(src_image, "#?RADIANCE", 10)) + FIXME("File type HDR is not supported yet.\n"); + else if ((src_image_size >= 2) && (!memcmp(src_image, "PF", 2) || !memcmp(src_image, "Pf", 2))) + FIXME("File type PFM is not supported yet.\n"); + goto exit; + } + + hr = IWICBitmapDecoder_GetContainerFormat(bitmap_decoder, &container_format); + if (FAILED(hr)) + goto exit; + + info->ImageFileFormat = wic_container_guid_to_d3dx_file_format(&container_format); + if (is_dib && info->ImageFileFormat == D3DXIFF_BMP) + { + info->ImageFileFormat = D3DXIFF_DIB; + } + else if (info->ImageFileFormat == D3DXIFF_FORCE_DWORD) + { + WARN("Unsupported image file format %s.\n", debugstr_guid(&container_format)); + hr = D3DXERR_INVALIDDATA; + goto exit; + } + + TRACE("File type is %s.\n", debug_d3dx_image_file_format(info->ImageFileFormat)); + hr = IWICBitmapDecoder_GetFrameCount(bitmap_decoder, &frame_count); + if (FAILED(hr) || (SUCCEEDED(hr) && !frame_count)) + { + hr = D3DXERR_INVALIDDATA; + goto exit; + } + + hr = IWICBitmapDecoder_GetFrame(bitmap_decoder, 0, &bitmap_frame); + if (FAILED(hr)) + goto exit; + + hr = IWICBitmapFrameDecode_GetSize(bitmap_frame, &info->Width, &info->Height); + if (FAILED(hr)) + goto exit; + + hr = IWICBitmapFrameDecode_GetPixelFormat(bitmap_frame, &pixel_format); + if (FAILED(hr)) + goto exit; + + if ((info->Format = wic_guid_to_d3dformat(&pixel_format)) == D3DFMT_UNKNOWN) + { + WARN("Unsupported pixel format %s.\n", debugstr_guid(&pixel_format)); + hr = D3DXERR_INVALIDDATA; + goto exit; + } + + if (image_is_argb(bitmap_frame, info)) + info->Format = D3DFMT_A8R8G8B8; + + info->Depth = 1; + info->MipLevels = 1; + info->ResourceType = D3DRTYPE_TEXTURE; + +exit: + if (is_dib) + free((void *)src_image); + if (bitmap_frame) + IWICBitmapFrameDecode_Release(bitmap_frame); + if (bitmap_decoder) + IWICBitmapDecoder_Release(bitmap_decoder); + if (wic_stream) + IWICStream_Release(wic_stream); + if (wic_factory) + IWICImagingFactory_Release(wic_factory); + + return hr; +} + /************************************************************ * D3DXGetImageInfoFromFileInMemory * @@ -999,11 +1103,7 @@ static const char *debug_d3dx_image_file_format(D3DXIMAGE_FILEFORMAT format) */ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(const void *data, UINT datasize, D3DXIMAGE_INFO *info) { - IWICImagingFactory *factory; - IWICBitmapDecoder *decoder = NULL; - IWICStream *stream; HRESULT hr; - BOOL dib; TRACE("(%p, %d, %p)\n", data, datasize, info); @@ -1016,93 +1116,8 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(const void *data, UINT datasize, if ((datasize >= 4) && !strncmp(data, "DDS ", 4)) { TRACE("File type is DDS\n"); return get_image_info_from_dds(data, datasize, info); - } - - /* In case of DIB file, convert it to BMP */ - dib = convert_dib_to_bmp(&data, &datasize); - - hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory); - - if (SUCCEEDED(hr)) { - IWICImagingFactory_CreateStream(factory, &stream); - IWICStream_InitializeFromMemory(stream, (BYTE*)data, datasize); - hr = IWICImagingFactory_CreateDecoderFromStream(factory, (IStream*)stream, NULL, 0, &decoder); - IWICStream_Release(stream); - IWICImagingFactory_Release(factory); - } - - if (FAILED(hr)) { - if ((datasize >= 2) && (!strncmp(data, "P3", 2) || !strncmp(data, "P6", 2))) - FIXME("File type PPM is not supported yet\n"); - else if ((datasize >= 10) && !strncmp(data, "#?RADIANCE", 10)) - FIXME("File type HDR is not supported yet\n"); - else if ((datasize >= 2) && (!strncmp(data, "PF", 2) || !strncmp(data, "Pf", 2))) - FIXME("File type PFM is not supported yet\n"); - } - - if (SUCCEEDED(hr)) { - GUID container_format; - UINT frame_count; - - hr = IWICBitmapDecoder_GetContainerFormat(decoder, &container_format); - if (SUCCEEDED(hr)) { - D3DXIMAGE_FILEFORMAT file_format = wic_container_guid_to_d3dx_file_format(&container_format); - - if (dib && file_format == D3DXIFF_BMP) - file_format = D3DXIFF_DIB; - if (file_format == D3DXIFF_FORCE_DWORD) { - WARN("Unsupported image file format %s\n", debugstr_guid(&container_format)); - hr = D3DXERR_INVALIDDATA; - } - else { - info->ImageFileFormat = file_format; - TRACE("File type is %s.\n", debug_d3dx_image_file_format(file_format)); - } - } - - if (SUCCEEDED(hr)) - hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); - if (SUCCEEDED(hr) && !frame_count) - hr = D3DXERR_INVALIDDATA; - - if (SUCCEEDED(hr)) { - IWICBitmapFrameDecode *frame = NULL; - - hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); - - if (SUCCEEDED(hr)) - hr = IWICBitmapFrameDecode_GetSize(frame, &info->Width, &info->Height); - - if (SUCCEEDED(hr)) { - WICPixelFormatGUID pixel_format; - - hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &pixel_format); - if (SUCCEEDED(hr)) { - info->Format = wic_guid_to_d3dformat(&pixel_format); - if (info->Format == D3DFMT_UNKNOWN) { - WARN("Unsupported pixel format %s\n", debugstr_guid(&pixel_format)); - hr = D3DXERR_INVALIDDATA; - } - } - } - - if (SUCCEEDED(hr) && image_is_argb(frame, info)) - info->Format = D3DFMT_A8R8G8B8; - - if (frame) - IWICBitmapFrameDecode_Release(frame); - - info->Depth = 1; - info->MipLevels = 1; - info->ResourceType = D3DRTYPE_TEXTURE; - } - } - - if (decoder) - IWICBitmapDecoder_Release(decoder); - - if (dib) - free((void*)data); + } else + hr = get_image_info_from_wic(data, datasize, info); if (FAILED(hr)) { TRACE("Invalid or unsupported image file\n");

1 0

Connor McAdams : d3dx9: Refactor WIC GUID to D3DXIMAGE_FILEFORMAT conversion code.
by Alexandre Julliard 03 Jun '24

03 Jun '24

Module: wine Branch: master Commit: b81b72765acfb374eb8cffaff85d92e8ef825eca URL: https://gitlab.winehq.org/wine/wine/-/commit/b81b72765acfb374eb8cffaff85d92… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Apr 26 10:09:10 2024 -0400 d3dx9: Refactor WIC GUID to D3DXIMAGE_FILEFORMAT conversion code. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/surface.c | 80 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 62 insertions(+), 18 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index ef6cd57c7da..483cb61dd4e 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -923,6 +923,59 @@ static BOOL image_is_argb(IWICBitmapFrameDecode *frame, const D3DXIMAGE_INFO *in return FALSE; } +struct d3dx_wic_file_format +{ + const GUID *wic_container_guid; + D3DXIMAGE_FILEFORMAT d3dx_file_format; +}; + +/* Sorted by GUID. */ +static const struct d3dx_wic_file_format file_formats[] = +{ + { &GUID_ContainerFormatBmp, D3DXIFF_BMP }, + { &GUID_WineContainerFormatTga, D3DXIFF_TGA }, + { &GUID_ContainerFormatJpeg, D3DXIFF_JPG }, + { &GUID_ContainerFormatPng, D3DXIFF_PNG }, +}; + +static int __cdecl d3dx_wic_file_format_guid_compare(const void *a, const void *b) +{ + const struct d3dx_wic_file_format *format = b; + const GUID *guid = a; + + return memcmp(guid, format->wic_container_guid, sizeof(*guid)); +} + +static D3DXIMAGE_FILEFORMAT wic_container_guid_to_d3dx_file_format(GUID *container_format) +{ + struct d3dx_wic_file_format *format; + + if ((format = bsearch(container_format, file_formats, ARRAY_SIZE(file_formats), sizeof(*format), + d3dx_wic_file_format_guid_compare))) + return format->d3dx_file_format; + return D3DXIFF_FORCE_DWORD; +} + +static const char *debug_d3dx_image_file_format(D3DXIMAGE_FILEFORMAT format) +{ + switch (format) + { +#define FMT_TO_STR(format) case format: return #format + FMT_TO_STR(D3DXIFF_BMP); + FMT_TO_STR(D3DXIFF_JPG); + FMT_TO_STR(D3DXIFF_TGA); + FMT_TO_STR(D3DXIFF_PNG); + FMT_TO_STR(D3DXIFF_DDS); + FMT_TO_STR(D3DXIFF_PPM); + FMT_TO_STR(D3DXIFF_DIB); + FMT_TO_STR(D3DXIFF_HDR); + FMT_TO_STR(D3DXIFF_PFM); +#undef FMT_TO_STR + default: + return "unrecognized"; + } +} + /************************************************************ * D3DXGetImageInfoFromFileInMemory * @@ -993,27 +1046,18 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(const void *data, UINT datasize, hr = IWICBitmapDecoder_GetContainerFormat(decoder, &container_format); if (SUCCEEDED(hr)) { - if (IsEqualGUID(&container_format, &GUID_ContainerFormatBmp)) { - if (dib) { - TRACE("File type is DIB\n"); - info->ImageFileFormat = D3DXIFF_DIB; - } else { - TRACE("File type is BMP\n"); - info->ImageFileFormat = D3DXIFF_BMP; - } - } else if (IsEqualGUID(&container_format, &GUID_ContainerFormatPng)) { - TRACE("File type is PNG\n"); - info->ImageFileFormat = D3DXIFF_PNG; - } else if(IsEqualGUID(&container_format, &GUID_ContainerFormatJpeg)) { - TRACE("File type is JPG\n"); - info->ImageFileFormat = D3DXIFF_JPG; - } else if(IsEqualGUID(&container_format, &GUID_WineContainerFormatTga)) { - TRACE("File type is TGA\n"); - info->ImageFileFormat = D3DXIFF_TGA; - } else { + D3DXIMAGE_FILEFORMAT file_format = wic_container_guid_to_d3dx_file_format(&container_format); + + if (dib && file_format == D3DXIFF_BMP) + file_format = D3DXIFF_DIB; + if (file_format == D3DXIFF_FORCE_DWORD) { WARN("Unsupported image file format %s\n", debugstr_guid(&container_format)); hr = D3DXERR_INVALIDDATA; } + else { + info->ImageFileFormat = file_format; + TRACE("File type is %s.\n", debug_d3dx_image_file_format(file_format)); + } } if (SUCCEEDED(hr))

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits