January 2024 - Wine-commits

Piotr Caban : msvcrt: Store _unDName function parameter backreferences in parsed_symbol structure.
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: wine Branch: master Commit: 779ba03bcda26895fab21d396442b302c004cd4c URL: https://gitlab.winehq.org/wine/wine/-/commit/779ba03bcda26895fab21d396442b3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 29 13:45:06 2024 +0100 msvcrt: Store _unDName function parameter backreferences in parsed_symbol structure. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53934 --- dlls/msvcrt/tests/cpp.c | 6 ++++++ dlls/msvcrt/undname.c | 29 +++++++++++++++++++++-------- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index d230659404d..5716455424a 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1324,6 +1324,12 @@ static void test_demangle(void) "void __cdecl <CrtImplementationDetails>::RegisterModuleUninitializer(class System::EventHandler ^)"}, /* 151 */ {"?RegisterModuleUninitializer@<CrtImplementationDetails>@@YAXBE$AAVEventHandler(a)System@@@Z", "void __cdecl <CrtImplementationDetails>::RegisterModuleUninitializer(class System::EventHandler % __ptr64 volatile)"}, +/* 152 */ {"??$forward(a)AEAUFFIValue@?1??call(a)FFIFunctionBinder@@CAHPEAUlua_State@@@Z@@std@@YAAEAUFFIValue@?1??call@" + "FFIFunctionBinder@@CAHPEAUxlua_State@@@Z(a)AEAU1?1??23(a)CAH0@Z@@Z", + "struct `private: static int __cdecl FFIFunctionBinder::call(struct xlua_State * __ptr64)'::`2'::FFIValue & " + "__ptr64 __cdecl std::forward<struct `private: static int __cdecl FFIFunctionBinder::call(struct lua_State " + "* __ptr64)'::`2'::FFIValue & __ptr64>(struct `private: static int __cdecl FFIFunctionBinder::call(struct " + "xlua_State * __ptr64)'::`2'::FFIValue & __ptr64)"}, }; int i, num_test = ARRAY_SIZE(test); char* name; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 91d4fdbc3eb..21a4924b6a4 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -70,6 +70,7 @@ struct parsed_symbol char* result; /* demangled string */ struct array names; /* array of names for back reference */ + struct array args; /* array of arguments for back reference */ struct array stack; /* stack of parsed strings */ void* alloc_list; /* linked list of allocated blocks */ @@ -362,12 +363,15 @@ static char* get_args(struct parsed_symbol* sym, struct array* pmt_ref, BOOL z_t char* args_str = NULL; char* last; unsigned int i; + const char *p; str_array_init(&arg_collect); /* Now come the function arguments */ while (*sym->current) { + p = sym->current; + /* Decode each data type and append it to the argument list */ if (*sym->current == '@') { @@ -382,14 +386,20 @@ static char* get_args(struct parsed_symbol* sym, struct array* pmt_ref, BOOL z_t &arg_collect)) return NULL; if (!strcmp(ct.left, "...")) break; + if (z_term && sym->current - p > 1 && sym->args.num < 20) + { + if (!str_array_push(sym, ct.left ? ct.left : "", -1, &sym->args) || + !str_array_push(sym, ct.right ? ct.right : "", -1, &sym->args)) + return NULL; + } } /* Functions are always terminated by 'Z'. If we made it this far and * don't find it, we have incorrectly identified a data type. */ if (z_term && *sym->current++ != 'Z') return NULL; - if (arg_collect.num == 0 || - (arg_collect.num == 1 && !strcmp(arg_collect.elts[0], "void"))) + if (arg_collect.num == 0 || + (arg_collect.num == 1 && !strcmp(arg_collect.elts[0], "void"))) return str_printf(sym, "%cvoid%c", open_char, close_char); for (i = 1; i < arg_collect.num; i++) { @@ -398,12 +408,12 @@ static char* get_args(struct parsed_symbol* sym, struct array* pmt_ref, BOOL z_t last = args_str ? args_str : arg_collect.elts[0]; if (close_char == '>' && last[strlen(last) - 1] == '>') - args_str = str_printf(sym, "%c%s%s %c", + args_str = str_printf(sym, "%c%s%s %c", open_char, arg_collect.elts[0], args_str, close_char); else - args_str = str_printf(sym, "%c%s%s%c", + args_str = str_printf(sym, "%c%s%s%c", open_char, arg_collect.elts[0], args_str, close_char); - + return args_str; } @@ -642,6 +652,7 @@ static char* get_template_name(struct parsed_symbol* sym) unsigned num_mark = sym->names.num; unsigned start_mark = sym->names.start; unsigned stack_mark = sym->stack.num; + unsigned args_mark = sym->args.num; struct array array_pmt; sym->names.start = sym->names.num; @@ -656,6 +667,7 @@ static char* get_template_name(struct parsed_symbol* sym) sym->names.num = num_mark; sym->names.start = start_mark; sym->stack.num = stack_mark; + sym->args.num = args_mark; return name; } @@ -1043,9 +1055,8 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, case '5': case '6': case '7': case '8': case '9': /* Referring back to previously parsed type */ /* left and right are pushed as two separate strings */ - if (!pmt_ref) goto done; - ct->left = str_array_get_ref(pmt_ref, (dt - '0') * 2); - ct->right = str_array_get_ref(pmt_ref, (dt - '0') * 2 + 1); + ct->left = str_array_get_ref(&sym->args, (dt - '0') * 2); + ct->right = str_array_get_ref(&sym->args, (dt - '0') * 2 + 1); if (!ct->left) goto done; add_pmt = FALSE; break; @@ -1636,12 +1647,14 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) sym->current++; if (in_template) { + unsigned args_mark = sym->args.num; const char *args; struct array array_pmt; str_array_init(&array_pmt); args = get_args(sym, &array_pmt, FALSE, '<', '>'); if (args) function_name = function_name ? str_printf(sym, "%s%s", function_name, args) : args; + sym->args.num = args_mark; sym->names.num = 0; } if (!str_array_push(sym, function_name, -1, &sym->stack))

1 0

Piotr Caban : msvcrt: Remove no longer used parameters reference arguments from _unDname helpers.
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: wine Branch: master Commit: fdd9e257e2913ecb53fa3c31bfa9ed1ec65fce3c URL: https://gitlab.winehq.org/wine/wine/-/commit/fdd9e257e2913ecb53fa3c31bfa9ed… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 29 14:03:28 2024 +0100 msvcrt: Remove no longer used parameters reference arguments from _unDname helpers. --- dlls/msvcrt/undname.c | 73 ++++++++++++++++++--------------------------------- 1 file changed, 26 insertions(+), 47 deletions(-)

1 0

Nikolay Sivov : mfplat/tests: Skip device manager test if d3d11 device can't be created.
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: wine Branch: master Commit: 75b9c221b2344bd52300385bb6eefaabdf76eb06 URL: https://gitlab.winehq.org/wine/wine/-/commit/75b9c221b2344bd52300385bb6eefa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 29 10:41:16 2024 +0100 mfplat/tests: Skip device manager test if d3d11 device can't be created. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f8cf51cad3b..42d682be426 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5690,6 +5690,16 @@ static void test_dxgi_device_manager(void) return; } + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, D3D11_CREATE_DEVICE_VIDEO_SUPPORT, + NULL, 0, D3D11_SDK_VERSION, &d3d11_dev, NULL, NULL); + if (FAILED(hr)) + { + skip("Failed to create D3D11 device object.\n"); + return; + } + ok(hr == S_OK, "D3D11CreateDevice failed: %#lx.\n", hr); + EXPECT_REF(d3d11_dev, 1); + hr = pMFCreateDXGIDeviceManager(NULL, &manager); ok(hr == E_POINTER, "MFCreateDXGIDeviceManager should failed: %#lx.\n", hr); @@ -5721,11 +5731,6 @@ static void test_dxgi_device_manager(void) hr = IMFDXGIDeviceManager_CloseDeviceHandle(manager, 0); ok(hr == E_HANDLE, "Unexpected hr %#lx.\n", hr); - hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, D3D11_CREATE_DEVICE_VIDEO_SUPPORT, - NULL, 0, D3D11_SDK_VERSION, &d3d11_dev, NULL, NULL); - ok(hr == S_OK, "D3D11CreateDevice failed: %#lx.\n", hr); - EXPECT_REF(d3d11_dev, 1); - hr = IMFDXGIDeviceManager_ResetDevice(manager, (IUnknown *)d3d11_dev, token - 1); ok(hr == E_INVALIDARG, "IMFDXGIDeviceManager_ResetDevice should failed: %#lx.\n", hr); EXPECT_REF(d3d11_dev, 1);

1 0

Alexandre Julliard : ntdll: Use the system setjmp/longjmp for exceptions in Unix libs.
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: wine Branch: master Commit: 658a0665d4e947c0b1ed6971ba82ff7b3ca25290 URL: https://gitlab.winehq.org/wine/wine/-/commit/658a0665d4e947c0b1ed6971ba82ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 27 13:08:38 2024 +0100 ntdll: Use the system setjmp/longjmp for exceptions in Unix libs. --- dlls/ntdll/unix/signal_arm.c | 38 +----------------------------- dlls/ntdll/unix/signal_arm64.c | 51 +---------------------------------------- dlls/ntdll/unix/signal_i386.c | 35 ++-------------------------- dlls/ntdll/unix/signal_x86_64.c | 41 +-------------------------------- dlls/ntdll/unix/thread.c | 2 +- include/wine/unixlib.h | 25 +++++--------------- 6 files changed, 12 insertions(+), 180 deletions(-)

1 0

Alexandre Julliard : ntdll: Use a .seh handler for the unwind exception handler.
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: wine Branch: master Commit: f704b80a2652a41fb569c42207d317c75d8eeb77 URL: https://gitlab.winehq.org/wine/wine/-/commit/f704b80a2652a41fb569c42207d317… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 29 13:29:31 2024 +0100 ntdll: Use a .seh handler for the unwind exception handler. --- dlls/ntdll/signal_arm.c | 77 ++++++++++++++++++++++++++++++---------------- dlls/ntdll/signal_arm64.c | 66 +++++++++++++++++++++------------------ dlls/ntdll/signal_x86_64.c | 4 +-- 3 files changed, 88 insertions(+), 59 deletions(-)

1 0

Alexandre Julliard : ntdll: Avoid calling DbgBreakPoint() in process_breakpoint().
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: wine Branch: master Commit: d1836e226c003150fe0de19cf96f048eb82b0ac1 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1836e226c003150fe0de19cf96f04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 29 17:07:25 2024 +0100 ntdll: Avoid calling DbgBreakPoint() in process_breakpoint(). --- dlls/kernel32/tests/debugger.c | 11 +---------- dlls/ntdll/signal_i386.c | 2 +- dlls/ntdll/signal_x86_64.c | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index b0c69052936..5dc6ca77d48 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -1381,16 +1381,7 @@ static void test_debug_children(const char *name, DWORD flag, BOOL debug_child, /* Except for wxppro and w2008, the initial breakpoint is now somewhere else, possibly within LdrInitShimEngineDynamic, * It's also catching exceptions and ContinueDebugEvent(DBG_EXCEPTION_NOT_HANDLED) should not crash the child now */ - if (broken(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress == pDbgBreakPoint)) - { - win_skip("Ignoring initial breakpoint address check\n"); - pass_exception = FALSE; - } - else - { - todo_wine - ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress != pDbgBreakPoint, "ExceptionAddress == pDbgBreakPoint\n"); - } + ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress != pDbgBreakPoint, "ExceptionAddress == pDbgBreakPoint\n"); if (pass_exception) { diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 95efec5122c..ee20b5e011e 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -636,7 +636,7 @@ void WINAPI process_breakpoint(void) { __TRY { - DbgBreakPoint(); + __asm__ volatile("int $3"); } __EXCEPT_ALL { diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 17c1bb2a651..46357897369 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1734,7 +1734,7 @@ void WINAPI process_breakpoint(void) { __TRY { - DbgBreakPoint(); + __asm__ volatile("int $3"); } __EXCEPT_ALL {

1 0

Alexandre Julliard : ntdll: Move DbgUiRemoteBreakin() to the CPU backends.
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: wine Branch: master Commit: ba6a6d57813fa7a7e1b06bd697f8ddd934adad7a URL: https://gitlab.winehq.org/wine/wine/-/commit/ba6a6d57813fa7a7e1b06bd697f8dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 29 17:07:57 2024 +0100 ntdll: Move DbgUiRemoteBreakin() to the CPU backends. --- dlls/ntdll/process.c | 12 ------------ dlls/ntdll/signal_arm.c | 20 ++++++++++++++++++++ dlls/ntdll/signal_arm64.c | 20 ++++++++++++++++++++ dlls/ntdll/signal_arm64ec.c | 20 ++++++++++++++++++++ dlls/ntdll/signal_i386.c | 21 +++++++++++++++++++++ dlls/ntdll/signal_x86_64.c | 21 +++++++++++++++++++++ 6 files changed, 102 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 87090781bbd..dcdb26f81d1 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -36,8 +36,6 @@ #include "ntdll_misc.h" #include "wine/exception.h" -WINE_DEFAULT_DEBUG_CHANNEL(process); - /****************************************************************************** * RtlGetCurrentPeb [NTDLL.@] @@ -702,16 +700,6 @@ NTSTATUS WINAPI DbgUiConvertStateChangeStructure( DBGUI_WAIT_STATE_CHANGE *state return STATUS_SUCCESS; } -/*********************************************************************** - * DbgUiRemoteBreakin (NTDLL.@) - */ -void WINAPI DbgUiRemoteBreakin( void *arg ) -{ - TRACE( "\n" ); - if (NtCurrentTeb()->Peb->BeingDebugged) process_breakpoint(); - RtlExitUserThread( STATUS_SUCCESS ); -} - /*********************************************************************** * DbgUiIssueRemoteBreakin (NTDLL.@) */ diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 6eb113fc2c6..80d722ccacb 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1685,6 +1685,26 @@ void WINAPI process_breakpoint(void) } #endif +/*********************************************************************** + * DbgUiRemoteBreakin (NTDLL.@) + */ +void WINAPI DbgUiRemoteBreakin( void *arg ) +{ + if (NtCurrentTeb()->Peb->BeingDebugged) + { + __TRY + { + DbgBreakPoint(); + } + __EXCEPT_ALL + { + /* do nothing */ + } + __ENDTRY + } + RtlExitUserThread( STATUS_SUCCESS ); +} + /********************************************************************** * DbgBreakPoint (NTDLL.@) */ diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 24afe61533c..477f22029bd 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1582,6 +1582,26 @@ __ASM_GLOBAL_FUNC( process_breakpoint, "mov w0, #0\n\t" /* ExceptionContinueExecution */ "ret" ) +/*********************************************************************** + * DbgUiRemoteBreakin (NTDLL.@) + */ +void WINAPI DbgUiRemoteBreakin( void *arg ) +{ + if (NtCurrentTeb()->Peb->BeingDebugged) + { + __TRY + { + DbgBreakPoint(); + } + __EXCEPT_ALL + { + /* do nothing */ + } + __ENDTRY + } + RtlExitUserThread( STATUS_SUCCESS ); +} + /********************************************************************** * DbgBreakPoint (NTDLL.@) */ diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 97507d34c4f..8b4fd399c09 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -2016,6 +2016,26 @@ __ASM_GLOBAL_FUNC( "#process_breakpoint", "mov w0, #0\n\t" /* ExceptionContinueExecution */ "ret" ) +/*********************************************************************** + * DbgUiRemoteBreakin (NTDLL.@) + */ +void WINAPI DbgUiRemoteBreakin( void *arg ) +{ + if (NtCurrentTeb()->Peb->BeingDebugged) + { + __TRY + { + DbgBreakPoint(); + } + __EXCEPT_ALL + { + /* do nothing */ + } + __ENDTRY + } + RtlExitUserThread( STATUS_SUCCESS ); +} + /********************************************************************** * DbgBreakPoint (NTDLL.@) */ diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index ee20b5e011e..c4b0c84abfb 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -646,6 +646,27 @@ void WINAPI process_breakpoint(void) } +/*********************************************************************** + * DbgUiRemoteBreakin (NTDLL.@) + */ +void WINAPI DbgUiRemoteBreakin( void *arg ) +{ + if (NtCurrentTeb()->Peb->BeingDebugged) + { + __TRY + { + DbgBreakPoint(); + } + __EXCEPT_ALL + { + /* do nothing */ + } + __ENDTRY + } + RtlExitUserThread( STATUS_SUCCESS ); +} + + /********************************************************************** * DbgBreakPoint (NTDLL.@) */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 46357897369..be5851b8c31 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1745,6 +1745,27 @@ void WINAPI process_breakpoint(void) #endif +/*********************************************************************** + * DbgUiRemoteBreakin (NTDLL.@) + */ +void WINAPI DbgUiRemoteBreakin( void *arg ) +{ + if (NtCurrentTeb()->Peb->BeingDebugged) + { + __TRY + { + DbgBreakPoint(); + } + __EXCEPT_ALL + { + /* do nothing */ + } + __ENDTRY + } + RtlExitUserThread( STATUS_SUCCESS ); +} + + /********************************************************************** * DbgBreakPoint (NTDLL.@) */

1 0

David Kahurani : gdiplus: Use GdipCreatePath2 in GdipClonePath.
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: wine Branch: master Commit: 90fb47489e6e720037102f08b9e84df23fa0d211 URL: https://gitlab.winehq.org/wine/wine/-/commit/90fb47489e6e720037102f08b9e84d… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Wed Jan 24 12:30:22 2024 +0300 gdiplus: Use GdipCreatePath2 in GdipClonePath. This seems like a more effective interface and avoids code duplication. Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/gdiplus/graphicspath.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 9e186aa43d1..dabd458b312 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1185,24 +1185,15 @@ GpStatus WINGDIPAPI GdipClonePath(GpPath* path, GpPath **clone) if(!path || !clone) return InvalidParameter; - *clone = malloc(sizeof(GpPath)); - if(!*clone) return OutOfMemory; - - **clone = *path; - - (*clone)->pathdata.Points = malloc(path->datalen * sizeof(PointF)); - (*clone)->pathdata.Types = malloc(path->datalen); - if(!(*clone)->pathdata.Points || !(*clone)->pathdata.Types){ - free((*clone)->pathdata.Points); - free((*clone)->pathdata.Types); - free(*clone); - return OutOfMemory; + if (path->pathdata.Count) + return GdipCreatePath2(path->pathdata.Points, path->pathdata.Types, path->pathdata.Count, + path->fill, clone); + else + { + *clone = calloc(1, sizeof(GpPath)); + if(!*clone) return OutOfMemory; } - memcpy((*clone)->pathdata.Points, path->pathdata.Points, - path->datalen * sizeof(PointF)); - memcpy((*clone)->pathdata.Types, path->pathdata.Types, path->datalen); - return Ok; }

1 0

David Kahurani : gdiplus: Use GdipCreatePath2 when serializing paths.
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: wine Branch: master Commit: a430702b41ec084e1855442eadefaabeea56cf2a URL: https://gitlab.winehq.org/wine/wine/-/commit/a430702b41ec084e1855442eadefaa… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Wed Jan 24 14:30:26 2024 +0300 gdiplus: Use GdipCreatePath2 when serializing paths. This seems like a better interface and avoids duplicating code. Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/gdiplus/metafile.c | 46 ++++++++++++++++++++-------------------------- 1 file changed, 20 insertions(+), 26 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 5c50d0d1d37..6ccfc469c25 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -2006,7 +2006,6 @@ static GpStatus metafile_deserialize_image(const BYTE *record_data, UINT data_si static GpStatus metafile_deserialize_path(const BYTE *record_data, UINT data_size, GpPath **path) { EmfPlusPath *data = (EmfPlusPath *)record_data; - GpStatus status; BYTE *types; UINT size; DWORD i; @@ -2035,40 +2034,35 @@ static GpStatus metafile_deserialize_path(const BYTE *record_data, UINT data_siz if (data_size < size) return InvalidParameter; - status = GdipCreatePath(FillModeAlternate, path); - if (status != Ok) - return status; - - (*path)->pathdata.Count = data->PathPointCount; - (*path)->pathdata.Points = malloc(data->PathPointCount * sizeof(*(*path)->pathdata.Points)); - (*path)->pathdata.Types = malloc(data->PathPointCount * sizeof(*(*path)->pathdata.Types)); - (*path)->datalen = (*path)->pathdata.Count; - - if (!(*path)->pathdata.Points || !(*path)->pathdata.Types) + if (data->PathPointCount) { - GdipDeletePath(*path); - return OutOfMemory; - } + if (data->PathPointFlags & 0x4000) /* C */ + { + EmfPlusPoint *points = (EmfPlusPoint *)data->data; + GpPointF *temp = malloc(sizeof(GpPointF) * data->PathPointCount); - if (data->PathPointFlags & 0x4000) /* C */ - { - EmfPlusPoint *points = (EmfPlusPoint *)data->data; - for (i = 0; i < data->PathPointCount; i++) + for (i = 0; i < data->PathPointCount; i++) + { + temp[i].X = points[i].X; + temp[i].Y = points[i].Y; + } + + types = (BYTE *)(points + i); + GdipCreatePath2(temp, types, data->PathPointCount, FillModeAlternate, path); + free(temp); + } + else { - (*path)->pathdata.Points[i].X = points[i].X; - (*path)->pathdata.Points[i].Y = points[i].Y; + EmfPlusPointF *points = (EmfPlusPointF *)data->data; + types = (BYTE *)(points + data->PathPointCount); + return GdipCreatePath2((GpPointF*)points, types, data->PathPointCount, FillModeAlternate, path); } - types = (BYTE *)(points + i); } else { - EmfPlusPointF *points = (EmfPlusPointF *)data->data; - memcpy((*path)->pathdata.Points, points, sizeof(*points) * data->PathPointCount); - types = (BYTE *)(points + data->PathPointCount); + return GdipCreatePath(FillModeAlternate, path); } - memcpy((*path)->pathdata.Types, types, sizeof(*types) * data->PathPointCount); - return Ok; }

1 0

David Kahurani : gdiplus: Use path_list to path helper in GdipFlattenPath.
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: wine Branch: master Commit: ccc3568567f544d391429a3704a348fbc1febe9d URL: https://gitlab.winehq.org/wine/wine/-/commit/ccc3568567f544d391429a3704a348… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Sat Jan 6 23:19:35 2024 +0300 gdiplus: Use path_list to path helper in GdipFlattenPath. This avoids a situation where the lengthening code, assuming the data in the path is valid proceeds to lengthen the path further while transforming data from a path_list into a path. Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/gdiplus/graphicspath.c | 53 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 13 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index dabd458b312..502c5c6b645 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -103,6 +103,45 @@ static INT path_list_count(path_list_node_t *node) return count; } +static BOOL path_list_to_path(path_list_node_t *node, GpPath *path) +{ + INT i, count = path_list_count(node); + GpPointF *Points; + BYTE *Types; + + if (count == 0) + { + path->pathdata.Count = count; + return TRUE; + } + + Points = calloc(count, sizeof(GpPointF)); + Types = calloc(1, count); + + if (!Points || !Types) + { + free(Points); + free(Types); + return FALSE; + } + + for(i = 0; i < count; i++){ + Points[i] = node->pt; + Types[i] = node->type; + node = node->next; + } + + free(path->pathdata.Points); + free(path->pathdata.Types); + + path->pathdata.Points = Points; + path->pathdata.Types = Types; + path->pathdata.Count = count; + path->datalen = count; + + return TRUE; +} + struct flatten_bezier_job { path_list_node_t *start; @@ -1417,19 +1456,7 @@ GpStatus WINGDIPAPI GdipFlattenPath(GpPath *path, GpMatrix* matrix, REAL flatnes ++i; }/* while */ - /* store path data back */ - i = path_list_count(list); - if(!lengthen_path(path, i)) - goto memout; - path->pathdata.Count = i; - - node = list; - for(i = 0; i < path->pathdata.Count; i++){ - path->pathdata.Points[i] = node->pt; - path->pathdata.Types[i] = node->type; - node = node->next; - } - + if (!path_list_to_path(list, path)) goto memout; free_path_list(list); return Ok;

1 0