wine-devel January 2020

wine-devel@winehq.org

75 participants
595 discussions

[PATCH] msi: Properly declare variables in msi/tests/utils.h as extern.
by Gerald Pfeifer 30 Jan '20

30 Jan '20

Omitting the extern storage qualifier when declaring a global variable in a header file is mistake. If that header is included by several files it results in multiple definitions of the same variable (unless -fcommon is specified or assumed, the latter being the case for GCC 9.x and earlier). This fixes building with GCC 10. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/msi/tests/utils.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/utils.h b/dlls/msi/tests/utils.h index f16e2d5ff5..0880553863 100644 --- a/dlls/msi/tests/utils.h +++ b/dlls/msi/tests/utils.h @@ -16,12 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -char PROG_FILES_DIR[MAX_PATH]; -char PROG_FILES_DIR_NATIVE[MAX_PATH]; -char COMMON_FILES_DIR[MAX_PATH]; -char APP_DATA_DIR[MAX_PATH]; -char WINDOWS_DIR[MAX_PATH]; -char CURR_DIR[MAX_PATH]; +extern char PROG_FILES_DIR[MAX_PATH]; +extern char PROG_FILES_DIR_NATIVE[MAX_PATH]; +extern char COMMON_FILES_DIR[MAX_PATH]; +extern char APP_DATA_DIR[MAX_PATH]; +extern char WINDOWS_DIR[MAX_PATH]; +extern char CURR_DIR[MAX_PATH]; BOOL get_system_dirs(void); BOOL get_user_dirs(void); -- 2.25.0

4 4

[PATCH v2 8/8] jscript: Add IActiveScriptError implementation.
by Jacek Caban 30 Jan '20

30 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/jscript.c | 133 ++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/run.c | 13 ++-- 2 files changed, 139 insertions(+), 7 deletions(-)

1 0

[PATCH v2 7/8] jscript: Use enter_script and leave_script to call script site notifications.
by Jacek Caban 30 Jan '20

30 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/engine.c | 5 +++++ dlls/jscript/engine.h | 1 + dlls/jscript/jscript.c | 22 ++++------------------ dlls/jscript/tests/caller.c | 2 -- 4 files changed, 10 insertions(+), 20 deletions(-)

1 0

[PATCH v2 6/8] jscript: Store error code in jsexcept_t.
by Jacek Caban 30 Jan '20

30 Jan '20

1 0

[PATCH v2 5/8] jscript: Store separated flag indicating if current exception value is valid.
by Jacek Caban 30 Jan '20

30 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/engine.c | 27 ++++++++++++++++++++------- dlls/jscript/engine.h | 2 ++ dlls/jscript/error.c | 3 ++- dlls/jscript/jscript.c | 6 ++++-- 4 files changed, 28 insertions(+), 10 deletions(-)

1 0

[PATCH v2 4/8] jscript: Use separated jsexcept_t instance for each external call.
by Jacek Caban 30 Jan '20

30 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 17 ++++----- dlls/jscript/engine.c | 24 +++++-------- dlls/jscript/engine.h | 9 +++++ dlls/jscript/error.c | 5 +-- dlls/jscript/jscript.c | 79 ++++++++++++++++++++++++++++------------- dlls/jscript/jscript.h | 9 ++--- dlls/jscript/jsregexp.c | 4 +-- dlls/jscript/jsutils.c | 5 ++- 8 files changed, 91 insertions(+), 61 deletions(-)

1 0

[PATCH v2 3/8] jscript: Support DISP_E_EXCEPTION InvokeEx result.
by Jacek Caban 30 Jan '20

30 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 184 ++++++++++++++++-------------------------- 1 file changed, 69 insertions(+), 115 deletions(-)

1 0

[PATCH v2 2/8] jscript: Store source context and starting line in bytecode_t.
by Jacek Caban 30 Jan '20

30 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/compile.c | 10 ++++++---- dlls/jscript/engine.h | 4 +++- dlls/jscript/function.c | 2 +- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 7 ++++--- 5 files changed, 15 insertions(+), 10 deletions(-)

1 0

[PATCH v2 1/8] jscript: Use internal jsdisp calls only within the same script context.
by Jacek Caban 30 Jan '20

30 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH 6/6] d2d1: Ensure that hollow figures do not impact geometry bounds.
by Henri Verbeet 30 Jan '20

30 Jan '20

From: Giovanni Mascellani <gio(a)debian.org> Signed-off-by: Giovanni Mascellani <gio(a)debian.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 177562. dlls/d2d1/geometry.c | 25 ++++++++++++++++++++++++- dlls/d2d1/tests/d2d1.c | 8 ++++---- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 6e1c648707b..e7bb809359a 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -3097,10 +3097,22 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetBounds(ID2D1PathGeometry * if (!transform) { - if (geometry->u.path.bounds.left > geometry->u.path.bounds.right) + if (geometry->u.path.bounds.left > geometry->u.path.bounds.right + && !isinf(geometry->u.path.bounds.left)) { for (i = 0; i < geometry->u.path.figure_count; ++i) + { + if (geometry->u.path.figures[i].flags & D2D_FIGURE_FLAG_HOLLOW) + continue; d2d_rect_union(&geometry->u.path.bounds, &geometry->u.path.figures[i].bounds); + } + if (geometry->u.path.bounds.left > geometry->u.path.bounds.right) + { + geometry->u.path.bounds.left = INFINITY; + geometry->u.path.bounds.right = FLT_MAX; + geometry->u.path.bounds.top = INFINITY; + geometry->u.path.bounds.bottom = FLT_MAX; + } } *bounds = geometry->u.path.bounds; @@ -3115,6 +3127,9 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetBounds(ID2D1PathGeometry * D2D1_POINT_2F p, p1, p2; size_t j, bezier_idx; + if (figure->flags & D2D_FIGURE_FLAG_HOLLOW) + continue; + /* Single vertex figures are reduced by CloseFigure(). */ if (figure->vertex_count == 0) { @@ -3181,6 +3196,14 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetBounds(ID2D1PathGeometry * } } + if (bounds->left > bounds->right) + { + bounds->left = INFINITY; + bounds->right = FLT_MAX; + bounds->top = INFINITY; + bounds->bottom = FLT_MAX; + } + return S_OK; } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 65233c26dfa..319246a0bca 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -3114,7 +3114,7 @@ static void test_path_geometry(void) hr = ID2D1PathGeometry_GetBounds(geometry, NULL, &rect); ok(SUCCEEDED(hr), "Failed to get geometry bounds, hr %#x.\n", hr); match = compare_rect(&rect, 5.0f, 472.0f, 75.0f, 752.0f, 0); - todo_wine ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", + ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", rect.left, rect.top, rect.right, rect.bottom); set_matrix_identity(&matrix); @@ -3124,7 +3124,7 @@ static void test_path_geometry(void) hr = ID2D1PathGeometry_GetBounds(geometry, &matrix, &rect); ok(SUCCEEDED(hr), "Failed to get geometry bounds, hr %#x.\n", hr); match = compare_rect(&rect, 90.0f, 876.0f, 230.0f, 1016.0f, 0); - todo_wine ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", + ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", rect.left, rect.top, rect.right, rect.bottom); ID2D1PathGeometry_Release(geometry); @@ -3143,7 +3143,7 @@ static void test_path_geometry(void) hr = ID2D1PathGeometry_GetBounds(geometry, NULL, &rect); ok(SUCCEEDED(hr), "Failed to get geometry bounds, hr %#x.\n", hr); match = compare_rect(&rect, INFINITY, INFINITY, FLT_MAX, FLT_MAX, 0); - todo_wine ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", + ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", rect.left, rect.top, rect.right, rect.bottom); set_matrix_identity(&matrix); @@ -3153,7 +3153,7 @@ static void test_path_geometry(void) hr = ID2D1PathGeometry_GetBounds(geometry, &matrix, &rect); ok(SUCCEEDED(hr), "Failed to get geometry bounds, hr %#x.\n", hr); match = compare_rect(&rect, INFINITY, INFINITY, FLT_MAX, FLT_MAX, 0); - todo_wine ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", + ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", rect.left, rect.top, rect.right, rect.bottom); ID2D1PathGeometry_Release(geometry); -- 2.11.0

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
60
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-devel January 2020