May 2020 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Use the user shared data to implement RtlQueryUnbiasedInterruptTime().
by Alexandre Julliard May 21, 2020

May 21, 2020

Module: wine Branch: master Commit: 9b12068c6c8ba656e8ca768227b1a970877d4730 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b12068c6c8ba656e8ca7682… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 21 17:07:20 2020 +0200 ntdll: Use the user shared data to implement RtlQueryUnbiasedInterruptTime(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/time.c | 2 -- dlls/ntdll/time.c | 13 ++++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index f50d4b4d70..1628af8df2 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -222,8 +222,6 @@ static void test_user_shared_data_time(void) pRtlQueryUnbiasedInterruptTime(&t3); } while(t3 < t1 && i++ < 1); /* allow for wrap, but only once */ - /* FIXME: not always in order, but should be close */ - todo_wine_if(t1 > t2 && t1 - t2 < 50 * TICKSPERMSEC) ok(t1 <= t2, "USD InterruptTime / RtlQueryUnbiasedInterruptTime are out of order %s %s\n", wine_dbgstr_longlong(t1), wine_dbgstr_longlong(t2)); ok(t2 <= t3 || broken(t2 == t3 + 82410089070) /* w864 has some weird offset on testbot */, diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 06854c020d..f900b55d83 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -47,6 +47,7 @@ #define NONAMELESSUNION #include "windef.h" #include "winternl.h" +#include "ddk/wdm.h" #include "wine/exception.h" #include "wine/debug.h" #include "ntdll_misc.h" @@ -1128,11 +1129,21 @@ NTSTATUS WINAPI NtSetSystemTime(const LARGE_INTEGER *NewTime, LARGE_INTEGER *Old */ BOOL WINAPI RtlQueryUnbiasedInterruptTime(ULONGLONG *time) { + ULONG high, low; + if (!time) { RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_INVALID_PARAMETER ); return FALSE; } - *time = monotonic_counter(); + + do + { + high = user_shared_data->InterruptTime.High1Time; + low = user_shared_data->InterruptTime.LowPart; + } + while (high != user_shared_data->InterruptTime.High2Time); + /* FIXME: should probably subtract InterruptTimeBias */ + *time = (ULONGLONG)high << 32 | low; return TRUE; }

1 0

Alexandre Julliard : ntdll: Use the user shared data to implement NtGetTickCount().
by Alexandre Julliard May 21, 2020

May 21, 2020

Module: wine Branch: master Commit: cc5953048e570155deb791b9e9e738a0508c2032 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc5953048e570155deb791b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 21 18:55:54 2020 +0200 ntdll: Use the user shared data to implement NtGetTickCount(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/time.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index b42a621aa2..06854c020d 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -44,6 +44,7 @@ #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "windef.h" #include "winternl.h" #include "wine/exception.h" @@ -577,9 +578,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH RtlQueryPerformanceFrequency( LARGE_INTEGER *frequ * NtGetTickCount (NTDLL.@) * ZwGetTickCount (NTDLL.@) */ -ULONG WINAPI NtGetTickCount(void) +ULONG WINAPI DECLSPEC_HOTPATCH NtGetTickCount(void) { - return monotonic_counter() / TICKSPERMSEC; + /* note: we ignore TickCountMultiplier */ + return user_shared_data->u.TickCount.LowPart; } /* calculate the mday of dst change date, so that for instance Sun 5 Oct 2007

1 0

Nikolay Sivov : dwrite: Keep user features values.
by Alexandre Julliard May 21, 2020

May 21, 2020

Module: wine Branch: master Commit: c8f409ed9311c6b84b2383ac5640ad39cfb1d5e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8f409ed9311c6b84b2383ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 21 15:28:49 2020 +0300 dwrite: Keep user features values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 ++ dlls/dwrite/opentype.c | 49 +++++++++++++++++++++++++------------------- dlls/dwrite/shape.c | 43 ++++++++++++++++++++++++++------------ 3 files changed, 60 insertions(+), 34 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index cad74d9e94..8b5fefc66b 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -523,6 +523,8 @@ struct shaping_feature unsigned int tag; unsigned int index; unsigned int flags; + unsigned int max_value; + unsigned int default_value; }; struct shaping_features diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 713a5002f3..8904dc546e 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4169,33 +4169,40 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex /* Collect lookups for all given features. */ for (i = 0; i < features->count; ++i) { + UINT16 feature_offset, lookup_count; + feature_index = features->features[i].index; - if (feature_index != 0xffff) - { - UINT16 feature_offset = GET_BE_WORD(feature_list->features[feature_index].offset); - UINT16 lookup_count; - lookup_count = table_read_be_word(&table->table, table->feature_list + feature_offset + - FIELD_OFFSET(struct ot_feature, lookup_count)); - if (!lookup_count) - continue; + /* Feature wasn't found */ + if (feature_index == 0xffff) + continue; - if (!dwrite_array_reserve((void **)&lookups->indexes, &lookups->capacity, lookups->count + lookup_count, - sizeof(*lookups->indexes))) - { - return; - } + /* FIXME: skip non-global ones for now. */ + if (!(features->features[i].flags & FEATURE_GLOBAL)) + continue; - for (l = 0; l < lookup_count; ++l) - { - UINT16 lookup_index = table_read_be_word(&table->table, table->feature_list + feature_offset + - FIELD_OFFSET(struct ot_feature, lookuplist_index[l])); + feature_offset = GET_BE_WORD(feature_list->features[feature_index].offset); - if (lookup_index >= total_lookup_count) - continue; + lookup_count = table_read_be_word(&table->table, table->feature_list + feature_offset + + FIELD_OFFSET(struct ot_feature, lookup_count)); + if (!lookup_count) + continue; - lookups->indexes[lookups->count++] = lookup_index; - } + if (!dwrite_array_reserve((void **)&lookups->indexes, &lookups->capacity, lookups->count + lookup_count, + sizeof(*lookups->indexes))) + { + return; + } + + for (l = 0; l < lookup_count; ++l) + { + UINT16 lookup_index = table_read_be_word(&table->table, table->feature_list + feature_offset + + FIELD_OFFSET(struct ot_feature, lookuplist_index[l])); + + if (lookup_index >= total_lookup_count) + continue; + + lookups->indexes[lookups->count++] = lookup_index; } } diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index 57c06f62e8..df680373a2 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -201,20 +201,24 @@ static DWORD shape_select_language(const struct scriptshaping_cache *cache, DWOR return 0; } -static void shape_add_feature_flags(struct shaping_features *features, unsigned int tag, unsigned int flags) +static void shape_add_feature_full(struct shaping_features *features, unsigned int tag, unsigned int flags, unsigned int value) { + unsigned int i = features->count; + if (!dwrite_array_reserve((void **)&features->features, &features->capacity, features->count + 1, sizeof(*features->features))) return; - features->features[features->count].tag = tag; - features->features[features->count].flags = flags; + features->features[i].tag = tag; + features->features[i].flags = flags; + features->features[i].max_value = value; + features->features[i].default_value = flags & FEATURE_GLOBAL ? value : 0; features->count++; } static void shape_add_feature(struct shaping_features *features, unsigned int tag) { - shape_add_feature_flags(features, tag, FEATURE_GLOBAL); + shape_add_feature_full(features, tag, FEATURE_GLOBAL, 1); } static int features_sorting_compare(const void *a, const void *b) @@ -229,18 +233,16 @@ static void shape_merge_features(struct scriptshaping_context *context, struct s unsigned int j = 0, i; /* For now only consider global, enabled user features. */ - if (user_features && context->user_features.range_lengths && context->user_features.range_count == 1) + if (user_features && context->user_features.range_lengths) { + unsigned int flags = context->user_features.range_count == 1 && + context->user_features.range_lengths[0] == context->length ? FEATURE_GLOBAL : 0; + for (i = 0; i < context->user_features.range_count; ++i) { - if (context->user_features.range_lengths[i] != context->length) - break; - for (j = 0; j < user_features[i]->featureCount; ++j) - { - if (user_features[i]->features[j].parameter == 1) - shape_add_feature(features, user_features[i]->features[j].nameTag); - } + shape_add_feature_full(features, user_features[i]->features[j].nameTag, flags, + user_features[i]->features[j].parameter); } } @@ -251,6 +253,21 @@ static void shape_merge_features(struct scriptshaping_context *context, struct s { if (features->features[i].tag != features->features[j].tag) features->features[++j] = features->features[i]; + else + { + if (features->features[i].flags & FEATURE_GLOBAL) + { + features->features[j].flags |= FEATURE_GLOBAL; + features->features[j].max_value = features->features[i].max_value; + features->features[j].default_value = features->features[i].default_value; + } + else + { + if (features->features[j].flags & FEATURE_GLOBAL) + features->features[j].flags ^= FEATURE_GLOBAL; + features->features[j].max_value = max(features->features[j].max_value, features->features[i].max_value); + } + } } features->count = j + 1; } @@ -369,7 +386,7 @@ HRESULT shape_get_glyphs(struct scriptshaping_context *context, const unsigned i shape_add_feature(&features, horizontal_features[i]); } else - shape_add_feature_flags(&features, DWRITE_MAKE_OPENTYPE_TAG('v','e','r','t'), FEATURE_GLOBAL_SEARCH); + shape_add_feature_full(&features, DWRITE_MAKE_OPENTYPE_TAG('v','e','r','t'), FEATURE_GLOBAL | FEATURE_GLOBAL_SEARCH, 1); shape_merge_features(context, &features);

1 0

Jacek Caban : stdlib.h: Provide strtold as an inline wrapper.
by Alexandre Julliard May 21, 2020

May 21, 2020

Module: wine Branch: master Commit: 4f40ffb9c5f16cf18ae388d71624252443fee349 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f40ffb9c5f16cf18ae388d7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 21 01:46:03 2020 +0200 stdlib.h: Provide strtold as an inline wrapper. This allows using long double in the declaration, which fixes -Wincompatible-library-redeclaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdlib.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 22626d7e14..f14256c18f 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -211,7 +211,6 @@ void* __cdecl realloc(void*,size_t); void __cdecl srand(unsigned int); float __cdecl strtof(const char*,char**); double __cdecl strtod(const char*,char**); -double __cdecl strtold(const char*,char**); __msvcrt_long __cdecl strtol(const char*,char**,int); __msvcrt_ulong __cdecl strtoul(const char*,char**,int); __int64 __cdecl strtoll_l(const char*,char**,int,_locale_t); @@ -232,6 +231,11 @@ _ACRTIMP _invalid_parameter_handler __cdecl _set_thread_local_invalid_parameter_ void __cdecl _invalid_parameter(const wchar_t *expr, const wchar_t *func, const wchar_t *file, unsigned int line, uintptr_t arg); +#ifdef _UCRT +_ACRTIMP double __cdecl _strtold_l(const char*,char**,_locale_t); +static inline long double strtold(const char *string, char **endptr) { return _strtold_l(string, endptr, NULL); } +#endif /* _UCRT */ + #ifdef __cplusplus } #endif

1 0

Jacek Caban : stdlib.h: Remove _strtold declaration.
by Alexandre Julliard May 21, 2020

May 21, 2020

Module: wine Branch: master Commit: a326a00f2f294ab6d05488601f14f0f0a5685f0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a326a00f2f294ab6d0548860… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 21 01:45:41 2020 +0200 stdlib.h: Remove _strtold declaration. It's not available in any DLL. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdlib.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index ef60428a6a..22626d7e14 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -175,7 +175,6 @@ int __cdecl _set_error_mode(int); void __cdecl _seterrormode(int); void __cdecl _sleep(__msvcrt_ulong); void __cdecl _splitpath(const char*,char*,char*,char*,char*); -long double __cdecl _strtold(const char*,char**); void __cdecl _swab(char*,char*,int); char* __cdecl _ui64toa(unsigned __int64,char*,int); errno_t __cdecl _ui64toa_s(unsigned __int64,char*,size_t,int);

1 0

Jacek Caban : include: Avoid redefinition warnings when basetyps.h is used together with winnt.h or objbase.h.
by Alexandre Julliard May 21, 2020

May 21, 2020

Module: wine Branch: master Commit: 2211de9eeb38503db0f5b47e111c9dd6c5f71585 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2211de9eeb38503db0f5b47e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 21 01:28:50 2020 +0200 include: Avoid redefinition warnings when basetyps.h is used together with winnt.h or objbase.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/basetyps.h | 32 ++++++++++++++++++++------------ include/objbase.h | 8 ++++++++ 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/include/basetyps.h b/include/basetyps.h index 18e15dcabd..b0dd5d77f4 100644 --- a/include/basetyps.h +++ b/include/basetyps.h @@ -26,18 +26,26 @@ # define EXTERN_C extern #endif -#define STDMETHODCALLTYPE WINAPI -#define STDMETHODVCALLTYPE WINAPIV -#define STDAPICALLTYPE WINAPI -#define STDAPIVCALLTYPE WINAPIV -#define STDAPI EXTERN_C HRESULT STDAPICALLTYPE -#define STDAPI_(t) EXTERN_C t STDAPICALLTYPE -#define STDMETHODIMP HRESULT STDMETHODCALLTYPE -#define STDMETHODIMP_(t) t STDMETHODCALLTYPE -#define STDAPIV EXTERN_C HRESULT STDAPIVCALLTYPE -#define STDAPIV_(t) EXTERN_C t STDAPIVCALLTYPE -#define STDMETHODIMPV HRESULT STDMETHODVCALLTYPE -#define STDMETHODIMPV_(t) t STDMETHODVCALLTYPE +#define STDMETHODCALLTYPE WINAPI +#define STDMETHODVCALLTYPE WINAPIV +#define STDAPICALLTYPE WINAPI +#define STDAPIVCALLTYPE WINAPIV +#define STDAPI EXTERN_C HRESULT STDAPICALLTYPE +#define STDAPI_(type) EXTERN_C type STDAPICALLTYPE +#define STDMETHODIMP HRESULT STDMETHODCALLTYPE +#define STDMETHODIMP_(type) type STDMETHODCALLTYPE +#define STDAPIV EXTERN_C HRESULT STDAPIVCALLTYPE +#define STDAPIV_(type) EXTERN_C type STDAPIVCALLTYPE +#define STDMETHODIMPV HRESULT STDMETHODVCALLTYPE +#define STDMETHODIMPV_(type) type STDMETHODVCALLTYPE + +#undef STDMETHOD +#undef STDMETHOD_ +#undef PURE +#undef THIS_ +#undef THIS +#undef DECLARE_INTERFACE +#undef DECLARE_INTERFACE_ #if defined(__cplusplus) && !defined(CINTERFACE) diff --git a/include/objbase.h b/include/objbase.h index a17cbeb870..e5a6b2a9fa 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -170,6 +170,14 @@ * macro is defined in which case we would not be here. */ +#undef STDMETHOD +#undef STDMETHOD_ +#undef PURE +#undef THIS_ +#undef THIS +#undef DECLARE_INTERFACE +#undef DECLARE_INTERFACE_ + #if defined(__cplusplus) && !defined(CINTERFACE) #ifdef COM_STDMETHOD_CAN_THROW

1 0

Chip Davis : d3d11: Implement d3d11_immediate_context_GetContextFlags().
by Alexandre Julliard May 20, 2020

May 20, 2020

Module: wine Branch: master Commit: 87435db8a149419333078c34b22dfda4903fdbf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87435db8a149419333078c34… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Thu May 21 00:12:40 2020 +0430 d3d11: Implement d3d11_immediate_context_GetContextFlags(). Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 +- dlls/d3d11/tests/d3d11.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d113ec8cd3..afdd03f4d5 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2408,7 +2408,7 @@ static D3D11_DEVICE_CONTEXT_TYPE STDMETHODCALLTYPE d3d11_immediate_context_GetTy static UINT STDMETHODCALLTYPE d3d11_immediate_context_GetContextFlags(ID3D11DeviceContext1 *iface) { - FIXME("iface %p stub!\n", iface); + TRACE("iface %p.\n", iface); return 0; } diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 030781c88a..20acc0223e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2155,6 +2155,7 @@ static void test_immediate_context(void) ID3D11Multithread *multithread; ID3D11Buffer *buffer[2]; ID3D11Device *device; + unsigned int flags; BOOL enabled; HRESULT hr; @@ -2215,6 +2216,9 @@ static void test_immediate_context(void) ID3D11Device_GetImmediateContext(device, &immediate_context); + flags = ID3D11DeviceContext_GetContextFlags(immediate_context); + ok(!flags, "Got unexpected flags %#x.\n", flags); + hr = ID3D11DeviceContext_FinishCommandList(immediate_context, FALSE, &command_list); ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);

1 0

Chip Davis : d3d11: Implement d3d10_device_Flush().
by Alexandre Julliard May 20, 2020

May 20, 2020

Module: wine Branch: master Commit: a6a0f7ba8ef6f3f383880b7a060e7ac20e354da8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6a0f7ba8ef6f3f383880b7a… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Thu May 21 00:12:43 2020 +0430 d3d11: Implement d3d10_device_Flush(). Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 2092901bd4..aaeb98a205 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -5252,7 +5252,13 @@ static void STDMETHODCALLTYPE d3d10_device_ClearState(ID3D10Device1 *iface) static void STDMETHODCALLTYPE d3d10_device_Flush(ID3D10Device1 *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d_device *device = impl_from_ID3D10Device(iface); + + TRACE("iface %p.\n", iface); + + wined3d_mutex_lock(); + wined3d_device_flush(device->wined3d_device); + wined3d_mutex_unlock(); } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBuffer(ID3D10Device1 *iface,

1 0

Connor McAdams : d2d1: Allow inserting multiple Bézier control points into a figure at once.
by Alexandre Julliard May 20, 2020

May 20, 2020

Module: wine Branch: master Commit: e3bbeb5a933af913c2d43ddd111c9fc1c9ce1074 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3bbeb5a933af913c2d43ddd… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Thu May 21 00:12:46 2020 +0430 d2d1: Allow inserting multiple Bézier control points into a figure at once. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index ff283563a3..340bc604c4 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -623,19 +623,20 @@ static BOOL d2d_figure_add_vertex(struct d2d_figure *figure, D2D1_POINT_2F verte return TRUE; } -static BOOL d2d_figure_insert_bezier_control(struct d2d_figure *figure, size_t idx, const D2D1_POINT_2F *p) +static BOOL d2d_figure_insert_bezier_controls(struct d2d_figure *figure, + size_t idx, size_t count, const D2D1_POINT_2F *p) { if (!d2d_array_reserve((void **)&figure->bezier_controls, &figure->bezier_controls_size, - figure->bezier_control_count + 1, sizeof(*figure->bezier_controls))) + figure->bezier_control_count + count, sizeof(*figure->bezier_controls))) { ERR("Failed to grow bezier controls array.\n"); return FALSE; } - memmove(&figure->bezier_controls[idx + 1], &figure->bezier_controls[idx], + memmove(&figure->bezier_controls[idx + count], &figure->bezier_controls[idx], (figure->bezier_control_count - idx) * sizeof(*figure->bezier_controls)); - figure->bezier_controls[idx] = *p; - ++figure->bezier_control_count; + memcpy(&figure->bezier_controls[idx], p, count * sizeof(*figure->bezier_controls)); + figure->bezier_control_count += count; return TRUE; } @@ -1918,7 +1919,7 @@ static BOOL d2d_geometry_apply_intersections(struct d2d_geometry *geometry, d2d_point_lerp(&q[1], p[1], p[2], t); figure->bezier_controls[inter->control_idx + control_offset] = q[0]; - if (!(d2d_figure_insert_bezier_control(figure, inter->control_idx + control_offset + 1, &q[1]))) + if (!(d2d_figure_insert_bezier_controls(figure, inter->control_idx + control_offset + 1, 1, &q[1]))) return FALSE; ++control_offset; @@ -2824,7 +2825,7 @@ static BOOL d2d_geometry_split_bezier(struct d2d_geometry *geometry, const struc d2d_point_lerp(&q[2], &q[0], &q[1], 0.5f); figure->bezier_controls[idx->control_idx] = q[0]; - if (!(d2d_figure_insert_bezier_control(figure, idx->control_idx + 1, &q[1]))) + if (!(d2d_figure_insert_bezier_controls(figure, idx->control_idx + 1, 1, &q[1]))) return FALSE; if (!(d2d_figure_insert_vertex(figure, idx->vertex_idx + 1, q[2]))) return FALSE;

1 0

Connor McAdams : d2d1: Allow appending multiple Bézier control points to a figure at once.
by Alexandre Julliard May 20, 2020

May 20, 2020

Module: wine Branch: master Commit: fe4e6934a937645cea4fece505c0e1acaf2dfc07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe4e6934a937645cea4fece5… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Thu May 21 00:12:47 2020 +0430 d2d1: Allow appending multiple Bézier control points to a figure at once. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 340bc604c4..9c5e653f56 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -641,16 +641,17 @@ static BOOL d2d_figure_insert_bezier_controls(struct d2d_figure *figure, return TRUE; } -static BOOL d2d_figure_add_bezier_control(struct d2d_figure *figure, const D2D1_POINT_2F *p) +static BOOL d2d_figure_add_bezier_controls(struct d2d_figure *figure, size_t count, const D2D1_POINT_2F *p) { if (!d2d_array_reserve((void **)&figure->bezier_controls, &figure->bezier_controls_size, - figure->bezier_control_count + 1, sizeof(*figure->bezier_controls))) + figure->bezier_control_count + count, sizeof(*figure->bezier_controls))) { ERR("Failed to grow bezier controls array.\n"); return FALSE; } - figure->bezier_controls[figure->bezier_control_count++] = *p; + memcpy(&figure->bezier_controls[figure->bezier_control_count], p, count * sizeof(*figure->bezier_controls)); + figure->bezier_control_count += count; return TRUE; } @@ -2597,7 +2598,7 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_AddBeziers(ID2D1GeometrySink *if d2d_rect_get_bezier_bounds(&bezier_bounds, &figure->vertices[figure->vertex_count - 1], &p, &beziers[i].point3); - if (!d2d_figure_add_bezier_control(figure, &p)) + if (!d2d_figure_add_bezier_controls(figure, 1, &p)) { ERR("Failed to add bezier control.\n"); geometry->u.path.state = D2D_GEOMETRY_STATE_ERROR; @@ -3013,7 +3014,7 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_AddQuadraticBeziers(ID2D1Geometr &beziers[i].point1, &beziers[i].point2); figure->vertex_types[figure->vertex_count - 1] = D2D_VERTEX_TYPE_BEZIER; - if (!d2d_figure_add_bezier_control(figure, &beziers[i].point1)) + if (!d2d_figure_add_bezier_controls(figure, 1, &beziers[i].point1)) { ERR("Failed to add bezier.\n"); geometry->u.path.state = D2D_GEOMETRY_STATE_ERROR;

1 0