28 Jun
2024
28 Jun
'24
2:09 p.m.
Matteo Bruni (@Mystral) commented about dlls/d3dx9_36/volume.c:
+ if (!dst_volume || !src_data || !src_data_size) return D3DERR_INVALIDCALL;
- if (FAILED(hr = D3DXGetImageInfoFromFileInMemory(src_data, src_data_size, &image_info))) - return hr; + hr = d3dx_image_init(src_data, src_data_size, &image, 0, 0); + if (FAILED(hr)) + return D3DXERR_INVALIDDATA;
+ d3dximage_info_from_d3dx_image(&image_info, &image); if (src_box) { if (src_box->Right > image_info.Width || src_box->Bottom > image_info.Height || src_box->Back > image_info.Depth) return D3DERR_INVALIDCALL;
if (src_box->Right > image_info.Width
|| src_box->Bottom > image_info.Height
|| src_box->Back > image_info.Depth)
{
hr = D3DERR_INVALIDCALL;
goto exit;
}
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/5881#note_74666