November 2018 - Wine-commits

Andrey Gusev : kernel32/tests: Fix typos in ok() messages.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: master Commit: bf8eb249138c61614c92acf1c6e12ce22c9013ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf8eb249138c61614c92acf1… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Nov 29 14:18:35 2018 +0200 kernel32/tests: Fix typos in ok() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index f27bbdf..331db9b 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1012,8 +1012,8 @@ static VOID test_GetCurrentThreadStackLimits(void) } pGetCurrentThreadStackLimits(&low, &high); - ok(low == (ULONG_PTR)NtCurrentTeb()->DeallocationStack, "exptected %p, got %lx\n", NtCurrentTeb()->DeallocationStack, low); - ok(high == (ULONG_PTR)NtCurrentTeb()->Tib.StackBase, "exptected %p, got %lx\n", NtCurrentTeb()->Tib.StackBase, high); + ok(low == (ULONG_PTR)NtCurrentTeb()->DeallocationStack, "expected %p, got %lx\n", NtCurrentTeb()->DeallocationStack, low); + ok(high == (ULONG_PTR)NtCurrentTeb()->Tib.StackBase, "expected %p, got %lx\n", NtCurrentTeb()->Tib.StackBase, high); } static VOID test_GetThreadExitCode(void)

1 0

Andrey Gusev : oleaut32: Fix a typo in FIXME() message.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: master Commit: ca4bf6c80b699ac0b3d86e6b543a6a13b654e21b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca4bf6c80b699ac0b3d86e6b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Nov 29 14:19:09 2018 +0200 oleaut32: Fix a typo in FIXME() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/safearray.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index 01dbfc3..64a5ab9 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -289,7 +289,7 @@ static HRESULT SAFEARRAY_DestroyData(SAFEARRAY *psa, ULONG ulStartCell) ULONG ulCellCount = SAFEARRAY_GetCellCount(psa); if (ulStartCell > ulCellCount) { - FIXME("unexpted ulcellcount %d, start %d\n",ulCellCount,ulStartCell); + FIXME("unexpected ulCellCount %d, start %d\n",ulCellCount,ulStartCell); return E_UNEXPECTED; }

1 0

Alexandre Julliard : Wine release 3.0.4
by Alexandre Julliard 29 Nov '18

29 Nov '18

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

Nikolay Sivov : gdiplus: Partially implement arrow caps.
by Alexandre Julliard 29 Nov '18

29 Nov '18

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

Nikolay Sivov : gdiplus: Implement unfilled mode for arrow caps.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: b9e9cdf4a47b7d8026ee232eadb9b7617825d7c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9e9cdf4a47b7d8026ee232e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 14 07:59:36 2018 +0300 gdiplus: Implement unfilled mode for 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 39c8ebddcc302dac896dcd594a43b16e52d723c4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/customlinecap.c | 75 +++++++++++++++++++++++--------------- dlls/gdiplus/tests/customlinecap.c | 5 +-- 2 files changed, 46 insertions(+), 34 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index 7fbe8b6..c74928e 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -282,19 +282,43 @@ GpStatus WINGDIPAPI GdipGetCustomLineCapType(GpCustomLineCap *customCap, CustomL static void arrowcap_update_path(GpAdjustableArrowCap *cap) { + static const BYTE types_filled[] = + { + PathPointTypeStart, PathPointTypeLine, PathPointTypeLine, PathPointTypeLine | PathPointTypeCloseSubpath + }; + static const BYTE types_unfilled[] = + { + PathPointTypeStart, PathPointTypeLine, PathPointTypeLine + }; GpPointF *points; - assert(cap->cap.pathdata.Count == 4); + assert(cap->cap.pathdata.Count == 3 || cap->cap.pathdata.Count == 4); points = cap->cap.pathdata.Points; - points[0].X = 0.0; - points[0].Y = 0.0; - points[1].X = -cap->width / 2.0; - points[1].Y = -cap->height; - points[2].X = 0.0; - points[2].Y = -cap->height - cap->middle_inset; - points[3].X = cap->width / 2.0; - points[3].Y = -cap->height; + if (cap->cap.fill) + { + memcpy(cap->cap.pathdata.Types, types_filled, sizeof(types_filled)); + cap->cap.pathdata.Count = 4; + points[0].X = -cap->width / 2.0; + points[0].Y = -cap->height; + points[1].X = 0.0; + points[1].Y = 0.0; + points[2].X = cap->width / 2.0; + points[2].Y = -cap->height; + points[3].X = 0.0; + points[3].Y = -cap->height - cap->middle_inset; + } + else + { + memcpy(cap->cap.pathdata.Types, types_unfilled, sizeof(types_unfilled)); + cap->cap.pathdata.Count = 3; + points[0].X = -cap->width / 4.0; + points[0].Y = -cap->height / 2.0; + points[1].X = 0.0; + points[1].Y = 0.0; + points[2].X = cap->width / 4.0; + points[2].Y = -cap->height / 2.0; + } if (cap->width == 0.0) cap->cap.inset = 0.0; @@ -306,7 +330,6 @@ GpStatus WINGDIPAPI GdipCreateAdjustableArrowCap(REAL height, REAL width, BOOL f GpAdjustableArrowCap **cap) { GpPathData pathdata; - BYTE types[4]; GpStatus stat; TRACE("(%0.2f,%0.2f,%i,%p)\n", height, width, fill, cap); @@ -314,22 +337,15 @@ GpStatus WINGDIPAPI GdipCreateAdjustableArrowCap(REAL height, REAL width, BOOL f if (!cap) return InvalidParameter; - if (!fill) - FIXME("Arrows without fills are not supported.\n"); - *cap = heap_alloc_zero(sizeof(**cap)); if (!*cap) return OutOfMemory; - types[0] = PathPointTypeStart; - types[1] = PathPointTypeLine; - types[2] = PathPointTypeLine; - types[3] = PathPointTypeLine | PathPointTypeCloseSubpath; - + /* We'll need 4 points at most. */ pathdata.Count = 4; pathdata.Points = NULL; - pathdata.Types = types; - stat = init_custom_linecap(&(*cap)->cap, &pathdata, TRUE, LineCapTriangle, width != 0.0 ? height / width : 0.0); + pathdata.Types = NULL; + stat = init_custom_linecap(&(*cap)->cap, &pathdata, fill, LineCapTriangle, width != 0.0 ? height / width : 0.0); if (stat != Ok) { heap_free(*cap); @@ -347,14 +363,13 @@ GpStatus WINGDIPAPI GdipCreateAdjustableArrowCap(REAL height, REAL width, BOOL f GpStatus WINGDIPAPI GdipGetAdjustableArrowCapFillState(GpAdjustableArrowCap* cap, BOOL* fill) { - static int calls; - TRACE("(%p,%p)\n", cap, fill); - if(!(calls++)) - FIXME("not implemented\n"); + if (!cap || !fill) + return InvalidParameter; - return NotImplemented; + *fill = cap->cap.fill; + return Ok; } GpStatus WINGDIPAPI GdipGetAdjustableArrowCapHeight(GpAdjustableArrowCap* cap, REAL* height) @@ -392,14 +407,14 @@ GpStatus WINGDIPAPI GdipGetAdjustableArrowCapWidth(GpAdjustableArrowCap* cap, RE GpStatus WINGDIPAPI GdipSetAdjustableArrowCapFillState(GpAdjustableArrowCap* cap, BOOL fill) { - static int calls; - TRACE("(%p,%i)\n", cap, fill); - if(!(calls++)) - FIXME("not implemented\n"); + if (!cap) + return InvalidParameter; - return NotImplemented; + cap->cap.fill = fill; + arrowcap_update_path(cap); + return Ok; } GpStatus WINGDIPAPI GdipSetAdjustableArrowCapHeight(GpAdjustableArrowCap* cap, REAL height) diff --git a/dlls/gdiplus/tests/customlinecap.c b/dlls/gdiplus/tests/customlinecap.c index 6a22c26..e4ec329 100644 --- a/dlls/gdiplus/tests/customlinecap.c +++ b/dlls/gdiplus/tests/customlinecap.c @@ -250,16 +250,13 @@ static void test_create_adjustable_cap(void) ok(stat == Ok, "Failed to create adjustable cap, %d\n", stat); stat = GdipGetAdjustableArrowCapFillState(cap, NULL); -todo_wine ok(stat == InvalidParameter, "Unexpected return code, %d\n", stat); ret = FALSE; stat = GdipGetAdjustableArrowCapFillState(cap, &ret); -todo_wine -{ ok(stat == Ok, "Unexpected return code, %d\n", stat); ok(ret, "Unexpected fill state %d\n", ret); -} + stat = GdipGetAdjustableArrowCapHeight(cap, NULL); ok(stat == InvalidParameter, "Unexpected return code, %d\n", stat);

1 0

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

29 Nov '18

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

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

29 Nov '18

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

Alexandre Julliard : widl: Silence a gcc warning.
by Alexandre Julliard 29 Nov '18

29 Nov '18

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

Zebediah Figura : ddraw: Avoid leaking references to the wined3d device.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: fe1c7873bc917dc6517ac864ca7f9359da4a68ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe1c7873bc917dc6517ac864… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 21 15:01:40 2018 -0500 ddraw: Avoid leaking references to the wined3d device. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2689f3e68b624631e1762aa284d3968617ef3c2a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/surface.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 26d83cd..ef06f93 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -509,7 +509,16 @@ static void ddraw_surface_cleanup(struct ddraw_surface *surface) surf = surface->complex_array[i]; surface->complex_array[i] = NULL; if (!surf->is_complex_root) + { + struct ddraw_texture *texture = wined3d_texture_get_parent(surf->wined3d_texture); + struct wined3d_device *wined3d_device = texture->wined3d_device; + struct ddraw_surface *root = texture->root; + ddraw_surface_cleanup(surf); + + if (surf == root) + wined3d_device_decref(wined3d_device); + } } if (surface->device1)

1 0

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

29 Nov '18

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