winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
December 2021
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
569 discussions
Start a n
N
ew thread
David White : d2d1: Implement path_geometry_StrokeContainsPoint() for Bézier segments.
by Alexandre Julliard
08 Dec '21
08 Dec '21
Module: wine Branch: master Commit: b495ff5cc8088af66d6d4f186f82231043e45a95 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=b495ff5cc8088af66d6d4f18…
Author: David White <dwhite(a)codeweavers.com> Date: Wed Dec 8 20:14:22 2021 +0100 d2d1: Implement path_geometry_StrokeContainsPoint() for Bézier segments. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 198 +++++++++++++++++++++++++++++++++++++++++++++++-- dlls/d2d1/tests/d2d1.c | 93 +++++++++++++++++++++++ 2 files changed, 285 insertions(+), 6 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=b495ff5cc8088af66d6d…
1
0
0
0
David White : d2d1: Implement path_geometry_StrokeContainsPoint() for line segments.
by Alexandre Julliard
08 Dec '21
08 Dec '21
Module: wine Branch: master Commit: f467f6385ed85dd7f8cbc857d82dc56e53f055a6 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=f467f6385ed85dd7f8cbc857…
Author: David White <dwhite(a)codeweavers.com> Date: Wed Dec 8 20:14:21 2021 +0100 d2d1: Implement path_geometry_StrokeContainsPoint() for line segments. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++--- dlls/d2d1/tests/d2d1.c | 57 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index af92df4f6c5..d5a430e1f74 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -3409,11 +3409,74 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_StrokeContainsPoint(ID2D1Path D2D1_POINT_2F point, float stroke_width, ID2D1StrokeStyle *stroke_style, const D2D1_MATRIX_3X2_F *transform, float tolerance, BOOL *contains) { - FIXME("iface %p, point %s, stroke_width %.8e, stroke_style %p, " - "transform %p, tolerance %.8e, contains %p stub!\n", + struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry(iface); + enum d2d_vertex_type type = D2D_VERTEX_TYPE_NONE; + D2D1_POINT_2F p, p1; + unsigned int i, j; + + TRACE("iface %p, point %s, stroke_width %.8e, stroke_style %p, transform %p, tolerance %.8e, contains %p.\n", iface, debug_d2d_point_2f(&point), stroke_width, stroke_style, transform, tolerance, contains); - return E_NOTIMPL; + if (stroke_style) + FIXME("Ignoring stroke style %p.\n", stroke_style); + + if (!transform) + transform = &identity; + + if (tolerance <= 0.0f) + tolerance = D2D1_DEFAULT_FLATTENING_TOLERANCE; + + *contains = FALSE; + for (i = 0; i < geometry->u.path.figure_count; ++i) + { + const struct d2d_figure *figure = &geometry->u.path.figures[i]; + + for (j = 0; j < figure->vertex_count; ++j) + { + if (figure->vertex_types[j] == D2D_VERTEX_TYPE_NONE) + continue; + + p = figure->vertices[j]; + type = figure->vertex_types[j]; + break; + } + + for (++j; j < figure->vertex_count; ++j) + { + if (figure->vertex_types[j] == D2D_VERTEX_TYPE_NONE + || d2d_vertex_type_is_split_bezier(figure->vertex_types[j])) + continue; + + switch (type) + { + case D2D_VERTEX_TYPE_LINE: + p1 = figure->vertices[j]; + *contains = d2d_point_on_line_segment(&point, &p, &p1, transform, stroke_width * 0.5f, tolerance); + p = p1; + break; + + default: + FIXME("Unhandled vertex type %#x.\n", type); + p = figure->vertices[j]; + break; + } + if (*contains) + return S_OK; + type = figure->vertex_types[j]; + } + + if (figure->flags & D2D_FIGURE_FLAG_CLOSED && (!*contains) && type == D2D_VERTEX_TYPE_LINE) + { + p1 = figure->vertices[0]; + *contains = d2d_point_on_line_segment(&point, &p, &p1, transform, stroke_width * 0.5f, tolerance); + p = p1; + } + + if (*contains) + return S_OK; + } + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_path_geometry_FillContainsPoint(ID2D1PathGeometry *iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 22381ca3782..15088d679df 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10137,7 +10137,10 @@ static void test_effect_crop(BOOL d3d11) static void test_stroke_contains_point(BOOL d3d11) { ID2D1RectangleGeometry *rectangle; + ID2D1GeometrySink *sink; + ID2D1PathGeometry *path; ID2D1Factory *factory; + D2D1_POINT_2F point; D2D1_RECT_F rect; unsigned int i; BOOL contains; @@ -10220,6 +10223,27 @@ static void test_stroke_contains_point(BOOL d3d11) {{{{1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 21.0f}}}, {10.0f, 31.0f}, 0.0f, 1.0f, TRUE, TRUE}, {{{{1.0f, 0.0f, 0.0f, 1.0f, 11.0f, 0.0f}}}, {16.0f, 0.0f}, 0.0f, 1.0f, TRUE, TRUE}, {{{{1.0f, 0.0f, 0.0f, 1.0f, 0.0f, -21.0f}}}, { 0.0f, -11.0f}, 0.0f, 1.0f, TRUE, TRUE}, + }, + path_tests[] = + { + /* 0. Stroked area hittesting. Edge. */ + {{{{0.0f}}}, {160.0f, 600.0f}, 0.0f, 1.0f, FALSE, FALSE}, + {{{{0.0f}}}, {239.24f, 600.0f}, 0.0f, 1.0f, FALSE, FALSE}, + {{{{0.0f}}}, {239.26f, 600.0f}, 0.0f, 1.0f, FALSE, TRUE}, + {{{{0.0f}}}, {240.74f, 600.0f}, 0.0f, 1.0f, FALSE, TRUE}, + {{{{0.0f}}}, {240.76f, 600.0f}, 0.0f, 1.0f, FALSE, FALSE}, + + /* 5. Negative tolerance. */ + {{{{0.0f}}}, {239.24f, 600.0f}, -1.0f, 1.0f, FALSE, FALSE}, + {{{{0.0f}}}, {239.26f, 600.0f}, -1.0f, 1.0f, FALSE, TRUE}, + {{{{0.0f}}}, {240.74f, 600.0f}, -1.0f, 1.0f, FALSE, TRUE}, + {{{{0.0f}}}, {240.76f, 600.0f}, -1.0f, 1.0f, FALSE, FALSE}, + + /* 9. Less than default tolerance. */ + {{{{0.0f}}}, {239.39f, 600.0f}, 0.1f, 1.0f, FALSE, FALSE}, + {{{{0.0f}}}, {239.41f, 600.0f}, 0.1f, 1.0f, FALSE, TRUE}, + {{{{0.0f}}}, {240.59f, 600.0f}, 0.1f, 1.0f, FALSE, TRUE}, + {{{{0.0f}}}, {240.61f, 600.0f}, 0.1f, 1.0f, FALSE, FALSE}, }; hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); @@ -10244,6 +10268,39 @@ static void test_stroke_contains_point(BOOL d3d11) } ID2D1RectangleGeometry_Release(rectangle); + hr = ID2D1Factory_CreatePathGeometry(factory, &path); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID2D1PathGeometry_Open(path, &sink); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + set_point(&point, 160.0f, 240.0f); + ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); + line_to(sink, 240.0f, 240.0f); + line_to(sink, 240.0f, 720.0f); + line_to(sink, 160.0f, 720.0f); + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_OPEN); + + hr = ID2D1GeometrySink_Close(sink); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID2D1GeometrySink_Release(sink); + + for (i = 0; i < ARRAY_SIZE(path_tests); ++i) + { + const struct contains_point_test *test = &path_tests[i]; + + winetest_push_context("Test %u", i); + + contains = !test->contains; + hr = ID2D1PathGeometry_StrokeContainsPoint(path, test->point, test->stroke_width, + NULL, test->matrix ? &test->transform : NULL, test->tolerance, &contains); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(contains == test->contains, "Got unexpected result %#x.\n", contains); + + winetest_pop_context(); + } + + ID2D1PathGeometry_Release(path); + ID2D1Factory_Release(factory); }
1
0
0
0
Nikolay Sivov : d2d1: Implement d2d_rectangle_geometry_StrokeContainsPoint().
by Alexandre Julliard
08 Dec '21
08 Dec '21
Module: wine Branch: master Commit: 1fceac2382b3081108ee29c52aeaa95148e973a2 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=1fceac2382b3081108ee29c5…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 8 20:14:20 2021 +0100 d2d1: Implement d2d_rectangle_geometry_StrokeContainsPoint(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++++- dlls/d2d1/tests/d2d1.c | 114 ++++++++++++++++++++++++++++++++++++ 2 files changed, 265 insertions(+), 3 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=1fceac2382b3081108ee…
1
0
0
0
Henri Verbeet : d2d1: Store original Bézier curves as cubics.
by Alexandre Julliard
08 Dec '21
08 Dec '21
Module: wine Branch: master Commit: bdd49f86f5eab380eaa5bfbf7c980de87dce6871 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=bdd49f86f5eab380eaa5bfbf…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 8 20:14:19 2021 +0100 d2d1: Store original Bézier curves as cubics. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 127 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 85 insertions(+), 42 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=bdd49f86f5eab380eaa5…
1
0
0
0
Paul Gofman : ntdll: Remove a special case for entry point not in executable section in map_image_into_view().
by Alexandre Julliard
08 Dec '21
08 Dec '21
Module: wine Branch: master Commit: d2e35b04fb21ac51a02edd6d21ece1d3ac248f27 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=d2e35b04fb21ac51a02edd6d…
Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Dec 8 17:29:10 2021 +0300 ntdll: Remove a special case for entry point not in executable section in map_image_into_view(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 18 +++++++++++------- dlls/ntdll/unix/virtual.c | 5 ----- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 4f1b11338a6..308cf1a44a0 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1967,12 +1967,6 @@ static void test_section_access(void) nt_header.OptionalHeader.FileAlignment = 0x200; nt_header.OptionalHeader.SizeOfImage = sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER) + page_size; nt_header.OptionalHeader.SizeOfHeaders = sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER); - SetLastError(0xdeadbeef); - ret = WriteFile(hfile, &nt_header, sizeof(DWORD) + sizeof(IMAGE_FILE_HEADER), &dummy, NULL); - ok(ret, "WriteFile error %d\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = WriteFile(hfile, &nt_header.OptionalHeader, sizeof(IMAGE_OPTIONAL_HEADER), &dummy, NULL); - ok(ret, "WriteFile error %d\n", GetLastError()); section.SizeOfRawData = sizeof(section_data); section.PointerToRawData = nt_header.OptionalHeader.FileAlignment; @@ -1980,6 +1974,16 @@ static void test_section_access(void) section.Misc.VirtualSize = section.SizeOfRawData; section.Characteristics = td[i].scn_file_access; SetLastError(0xdeadbeef); + + nt_header.OptionalHeader.AddressOfEntryPoint = section.VirtualAddress; + + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, &nt_header, sizeof(DWORD) + sizeof(IMAGE_FILE_HEADER), &dummy, NULL); + ok(ret, "WriteFile error %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, &nt_header.OptionalHeader, sizeof(IMAGE_OPTIONAL_HEADER), &dummy, NULL); + ok(ret, "WriteFile error %d\n", GetLastError()); + ret = WriteFile(hfile, §ion, sizeof(section), &dummy, NULL); ok(ret, "WriteFile error %d\n", GetLastError()); @@ -1997,7 +2001,7 @@ static void test_section_access(void) CloseHandle(hfile); SetLastError(0xdeadbeef); - hlib = LoadLibraryA(dll_name); + hlib = LoadLibraryExA(dll_name, NULL, DONT_RESOLVE_DLL_REFERENCES); ok(hlib != 0, "LoadLibrary error %d\n", GetLastError()); SetLastError(0xdeadbeef); diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 259968a890c..e496c604aa7 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2412,11 +2412,6 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena if (sec->Characteristics & IMAGE_SCN_MEM_WRITE) vprot |= VPROT_WRITECOPY; if (sec->Characteristics & IMAGE_SCN_MEM_EXECUTE) vprot |= VPROT_EXEC; - /* Dumb game crack lets the AOEP point into a data section. Adjust. */ - if ((nt->OptionalHeader.AddressOfEntryPoint >= sec->VirtualAddress) && - (nt->OptionalHeader.AddressOfEntryPoint < sec->VirtualAddress + size)) - vprot |= VPROT_EXEC; - if (!set_vprot( view, ptr + sec->VirtualAddress, size, vprot ) && (vprot & VPROT_EXEC)) ERR( "failed to set %08x protection on %s section %.8s, noexec filesystem?\n", sec->Characteristics, debugstr_w(filename), sec->Name );
1
0
0
0
Eric Pouech : dbghelp: In SymGetTypeInfo(), return the correct basetype for enums.
by Alexandre Julliard
08 Dec '21
08 Dec '21
Module: wine Branch: master Commit: fdc48ba767850e2e0ec5121777a86a9e21a7535e URL:
https://source.winehq.org/git/wine.git/?a=commit;h=fdc48ba767850e2e0ec51217…
Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 8 14:44:15 2021 +0100 dbghelp: In SymGetTypeInfo(), return the correct basetype for enums. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/type.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index b7eb49116e2..3140d30e0bc 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -613,8 +613,7 @@ BOOL symt_get_info(struct module* module, const struct symt* type, X(DWORD) = ((const struct symt_basic*)type)->bt; break; case SymTagEnum: - X(DWORD) = btInt; - break; + return symt_get_info(module, ((const struct symt_enum*)type)->base_type, req, pInfo); default: return FALSE; }
1
0
0
0
Eric Pouech : winedbg: Move bitfield extraction to extract_lgint.
by Alexandre Julliard
08 Dec '21
08 Dec '21
Module: wine Branch: master Commit: 0a16dbc730327eeb00f955e3778f3541b8554400 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=0a16dbc730327eeb00f955e3…
Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 8 14:44:08 2021 +0100 winedbg: Move bitfield extraction to extract_lgint. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/debugger.h | 2 +- programs/winedbg/expr.c | 7 ++----- programs/winedbg/memory.c | 48 ++++++++++++++++++++++++++++++++++++-------- programs/winedbg/types.c | 49 +++++++++++---------------------------------- programs/winedbg/winedbg.c | 6 +++--- 5 files changed, 58 insertions(+), 54 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=0a16dbc730327eeb00f9…
1
0
0
0
Eric Pouech : winedbg: Add bitfield capability to dbg_lvalue.
by Alexandre Julliard
08 Dec '21
08 Dec '21
Module: wine Branch: master Commit: 10eba8784f88f307bbda528796d25b45fce874c3 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=10eba8784f88f307bbda5287…
Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 8 14:44:03 2021 +0100 winedbg: Add bitfield capability to dbg_lvalue. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/debugger.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 934b0a95cbc..672c44e35c5 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -117,7 +117,9 @@ struct dbg_type struct dbg_lvalue /* structure to hold left-values... */ { - unsigned in_debuggee : 1; /* 1 = debuggee address space, 0 = debugger address space */ + unsigned in_debuggee : 1, /* 1 = debuggee address space, 0 = debugger address space */ + bitstart : 8, /* in fact, 7 should be sufficient for underlying 128bit integers */ + bitlen; ADDRESS64 addr; struct dbg_type type; }; @@ -125,6 +127,8 @@ struct dbg_lvalue /* structure to hold left-values... */ static inline void init_lvalue(struct dbg_lvalue* lv, BOOL in_debuggee, void* addr) { lv->in_debuggee = !!in_debuggee; + lv->bitstart = 0; + lv->bitlen = 0; lv->addr.Mode = AddrModeFlat; lv->addr.Offset = (DWORD_PTR)addr; lv->type.module = 0; @@ -134,6 +138,8 @@ static inline void init_lvalue(struct dbg_lvalue* lv, BOOL in_debuggee, void* ad static inline void init_lvalue_in_debugger(struct dbg_lvalue* lv, enum dbg_internal_types it, void* addr) { lv->in_debuggee = 0; + lv->bitstart = 0; + lv->bitlen = 0; lv->addr.Mode = AddrModeFlat; lv->addr.Offset = (DWORD_PTR)addr; lv->type.module = 0;
1
0
0
0
Eric Pouech : winedbg: Revamp dbg_lvalue structure and add helpers for init.
by Alexandre Julliard
08 Dec '21
08 Dec '21
Module: wine Branch: master Commit: ef3fca0c33abd2039059ff32ee0f40f803cec762 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=ef3fca0c33abd2039059ff32…
Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 8 14:43:56 2021 +0100 winedbg: Revamp dbg_lvalue structure and add helpers for init. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/break.c | 4 ++-- programs/winedbg/debugger.h | 25 +++++++++++++++++++------ programs/winedbg/expr.c | 45 +++++++++++---------------------------------- programs/winedbg/memory.c | 6 +++--- programs/winedbg/stack.c | 4 +--- programs/winedbg/symbol.c | 21 +++++++-------------- programs/winedbg/types.c | 6 +++--- 7 files changed, 46 insertions(+), 65 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=ef3fca0c33abd2039059…
1
0
0
0
Eric Pouech : winedbg: Rename print_longlong into print_sdecimal (to mimic print_hex).
by Alexandre Julliard
08 Dec '21
08 Dec '21
Module: wine Branch: master Commit: 0888943e728effb9039d1dd20f635c273c3278de URL:
https://source.winehq.org/git/wine.git/?a=commit;h=0888943e728effb9039d1dd2…
Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 8 14:43:50 2021 +0100 winedbg: Rename print_longlong into print_sdecimal (to mimic print_hex). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/memory.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index d919922c058..13bbc80c2fe 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -346,18 +346,9 @@ char* memory_offset_to_string(char *str, DWORD64 offset, unsigned mode) return str; } -static void dbg_print_longlong(LONGLONG sv, BOOL is_signed) +static void dbg_print_sdecimal(dbg_lgint_t sv) { - char tmp[24], *ptr = tmp + sizeof(tmp) - 1; - ULONGLONG uv, div; - *ptr = '\0'; - if (is_signed && sv < 0) uv = -sv; - else { uv = sv; is_signed = FALSE; } - for (div = 10; uv; div *= 10, uv /= 10) - *--ptr = '0' + (uv % 10); - if (ptr == tmp + sizeof(tmp) - 1) *--ptr = '0'; - if (is_signed) *--ptr = '-'; - dbg_printf("%s", ptr); + dbg_printf("%I64d", sv); } static void dbg_print_hex(DWORD size, dbg_lgint_t sv) @@ -512,7 +503,7 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) fcp->Start += 256; } } - if (!ok) dbg_print_longlong(val_int, TRUE); + if (!ok) dbg_print_sdecimal(val_int); } break; default: @@ -547,7 +538,7 @@ void print_basic(const struct dbg_lvalue* lvalue, char format) return; case 'd': - dbg_print_longlong(res, TRUE); + dbg_print_sdecimal(res); return; case 'c': @@ -570,7 +561,7 @@ void print_basic(const struct dbg_lvalue* lvalue, char format) } if (lvalue->type.id == dbg_itype_segptr) { - dbg_print_longlong(types_extract_as_lgint(lvalue, NULL, NULL), TRUE); + dbg_print_sdecimal(types_extract_as_lgint(lvalue, NULL, NULL)); } else print_typed_basic(lvalue); }
1
0
0
0
← Newer
1
...
30
31
32
33
34
35
36
...
57
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
Results per page:
10
25
50
100
200