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

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

Aug. 30, 2022

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

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

Aug. 30, 2022

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: Use WIC functions to obtain info about DDS image.
by Alexandre Julliard Aug. 30, 2022

Aug. 30, 2022

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: Factor out image format conversion function.
by Alexandre Julliard Aug. 30, 2022

Aug. 30, 2022

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

Jacek Caban : user32: Call winproc_init before dpiaware_init.
by Alexandre Julliard Aug. 30, 2022

Aug. 30, 2022

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 Aug. 30, 2022

Aug. 30, 2022

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

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

Aug. 30, 2022

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

Zebediah Figura : include: Add list_move_after() and list_move_before().
by Alexandre Julliard Aug. 30, 2022

Aug. 30, 2022

Module: wine Branch: master Commit: 099f84c4f07b67b63ff047dc230b916d565d1a9e URL: https://gitlab.winehq.org/wine/wine/-/commit/099f84c4f07b67b63ff047dc230b91… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 30 21:37:32 2022 +0200 include: Add list_move_after() and list_move_before(). Cherry-picked from vkd3d commit a2996c2d59b140a0a92efc85d43c8f9b59540a12. --- include/wine/list.h | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/include/wine/list.h b/include/wine/list.h index b4d681fe0f3..5e92cfb253c 100644 --- a/include/wine/list.h +++ b/include/wine/list.h @@ -150,8 +150,8 @@ static inline unsigned int list_count( const struct list *list ) return count; } -/* move all elements from src to the tail of dst */ -static inline void list_move_tail( struct list *dst, struct list *src ) +/* move all elements from src to before the specified element */ +static inline void list_move_before( struct list *dst, struct list *src ) { if (list_empty(src)) return; @@ -162,8 +162,8 @@ static inline void list_move_tail( struct list *dst, struct list *src ) list_init(src); } -/* move all elements from src to the head of dst */ -static inline void list_move_head( struct list *dst, struct list *src ) +/* move all elements from src to after the specified element */ +static inline void list_move_after( struct list *dst, struct list *src ) { if (list_empty(src)) return; @@ -174,6 +174,18 @@ static inline void list_move_head( struct list *dst, struct list *src ) list_init(src); } +/* move all elements from src to the head of dst */ +static inline void list_move_head( struct list *dst, struct list *src ) +{ + list_move_after( dst, src ); +} + +/* move all elements from src to the tail of dst */ +static inline void list_move_tail( struct list *dst, struct list *src ) +{ + list_move_before( dst, src ); +} + /* iterate through the list */ #define LIST_FOR_EACH(cursor,list) \ for ((cursor) = (list)->next; (cursor) != (list); (cursor) = (cursor)->next)

1 0

Henri Verbeet : include: Avoid _t-suffixes.
by Alexandre Julliard Aug. 30, 2022

Aug. 30, 2022

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

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

Aug. 30, 2022

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