August 2018 - Wine-Devel - list.winehq.org

Re: [PATCH] libwine: Use getsegmentdata(3) on Mac OS to find the end of the __TEXT segment.

by Ken Thomases

On Aug 1, 2018, at 3:20 PM, Chip Davis <cdavis(a)codeweavers.com> wrote: > > @@ -425,7 +430,15 @@ static void *map_dll( const IMAGE_NT_HEADERS *nt_descr ) > delta = (const BYTE *)nt_descr - addr; > code_start = page_size; > data_start = delta & ~page_mask; > +#ifdef __APPLE__ > + /* Need the mach_header, not the PE header, to give to getsegmentdata(3) */ > + dladdr(addr, &dli); > + code_end = getsegmentdata(dli.dli_fbase, "__DATA", &data_size) - addr; > + data_end = (code_end + data_size + page_mask) & ~page_mask; > +#else > + code_end = delta & ~page_mask; Perhaps just: code_end = data_start; here, to avoid a bit of duplication and make the non-Apple behavior crystal clear. > data_end = (nt->OptionalHeader.SizeOfImage + delta + page_mask) & ~page_mask; > +#endif > > fixup_rva_ptrs( &nt->OptionalHeader.AddressOfEntryPoint, addr, 1 ); >

Aug. 1, 2018

Re: C# DLLs for tests

by Fabian Maurer

Yeah, makes sense to me. Do we have an official process on how to send patches to wine-mono? Because AFAIK there is only the github repo. On a side note, I'd like to make functions to test.h to handle the compilation so that doesn't need to be duplicated in every test that wants to use C# DLLs. Would that be alright? Regards, Fabian Maurer

Aug. 1, 2018

[PATCH] libwine: Use getsegmentdata(3) on Mac OS to find the end of the __TEXT segment.

by Chip Davis

Don't assume it ends with the fake PE header. This assumption doesn't hold on Mac OS: the __data section where it was placed is located after several other sections, all in the __DATA segment. Unfortunately, this causes Wine, when DEP/NX is turned off, to override the page protections for the start of the __DATA segment, removing write permission from them, leading to a crash when winemac.drv attempted to use an Objective-C class for the first time. Also, be sure to include the zero-fill (i.e. BSS) sections in the total size of the .data section. This should fix some tests that use large uninitialized arrays. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- Notes: Try 2: Don't make data_start the same as code_end. libs/wine/loader.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index c07042a583e6..41ffb02fc43c 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -49,6 +49,7 @@ #undef LoadResource #undef GetCurrentThread #include <pthread.h> +#include <mach-o/getsect.h> #else extern char **environ; #endif @@ -387,11 +388,15 @@ static void *map_dll( const IMAGE_NT_HEADERS *nt_descr ) IMAGE_NT_HEADERS *nt; IMAGE_SECTION_HEADER *sec; BYTE *addr; - DWORD code_start, data_start, data_end; + DWORD code_start, code_end, data_start, data_end; const size_t page_size = sysconf( _SC_PAGESIZE ); const size_t page_mask = page_size - 1; int delta, nb_sections = 2; /* code + data */ unsigned int i; +#ifdef __APPLE__ + Dl_info dli; + unsigned long data_size; +#endif size_t size = (sizeof(IMAGE_DOS_HEADER) + sizeof(IMAGE_NT_HEADERS) @@ -425,7 +430,15 @@ static void *map_dll( const IMAGE_NT_HEADERS *nt_descr ) delta = (const BYTE *)nt_descr - addr; code_start = page_size; data_start = delta & ~page_mask; +#ifdef __APPLE__ + /* Need the mach_header, not the PE header, to give to getsegmentdata(3) */ + dladdr(addr, &dli); + code_end = getsegmentdata(dli.dli_fbase, "__DATA", &data_size) - addr; + data_end = (code_end + data_size + page_mask) & ~page_mask; +#else + code_end = delta & ~page_mask; data_end = (nt->OptionalHeader.SizeOfImage + delta + page_mask) & ~page_mask; +#endif fixup_rva_ptrs( &nt->OptionalHeader.AddressOfEntryPoint, addr, 1 ); @@ -434,7 +447,7 @@ static void *map_dll( const IMAGE_NT_HEADERS *nt_descr ) #ifndef _WIN64 nt->OptionalHeader.BaseOfData = data_start; #endif - nt->OptionalHeader.SizeOfCode = data_start - code_start; + nt->OptionalHeader.SizeOfCode = code_end - code_start; nt->OptionalHeader.SizeOfInitializedData = data_end - data_start; nt->OptionalHeader.SizeOfUninitializedData = 0; nt->OptionalHeader.SizeOfImage = data_end; @@ -443,7 +456,7 @@ static void *map_dll( const IMAGE_NT_HEADERS *nt_descr ) /* Build the code section */ memcpy( sec->Name, ".text", sizeof(".text") ); - sec->SizeOfRawData = data_start - code_start; + sec->SizeOfRawData = code_end - code_start; sec->Misc.VirtualSize = sec->SizeOfRawData; sec->VirtualAddress = code_start; sec->PointerToRawData = code_start; -- 2.18.0

Aug. 1, 2018

Re: C# DLLs for tests

by Austin English

On Wed, Aug 1, 2018 at 1:45 PM, Fabian Maurer <dark.shadow4(a)web.de> wrote: > Hello there, > > > > I'm still on tests for mscoree, and for that I need NET dlls to run the > tests with. > > The DLLs can be compile with csc.exe, but that needs to be implemented > somehow. > > Right now there are two ways we could implement that: > > > > 1) Compile DLL at build time (optional build dependency on mono) > > 2) Compile DLL at runtime (wine-mono would need to ship csc.exe, native .NET > already has it) > > > > I'm not sure which way is preferred, both would be feasible, I guess. > > Which one should I take? Vincent already suggested option 2 (https://www.winehq.org/pipermail/wine-devel/2018-July/129995.html) I'm inclined to agree for a few reasons: A) This avoids a dependency on mono. B) It gives us a good reason to provide csc.exe, which would allow wine-mono to more closely match .Net. -- -Austin GPG: 267B CC1F 053F 0749 (expires 2021/02/18)

Aug. 1, 2018

C# DLLs for tests

by Fabian Maurer

Hello there, I'm still on tests for mscoree, and for that I need NET dlls to run the tests with. The DLLs can be compile with csc.exe, but that needs to be implemented somehow. Right now there are two ways we could implement that: 1) Compile DLL at build time (optional build dependency on mono) 2) Compile DLL at runtime (wine-mono would need to ship csc.exe, native .NET already has it) I'm not sure which way is preferred, both would be feasible, I guess. Which one should I take? Regards, Fabian Maurer

Aug. 1, 2018