- Wine-Devel - list.winehq.org

[PATCH] winegcc: Add rpaths to help the macOS loader find ntdll.so.
by Huw Davies Aug. 23, 2021

Aug. 23, 2021

On macOS unixlibs that link to ntdll.so currently fail to load. It appears the macOS loader needs to be able to locate the file even if the library is already loaded. This patch changes the LC_ID_DYLIB name of ntdll.so to "@rpath/ntdll.so" so that when other unixlibs link against this they will insert that name into their LC_LOAD_DYLIB entry for ntdll.so. The patch also adds LC_RPATH entries for both @loader_path/ (running from installed tree) and @loader_path/../ntdll/ (running from build tree). Although it's only required to explicitly change ntdll.so's LC_ID_DYLIB and to only add LC_RPATHs to unixlibs that load ntdll.so, it seems simpler to do the same for all unixlibs, which is what this patch does. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- I'm not exactly happy with this patch, so any other ideas would be appreciated. tools/winegcc/winegcc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 426336e4536..0a72e6fbe49 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -492,6 +492,13 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) strarray_add( flags, opts->image_base ); } if (opts->strip) strarray_add( flags, "-Wl,-x" ); + if (opts->unix_lib) + { + strarray_add( flags, "-install_name" ); + strarray_add( flags, strmake( "@rpath/%s.so", output_name ) ); + strarray_add( flags, "-Wl,-rpath,@loader_path/" ); + strarray_add( flags, "-Wl,-rpath,@loader_path/../ntdll/" ); + } strarray_addall( link_args, flags ); return link_args; -- 2.23.0

3 18

Re: [PATCH] ntdll: Only use sysinfo function when present
by Gerald Pfeifer Aug. 23, 2021

Aug. 23, 2021

On Tue, 10 Aug 2021, Gerald Pfeifer wrote: > On some systems <sys/sysinfo.h> may be present while the sysinfo > function may not, or at least not as part of standard libraries, > so check whether the function is actually available before using > it. Note that the Marvin tester complained about test failures, which I believe is only due to me not including changes to generated files (autoconf, which show unrelated differences due to different versions of autoconf). I assume/hope Alexandre is simply running autoconf after applying this patch (and then hopefully pushing everything)? :-) Thanks, Gerald

2 1

[PATCH 10/10] gdi32: Separate EMFDRV_PDEVICE and struct emf.
by Jacek Caban Aug. 23, 2021

Aug. 23, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/emfdrv.c | 9 +++++++-- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 6 ++---- dlls/gdi32/enhmfdrv/graphics.c | 18 +++++++++--------- dlls/gdi32/enhmfdrv/init.c | 9 +++++---- dlls/gdi32/enhmfdrv/objects.c | 2 +- 5 files changed, 24 insertions(+), 20 deletions(-)

2 1

[PATCH 09/10] gdi32: Use NtGdiGetRgnBox in emfdrv_stroke_and_fill_path.
by Jacek Caban Aug. 23, 2021

Aug. 23, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/graphics.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)

2 1

[PATCH 08/10] gdi32: Avoid using EMFDRV_PDEVICE outside emfdev.c.
by Jacek Caban Aug. 23, 2021

Aug. 23, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/emfdrv.c | 5 ++++ dlls/gdi32/enhmfdrv/bitblt.c | 2 +- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 5 ---- dlls/gdi32/enhmfdrv/graphics.c | 22 ++++++++--------- dlls/gdi32/enhmfdrv/init.c | 4 +-- dlls/gdi32/enhmfdrv/objects.c | 37 +++++++++++++--------------- 6 files changed, 36 insertions(+), 39 deletions(-)

2 1

[PATCH 07/10] gdi32: Use struct emf for EMF helpers.
by Jacek Caban Aug. 23, 2021

Aug. 23, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/bitblt.c | 18 +++--- dlls/gdi32/enhmfdrv/dc.c | 72 +++++++++++------------ dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 8 +-- dlls/gdi32/enhmfdrv/graphics.c | 65 +++++++++++---------- dlls/gdi32/enhmfdrv/init.c | 37 ++++++------ dlls/gdi32/enhmfdrv/objects.c | 86 ++++++++++++++-------------- 6 files changed, 140 insertions(+), 146 deletions(-)

2 1

[PATCH 06/10] gdi32: Move EMF driver to separated file.
by Jacek Caban Aug. 23, 2021

Aug. 23, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 1 + dlls/gdi32/emfdrv.c | 595 +++++++++++++++++++++++++++ dlls/gdi32/enhmfdrv/bitblt.c | 29 -- dlls/gdi32/enhmfdrv/dc.c | 9 - dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 48 --- dlls/gdi32/enhmfdrv/graphics.c | 388 ----------------- dlls/gdi32/enhmfdrv/init.c | 172 -------- dlls/gdi32/enhmfdrv/objects.c | 19 - include/ntgdi.h | 1 + 9 files changed, 597 insertions(+), 665 deletions(-) create mode 100644 dlls/gdi32/emfdrv.c

2 1

[PATCH 05/10] gdi32: Handle EMF recording clean up in DeleteDC.
by Jacek Caban Aug. 23, 2021

Aug. 23, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 2 +- dlls/gdi32/enhmfdrv/init.c | 95 +++++++++++++++++-------------------- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 4 ++ dlls/gdi32/tests/metafile.c | 1 - 5 files changed, 50 insertions(+), 53 deletions(-)

2 1

[PATCH 04/10] gdi32: Use NtGdiDeleteObjectApp for DeleteDC.
by Jacek Caban Aug. 23, 2021

Aug. 23, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 8 ++--- dlls/gdi32/dc.c | 73 +++++++++++++++++++------------------------- dlls/gdi32/dib.c | 4 +-- dlls/gdi32/gdidc.c | 9 ++++++ dlls/gdi32/objects.c | 9 +++++- 5 files changed, 54 insertions(+), 49 deletions(-)

2 1

[PATCH 03/10] gdi32: Use NtGdiResetDC for ResetDCW.
by Jacek Caban Aug. 23, 2021

Aug. 23, 2021

2 1