November 2018 - Wine-Commits

Dmitry Timoshkov : gdi32/tests: Explicitly test BeginPath() return value in the metafile path tests.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: master Commit: 007414ec6503ddd68f1067c7f21c2333e32f4797 URL: https://source.winehq.org/git/wine.git/?a=commit;h=007414ec6503ddd68f1067c7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 29 12:28:26 2018 +0300 gdi32/tests: Explicitly test BeginPath() return value in the metafile path tests. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index b33437a..15f29d6 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2963,7 +2963,8 @@ static void test_mf_GetPath(void) hdc = CreateMetaFileA(NULL); ok(hdc != 0, "CreateMetaFileA error %d\n", GetLastError()); - BeginPath(hdc); + ret = BeginPath(hdc); + ok(!ret, "BeginPath on metafile DC should fail\n"); ret = MoveToEx(hdc, 50, 50, NULL); ok( ret, "MoveToEx error %d.\n", GetLastError()); ret = LineTo(hdc, 50, 150); @@ -3851,7 +3852,8 @@ static void test_emf_paths(void) hdcMetafile = CreateEnhMetaFileA(GetDC(0), NULL, NULL, NULL); ok(hdcMetafile != 0, "CreateEnhMetaFileA error %d\n", GetLastError()); - BeginPath(hdcMetafile); + ret = BeginPath(hdcMetafile); + ok(ret, "BeginPath error %d\n", GetLastError()); ret = MoveToEx(hdcMetafile, 50, 50, NULL); ok( ret, "MoveToEx error %d.\n", GetLastError()); ret = LineTo(hdcMetafile, 50, 150);

1 0

Michael Müller : libwine: Do not restrict base address of main thread on 64 bit mac os.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: master Commit: 9fd13a1a5efb467b80a46ffa94f0556eeab4e86d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fd13a1a5efb467b80a46ffa… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Nov 26 17:27:05 2018 -0600 libwine: Do not restrict base address of main thread on 64 bit mac os. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/loader.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 0af3b8e..8f40ea0 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -709,6 +709,7 @@ struct apple_stack_info * Callback for wine_mmap_enum_reserved_areas to allocate space for * the secondary thread's stack. */ +#ifndef _WIN64 static int apple_alloc_thread_stack( void *base, size_t size, void *arg ) { struct apple_stack_info *info = arg; @@ -725,6 +726,7 @@ static int apple_alloc_thread_stack( void *base, size_t size, void *arg ) info->desired_size, PROT_READ|PROT_WRITE, MAP_FIXED ); return (info->stack != (void *)-1); } +#endif /*********************************************************************** * apple_create_wine_thread @@ -742,6 +744,7 @@ static void apple_create_wine_thread( void *init_func ) if (!pthread_attr_init( &attr )) { +#ifndef _WIN64 struct apple_stack_info info; /* Try to put the new thread's stack in the reserved area. If this @@ -753,6 +756,7 @@ static void apple_create_wine_thread( void *init_func ) wine_mmap_remove_reserved_area( info.stack, info.desired_size, 0 ); pthread_attr_setstackaddr( &attr, (char*)info.stack + info.desired_size ); } +#endif if (!pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_JOINABLE ) && !pthread_create( &thread, &attr, init_func, NULL ))

1 0

Alexandre Julliard : Wine release 3.0.4
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: website Branch: master Commit: ed5701d6cc3391dbd41de4ebeb9eac2a63bf697d URL: https://source.winehq.org/git/website.git/?a=commit;h=ed5701d6cc3391dbd41de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 29 22:09:49 2018 +0100 Wine release 3.0.4 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018112901.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2018112901.xml b/news/en/2018112901.xml new file mode 100644 index 0000000..f67a7bc --- /dev/null +++ b/news/en/2018112901.xml @@ -0,0 +1,13 @@ +<news> +<date>November 29, 2018</date> +<title>Wine 3.0.4 Released</title> +<body> + The Wine maintenance release 3.0.4 is now available. + <a href="{$root}/announce/3.0.4">What's new</a> in this release: +<ul> + <li>Added a lot of icons in Shell32</li> + <li>Various bug fixes</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.0/wine-3.0.4.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : widl: Silence a gcc warning.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: fb9d02308e80d90d1f800ad80171da1cf13294bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb9d02308e80d90d1f800ad8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 15 10:48:51 2018 +0200 widl: Silence a gcc warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 68cfa7fd03a1ef9f65cc700ea50cfba2be09880f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/widl/typegen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index e63600c..584d33e 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3706,7 +3706,7 @@ static unsigned int get_required_buffer_size_type( { case TGT_USER_TYPE: { - const char *uname; + const char *uname = NULL; const type_t *utype = get_user_type(type, &uname); return get_required_buffer_size_type(utype, uname, NULL, FALSE, alignment); }

1 0

Nikolay Sivov : gdiplus: Partially implement arrow caps.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 1b8bded5c70aaab010a273b33a2a6dc02855d511 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b8bded5c70aaab010a273b3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 14 07:59:35 2018 +0300 gdiplus: Partially implement arrow caps. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1da650a1cb9b85972622e98e9589808bfa60d17a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/customlinecap.c | 196 +++++++++++++++++++++++++------------ dlls/gdiplus/gdiplus_private.h | 3 + dlls/gdiplus/tests/customlinecap.c | 79 +++++++++++++-- 3 files changed, 208 insertions(+), 70 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1b8bded5c70aaab010a2…

1 0

Chip Davis : libwine: Use getsegmentdata(3) on Mac OS to find the end of the __TEXT segment.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 53b172bc9af266dc51c87f691ceadf0255f84b83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53b172bc9af266dc51c87f69… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Aug 1 15:46:09 2018 -0500 libwine: Use getsegmentdata(3) on Mac OS to find the end of the __TEXT segment. 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> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bdca749f7ba4f434ac326481cf4fe0a059887f5d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- 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 c07042a..0af3b8e 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 = data_start; 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;

1 0

Marcus Meissner : ole32: Read vt into a DWORD, as propvariant-> vt is 16 bit (Coverity).
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 2820b3370ca4b57ce02d0f94552c035beb9a321d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2820b3370ca4b57ce02d0f94… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jul 21 13:50:11 2018 +0200 ole32: Read vt into a DWORD, as propvariant->vt is 16 bit (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 71c3bf2bf8e569ac5c172a14eafcffb1d4e7e513) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole32/stg_prop.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index a259883..15492a3 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1045,11 +1045,13 @@ static HRESULT PropertyStorage_ReadProperty(PROPVARIANT *prop, const BYTE *data, UINT codepage, void* (WINAPI *allocate)(void *this, ULONG size), void *allocate_data) { HRESULT hr = S_OK; + DWORD vt; assert(prop); assert(data); - StorageUtl_ReadDWord(data, 0, (DWORD *)&prop->vt); + StorageUtl_ReadDWord(data, 0, &vt); data += sizeof(DWORD); + prop->vt = vt; switch (prop->vt) { case VT_EMPTY:

1 0

Michael Stefaniuc : Release 3.0.4.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: bab51fbb231e1e05990ff2bc4632cc915ffd9014 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bab51fbb231e1e05990ff2bc… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 13 22:06:35 2018 +0100 Release 3.0.4. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 479 +++++++++++++++++++++++++++++++++++++------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +-- 4 files changed, 298 insertions(+), 204 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bab51fbb231e1e05990f…

1 0

Tag wine-3.0.4 : Alexandre Julliard : Release 3.0.4
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: refs/tags/wine-3.0.4 Tag: 5d633658b8ad620c8546507f35ea4e7c735c8b64 URL: https://source.winehq.org/git/wine.git/?a=tag;h=5d633658b8ad620c8546507f35e… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 29 22:07:40 2018 +0100 Release 3.0.4

1 0

Alexandre Julliard : winedump: Don't use strncat with source length.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: adc8d5ed735cc1259342c53698daefc24d0e2cd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adc8d5ed735cc1259342c536… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 15 07:08:04 2018 +0200 winedump: Don't use strncat with source length. gcc is now warning about this. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9b940964481694822ee1e3dc45c6a3298fe3302c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/winedump/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/debug.c b/tools/winedump/debug.c index 3e54373..221c079 100644 --- a/tools/winedump/debug.c +++ b/tools/winedump/debug.c @@ -709,7 +709,7 @@ void dump_stabs(const void* pv_stabs, unsigned szstabs, const char* stabstr, stabbufflen += 65536; stabbuff = realloc(stabbuff, stabbufflen); } - strncat(stabbuff, ptr, len - 1); + strcat(stabbuff, ptr); continue; } else if (stabbuff[0] != '\0')

1 0