wine-commits May 2020

wine-commits@winehq.org

1 participants
743 discussions

Alexandre Julliard : wineboot: Use wide character string literals.
by Alexandre Julliard 21 May '20

21 May '20

Module: wine Branch: master Commit: c42b415fabfc7b4428c1790b1bddc08e5a79f1ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=c42b415fabfc7b4428c1790b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 21 13:36:06 2020 +0200 wineboot: Use wide character string literals. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.c | 366 ++++++++++++------------------------------- 1 file changed, 104 insertions(+), 262 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c42b415fabfc7b4428c1…

1 0

Alistair Leslie-Hughes : loader: http.sys belongs in the driver directory.
by Alexandre Julliard 21 May '20

21 May '20

Module: wine Branch: master Commit: 0c68a1510e2236cc4b57330aec04eacae8cab224 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c68a1510e2236cc4b57330a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 21 11:44:58 2020 +1000 loader: http.sys belongs in the driver directory. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index e602546da8..e4f3d74886 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2612,6 +2612,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,iexplore.exe 11,,winetest.exe,- 12,,fltmgr.sys,- +12,,http.sys,- 12,,ksecdd.sys,- 12,,mountmgr.sys,- 12,,ndis.sys,- @@ -2664,6 +2665,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,notepad.exe 11,,winetest.exe,- 12,,fltmgr.sys +12,,http.sys 12,,ksecdd.sys 12,,mountmgr.sys 12,,ndis.sys

1 0

Jacek Caban : configure: Remove no longer needed -Wno-incompatible-library-redeclaration.
by Alexandre Julliard 21 May '20

21 May '20

Module: wine Branch: master Commit: 267e61fd188b33bf83d89b09a2ed0f63916a527e URL: https://source.winehq.org/git/wine.git/?a=commit;h=267e61fd188b33bf83d89b09… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 21 01:46:18 2020 +0200 configure: Remove no longer needed -Wno-incompatible-library-redeclaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 31 ------------------------------- configure.ac | 2 -- 2 files changed, 33 deletions(-) diff --git a/configure b/configure index f695e0fb00..ccda743c99 100755 --- a/configure +++ b/configure @@ -10417,37 +10417,6 @@ $as_echo "$ac_cv_crosscflags__Wlogical_op" >&6; } if test "x$ac_cv_crosscflags__Wlogical_op" = xyes; then : EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -Wlogical-op" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Wincompatible-library-redeclaration" >&5 -$as_echo_n "checking whether the cross-compiler supports -Wincompatible-library-redeclaration... " >&6; } -if ${ac_cv_crosscflags__Wincompatible_library_redeclaration+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_wine_try_cflags_saved=$CFLAGS -ac_wine_try_cflags_saved_cc=$CC -ac_wine_try_cflags_saved_exeext=$ac_exeext -CFLAGS="$CFLAGS $EXTRACROSSCFLAGS -nostartfiles -nodefaultlibs -Wincompatible-library-redeclaration" -CC="$CROSSCC" -ac_exeext=".exe" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int __cdecl mainCRTStartup(void) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_crosscflags__Wincompatible_library_redeclaration=yes -else - ac_cv_crosscflags__Wincompatible_library_redeclaration=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved -CC=$ac_wine_try_cflags_saved_cc -ac_exeext=$ac_wine_try_cflags_saved_exeext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crosscflags__Wincompatible_library_redeclaration" >&5 -$as_echo "$ac_cv_crosscflags__Wincompatible_library_redeclaration" >&6; } -if test "x$ac_cv_crosscflags__Wincompatible_library_redeclaration" = xyes; then : - EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -Wno-incompatible-library-redeclaration" -fi case $host_cpu in *i[3456789]86*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -fno-omit-frame-pointer" >&5 diff --git a/configure.ac b/configure.ac index 4c3f1b9de5..d81f5cc88c 100644 --- a/configure.ac +++ b/configure.ac @@ -1092,8 +1092,6 @@ then WINE_TRY_CROSSCFLAGS([-Wwrite-strings]) WINE_TRY_CROSSCFLAGS([-Wpointer-arith]) WINE_TRY_CROSSCFLAGS([-Wlogical-op]) - WINE_TRY_CROSSCFLAGS([-Wincompatible-library-redeclaration], - [EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -Wno-incompatible-library-redeclaration"]) case $host_cpu in *i[[3456789]]86*) WINE_TRY_CROSSCFLAGS([-fno-omit-frame-pointer]) ;;

1 0

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

21 May '20

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 21 May '20

21 May '20

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 21 May '20

21 May '20

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

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

20 May '20

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

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

20 May '20

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: Introduce a helper to check for split Bézier segments.
by Alexandre Julliard 20 May '20

20 May '20

Module: wine Branch: master Commit: a512a031001097008bcf506363348145e0c4bceb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a512a031001097008bcf5063… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Thu May 21 00:12:45 2020 +0430 d2d1: Introduce a helper to check for split Bézier segments. 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 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index fb82dfea7f..ff283563a3 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -414,6 +414,11 @@ static BOOL d2d_vertex_type_is_bezier(enum d2d_vertex_type t) return (t == D2D_VERTEX_TYPE_BEZIER || t == D2D_VERTEX_TYPE_SPLIT_BEZIER); } +static BOOL d2d_vertex_type_is_split_bezier(enum d2d_vertex_type t) +{ + return t == D2D_VERTEX_TYPE_SPLIT_BEZIER; +} + /* This implementation is based on the paper "Adaptive Precision * Floating-Point Arithmetic and Fast Robust Geometric Predicates" and * associated (Public Domain) code by Jonathan Richard Shewchuk. */ @@ -3202,7 +3207,7 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetBounds(ID2D1PathGeometry * for (bezier_idx = 0, ++j; j < figure->vertex_count; ++j) { if (figure->vertex_types[j] == D2D_VERTEX_TYPE_NONE - || figure->vertex_types[j] == D2D_VERTEX_TYPE_SPLIT_BEZIER) + || d2d_vertex_type_is_split_bezier(figure->vertex_types[j])) continue; switch (type) @@ -3405,7 +3410,7 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Simplify(ID2D1PathGeometry *i for (bezier_idx = 0, ++j; j < figure->vertex_count; ++j) { if (figure->vertex_types[j] == D2D_VERTEX_TYPE_NONE - || figure->vertex_types[j] == D2D_VERTEX_TYPE_SPLIT_BEZIER) + || d2d_vertex_type_is_split_bezier(figure->vertex_types[j])) continue; switch (type)

1 0

Connor McAdams : d2d1: Introduce a helper to check for Bézier segments.
by Alexandre Julliard 20 May '20

20 May '20

Module: wine Branch: master Commit: 0ff58fe1ac7b88c0bfdaa8ca8d48a9b7ce8eb6f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ff58fe1ac7b88c0bfdaa8ca… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Thu May 21 00:12:44 2020 +0430 d2d1: Introduce a helper to check for Bézier segments. 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 | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index c18b648aef..fb82dfea7f 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -409,6 +409,11 @@ static void d2d_point_normalise(D2D1_POINT_2F *p) d2d_point_scale(p, 1.0f / l); } +static BOOL d2d_vertex_type_is_bezier(enum d2d_vertex_type t) +{ + return (t == D2D_VERTEX_TYPE_BEZIER || t == D2D_VERTEX_TYPE_SPLIT_BEZIER); +} + /* This implementation is based on the paper "Adaptive Precision * Floating-Point Arithmetic and Fast Robust Geometric Predicates" and * associated (Public Domain) code by Jonathan Richard Shewchuk. */ @@ -1875,7 +1880,7 @@ static BOOL d2d_geometry_apply_intersections(struct d2d_geometry *geometry, figure = &geometry->u.path.figures[inter->figure_idx]; vertex_type = figure->vertex_types[inter->vertex_idx + vertex_offset]; - if (vertex_type != D2D_VERTEX_TYPE_BEZIER && vertex_type != D2D_VERTEX_TYPE_SPLIT_BEZIER) + if (!d2d_vertex_type_is_bezier(vertex_type)) { if (!d2d_figure_insert_vertex(&geometry->u.path.figures[inter->figure_idx], inter->vertex_idx + vertex_offset + 1, inter->p)) @@ -1961,9 +1966,9 @@ static BOOL d2d_geometry_intersect_self(struct d2d_geometry *geometry) for (idx_q.vertex_idx = 0; idx_q.vertex_idx < max_q; ++idx_q.vertex_idx) { type_q = figure_q->vertex_types[idx_q.vertex_idx]; - if (type_q == D2D_VERTEX_TYPE_BEZIER) + if (d2d_vertex_type_is_bezier(type_q)) { - if (type_p == D2D_VERTEX_TYPE_BEZIER) + if (d2d_vertex_type_is_bezier(type_p)) { if (!d2d_geometry_intersect_bezier_bezier(geometry, &intersections, &idx_p, 0.0f, 1.0f, &idx_q, 0.0f, 1.0f)) @@ -1978,7 +1983,7 @@ static BOOL d2d_geometry_intersect_self(struct d2d_geometry *geometry) } else { - if (type_p == D2D_VERTEX_TYPE_BEZIER) + if (d2d_vertex_type_is_bezier(type_p)) { if (!d2d_geometry_intersect_bezier_line(geometry, &intersections, &idx_p, &idx_q)) goto done; @@ -1991,7 +1996,7 @@ static BOOL d2d_geometry_intersect_self(struct d2d_geometry *geometry) } } } - if (type_p == D2D_VERTEX_TYPE_BEZIER) + if (d2d_vertex_type_is_bezier(type_p)) ++idx_p.control_idx; } } @@ -2328,7 +2333,7 @@ static BOOL d2d_geometry_add_figure_outline(struct d2d_geometry *geometry, if (!i) { prev_type = figure->vertex_types[figure->vertex_count - 1]; - if (prev_type == D2D_VERTEX_TYPE_BEZIER) + if (d2d_vertex_type_is_bezier(prev_type)) prev = &figure->bezier_controls[figure->bezier_control_count - 1]; else prev = &figure->vertices[figure->vertex_count - 1]; @@ -2336,13 +2341,13 @@ static BOOL d2d_geometry_add_figure_outline(struct d2d_geometry *geometry, else { prev_type = figure->vertex_types[i - 1]; - if (prev_type == D2D_VERTEX_TYPE_BEZIER) + if (d2d_vertex_type_is_bezier(prev_type)) prev = &figure->bezier_controls[bezier_idx - 1]; else prev = &figure->vertices[i - 1]; } - if (type == D2D_VERTEX_TYPE_BEZIER) + if (d2d_vertex_type_is_bezier(type)) next = &figure->bezier_controls[bezier_idx++]; else if (i == figure->vertex_count - 1) next = &figure->vertices[0]; @@ -2372,7 +2377,7 @@ static BOOL d2d_geometry_add_figure_outline(struct d2d_geometry *geometry, ERR("Failed to add line segment.\n"); return FALSE; } - else if (type == D2D_VERTEX_TYPE_BEZIER) + else if (d2d_vertex_type_is_bezier(type)) { const D2D1_POINT_2F *p2; @@ -2674,8 +2679,7 @@ static BOOL d2d_geometry_get_bezier_segment_idx(struct d2d_geometry *geometry, s for (; idx->vertex_idx < figure->vertex_count; ++idx->vertex_idx) { - if (figure->vertex_types[idx->vertex_idx] == D2D_VERTEX_TYPE_BEZIER - || figure->vertex_types[idx->vertex_idx] == D2D_VERTEX_TYPE_SPLIT_BEZIER) + if (d2d_vertex_type_is_bezier(figure->vertex_types[idx->vertex_idx])) return TRUE; } } @@ -3230,7 +3234,7 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetBounds(ID2D1PathGeometry * type = figure->vertex_types[j]; } - if (type == D2D_VERTEX_TYPE_BEZIER) + if (d2d_vertex_type_is_bezier(type)) { p1 = figure->original_bezier_controls[bezier_idx++]; d2d_point_transform(&p1, transform, p1.x, p1.y); @@ -3436,7 +3440,7 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Simplify(ID2D1PathGeometry *i type = figure->vertex_types[j]; } - if (type == D2D_VERTEX_TYPE_BEZIER) + if (d2d_vertex_type_is_bezier(type)) { p1 = figure->original_bezier_controls[bezier_idx++]; if (transform)

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2020