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

Piotr Caban : d3dx10: Don't check frame count in load_texture_data.
by Alexandre Julliard 30 Aug '22

30 Aug '22

Module: wine Branch: master Commit: d1c03fe48a225b1bebef15178758266d1e8d23d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1c03fe48a225b1bebef1517875826… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 13 19:30:12 2022 +0200 d3dx10: Don't check frame count in load_texture_data. --- dlls/d3dx10_43/texture.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index cb00ef45eb0..e1c7742b409 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 frame_count, stride, frame_size, i; + unsigned int stride, frame_size, i; IWICDdsFrameDecode *dds_frame = NULL; IWICBitmapFrameDecode *frame = NULL; IWICImagingFactory *factory = NULL; @@ -873,8 +873,6 @@ HRESULT load_texture_data(const void *data, SIZE_T size, D3DX10_IMAGE_LOAD_INFO goto end; if (FAILED(hr = IWICImagingFactory_CreateDecoderFromStream(factory, (IStream *)stream, NULL, 0, &decoder))) goto end; - if (FAILED(hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count)) || !frame_count) - goto end; if (img_info.ImageFileFormat == D3DX10_IFF_DDS) {

1 0

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

30 Aug '22

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

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

30 Aug '22

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

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

30 Aug '22

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

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

30 Aug '22

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 30 Aug '22

30 Aug '22

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

Alexandre Julliard : kernelbase: Fix error value for PE files without resource.
by Alexandre Julliard 30 Aug '22

30 Aug '22

Module: wine Branch: master Commit: a8b007da5889f4cfac3651bab7090f7f65176f86 URL: https://gitlab.winehq.org/wine/wine/-/commit/a8b007da5889f4cfac3651bab7090f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 30 18:23:48 2022 +0200 kernelbase: Fix error value for PE files without resource. Avoids spurious "dll is missing" messages from winetest. --- dlls/kernelbase/version.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index 01e29d55dfc..4d5a8a4de93 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -775,7 +775,7 @@ DWORD WINAPI GetFileVersionInfoSizeExW( DWORD flags, LPCWSTR filename, LPDWORD r if (flags & ~FILE_VER_GET_LOCALISED) FIXME("flags 0x%lx ignored\n", flags & ~FILE_VER_GET_LOCALISED); - if ((hModule = LoadLibraryExW( filename, 0, LOAD_LIBRARY_AS_DATAFILE ))) + if ((hModule = LoadLibraryExW( filename, 0, LOAD_LIBRARY_AS_IMAGE_RESOURCE ))) { HRSRC hRsrc = NULL; if (!(flags & FILE_VER_GET_LOCALISED)) @@ -794,8 +794,7 @@ DWORD WINAPI GetFileVersionInfoSizeExW( DWORD flags, LPCWSTR filename, LPDWORD r } FreeLibrary( hModule ); } - - if (magic == 1) + else { HANDLE handle = CreateFileW( filename, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); @@ -881,7 +880,7 @@ BOOL WINAPI GetFileVersionInfoExW( DWORD flags, LPCWSTR filename, DWORD ignored, if (flags & ~FILE_VER_GET_LOCALISED) FIXME("flags 0x%lx ignored\n", flags & ~FILE_VER_GET_LOCALISED); - if ((hModule = LoadLibraryExW( filename, 0, LOAD_LIBRARY_AS_DATAFILE ))) + if ((hModule = LoadLibraryExW( filename, 0, LOAD_LIBRARY_AS_IMAGE_RESOURCE ))) { HRSRC hRsrc = NULL; if (!(flags & FILE_VER_GET_LOCALISED)) @@ -903,8 +902,7 @@ BOOL WINAPI GetFileVersionInfoExW( DWORD flags, LPCWSTR filename, DWORD ignored, } FreeLibrary( hModule ); } - - if (magic == 1) + else { HANDLE handle = CreateFileW( filename, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 );

1 0

Alexandre Julliard : include: Simplify handling of va_list in debug printf functions.
by Alexandre Julliard 30 Aug '22

30 Aug '22

Module: wine Branch: master Commit: 4d0468e316893fa3a3677dc49c8741268033ce3d URL: https://gitlab.winehq.org/wine/wine/-/commit/4d0468e316893fa3a3677dc49c8741… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 30 18:32:09 2022 +0200 include: Simplify handling of va_list in debug printf functions. --- include/wine/debug.h | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index da0a02d89f5..74034025618 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -164,25 +164,19 @@ extern int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine #if (defined(__x86_64__) || (defined(__aarch64__) && __has_attribute(ms_abi))) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) # define __wine_dbg_cdecl __cdecl -# define __wine_dbg_va_list __builtin_ms_va_list -# define __wine_dbg_va_start(list,arg) __builtin_ms_va_start(list,arg) -# define __wine_dbg_va_end(list) __builtin_ms_va_end(list) #else # define __wine_dbg_cdecl -# define __wine_dbg_va_list va_list -# define __wine_dbg_va_start(list,arg) va_start(list,arg) -# define __wine_dbg_va_end(list) va_end(list) #endif static const char * __wine_dbg_cdecl wine_dbg_sprintf( const char *format, ... ) __WINE_PRINTF_ATTR(1,2); static inline const char * __wine_dbg_cdecl wine_dbg_sprintf( const char *format, ... ) { char buffer[200]; - __wine_dbg_va_list args; + va_list args; - __wine_dbg_va_start( args, format ); + va_start( args, format ); vsnprintf( buffer, sizeof(buffer), format, args ); - __wine_dbg_va_end( args ); + va_end( args ); return __wine_dbg_strdup( buffer ); } @@ -190,11 +184,11 @@ static int __wine_dbg_cdecl wine_dbg_printf( const char *format, ... ) __WINE_PR static inline int __wine_dbg_cdecl wine_dbg_printf( const char *format, ... ) { char buffer[1024]; - __wine_dbg_va_list args; + va_list args; - __wine_dbg_va_start( args, format ); + va_start( args, format ); vsnprintf( buffer, sizeof(buffer), format, args ); - __wine_dbg_va_end( args ); + va_end( args ); return __wine_dbg_output( buffer ); } @@ -206,7 +200,7 @@ static inline int __wine_dbg_cdecl wine_dbg_log( enum __wine_debug_class cls, const char *function, const char *format, ... ) { char buffer[1024]; - __wine_dbg_va_list args; + va_list args; int ret; if (*format == '\1') /* special magic to avoid standard prefix */ @@ -216,9 +210,9 @@ static inline int __wine_dbg_cdecl wine_dbg_log( enum __wine_debug_class cls, } if ((ret = __wine_dbg_header( cls, channel, function )) == -1) return ret; - __wine_dbg_va_start( args, format ); + va_start( args, format ); vsnprintf( buffer, sizeof(buffer), format, args ); - __wine_dbg_va_end( args ); + va_end( args ); ret += __wine_dbg_output( buffer ); return ret; }

1 0

Alexandre Julliard : include: Add va_list version of the debug printf functions.
by Alexandre Julliard 30 Aug '22

30 Aug '22

Module: wine Branch: master Commit: 96742389f69d610719440793a88f818287dcd7b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/96742389f69d610719440793a88f81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 30 18:33:11 2022 +0200 include: Add va_list version of the debug printf functions. --- include/wine/debug.h | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index 74034025618..115f5c396b9 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -168,28 +168,46 @@ extern int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine # define __wine_dbg_cdecl #endif +static const char * __wine_dbg_cdecl wine_dbg_vsprintf( const char *format, va_list args ) __WINE_PRINTF_ATTR(1,0); +static inline const char * __wine_dbg_cdecl wine_dbg_vsprintf( const char *format, va_list args ) +{ + char buffer[200]; + + vsnprintf( buffer, sizeof(buffer), format, args ); + return __wine_dbg_strdup( buffer ); +} + static const char * __wine_dbg_cdecl wine_dbg_sprintf( const char *format, ... ) __WINE_PRINTF_ATTR(1,2); static inline const char * __wine_dbg_cdecl wine_dbg_sprintf( const char *format, ... ) { - char buffer[200]; + const char *ret; va_list args; va_start( args, format ); - vsnprintf( buffer, sizeof(buffer), format, args ); + ret = wine_dbg_vsprintf( format, args ); va_end( args ); - return __wine_dbg_strdup( buffer ); + return ret; +} + +static int __wine_dbg_cdecl wine_dbg_vprintf( const char *format, va_list args ) __WINE_PRINTF_ATTR(1,0); +static inline int __wine_dbg_cdecl wine_dbg_vprintf( const char *format, va_list args ) +{ + char buffer[1024]; + + vsnprintf( buffer, sizeof(buffer), format, args ); + return __wine_dbg_output( buffer ); } static int __wine_dbg_cdecl wine_dbg_printf( const char *format, ... ) __WINE_PRINTF_ATTR(1,2); static inline int __wine_dbg_cdecl wine_dbg_printf( const char *format, ... ) { - char buffer[1024]; + int ret; va_list args; va_start( args, format ); - vsnprintf( buffer, sizeof(buffer), format, args ); + ret = wine_dbg_vprintf( format, args ); va_end( args ); - return __wine_dbg_output( buffer ); + return ret; } static int __wine_dbg_cdecl wine_dbg_log( enum __wine_debug_class cls,

1 0

Henri Verbeet : include: Avoid _t-suffixes.
by Alexandre Julliard 30 Aug '22

30 Aug '22

Module: wine Branch: master Commit: 57c9bc90568d2d86dceca0c613d2fb3c075fb3a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/57c9bc90568d2d86dceca0c613d2fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 30 21:35:36 2022 +0200 include: Avoid _t-suffixes. The _t-suffix is reserved by POSIX. Cherry-picked from vkd3d commit 78c203b395b1fa4b5918cf881ebba8e9d47ae997. --- include/wine/rbtree.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/wine/rbtree.h b/include/wine/rbtree.h index 4e86f3cfb84..81367f3f7c4 100644 --- a/include/wine/rbtree.h +++ b/include/wine/rbtree.h @@ -34,15 +34,15 @@ struct rb_entry unsigned int flags; }; -typedef int (*rb_compare_func_t)(const void *key, const struct rb_entry *entry); +typedef int (*rb_compare_func)(const void *key, const struct rb_entry *entry); struct rb_tree { - rb_compare_func_t compare; + rb_compare_func compare; struct rb_entry *root; }; -typedef void (rb_traverse_func_t)(struct rb_entry *entry, void *context); +typedef void (rb_traverse_func)(struct rb_entry *entry, void *context); #define RB_FLAG_RED 0x1 @@ -164,25 +164,25 @@ static inline struct rb_entry *rb_postorder_next(struct rb_entry *iter) (elem) = (elem2)) -static inline void rb_postorder(struct rb_tree *tree, rb_traverse_func_t *callback, void *context) +static inline void rb_postorder(struct rb_tree *tree, rb_traverse_func *callback, void *context) { struct rb_entry *iter, *next; RB_FOR_EACH_DESTRUCTOR(iter, next, tree) callback(iter, context); } -static inline void rb_init(struct rb_tree *tree, rb_compare_func_t compare) +static inline void rb_init(struct rb_tree *tree, rb_compare_func compare) { tree->compare = compare; tree->root = NULL; } -static inline void rb_for_each_entry(struct rb_tree *tree, rb_traverse_func_t *callback, void *context) +static inline void rb_for_each_entry(struct rb_tree *tree, rb_traverse_func *callback, void *context) { struct rb_entry *iter; RB_FOR_EACH(iter, tree) callback(iter, context); } -static inline void rb_destroy(struct rb_tree *tree, rb_traverse_func_t *callback, void *context) +static inline void rb_destroy(struct rb_tree *tree, rb_traverse_func *callback, void *context) { /* Note that we use postorder here because the callback will likely free the entry. */ if (callback) rb_postorder(tree, callback, context);

1 0