wine-commits November 2018

wine-commits@winehq.org

2 participants
951 discussions

Brendan McGrath : ntdll: Use 32bit when COM header marks it required.
by Alexandre Julliard 28 Nov '18

28 Nov '18

Module: wine Branch: master Commit: 8cd569cf2628fbb2497e5ef020e670f77cf36d40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cd569cf2628fbb2497e5ef0… Author: Brendan McGrath <brendan(a)redmandi.com> Date: Sun Nov 25 06:39:00 2018 +1100 ntdll: Use 32bit when COM header marks it required. Currently, when using wine64 to to load a .NET application which has the 32-bit required flag switched on, it fails with a c0000017 error (ERROR_NOT_ENOUGH_MEMORY). Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index b00a5f8..631e8bd 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1984,12 +1984,8 @@ static BOOL is_valid_binary( HMODULE module, const pe_image_info_t *info ) if (info->machine == IMAGE_FILE_MACHINE_ARM64) return TRUE; #endif if (!info->contains_code) return TRUE; - if (info->image_flags & IMAGE_FLAGS_ComPlusNativeReady) - { - if (!convert_to_pe64( module, info )) return FALSE; - } - if (info->image_flags & IMAGE_FLAGS_ComPlusILOnly) return TRUE; - return FALSE; + if (!(info->image_flags & IMAGE_FLAGS_ComPlusNativeReady)) return FALSE; + return convert_to_pe64( module, info ); #else return FALSE; /* no wow64 support on other platforms */ #endif

1 0

Ralf Habacker : server: Release atoms when destroying a window class.
by Alexandre Julliard 28 Nov '18

28 Nov '18

Module: wine Branch: master Commit: 081a48ebabc5c258aa580ff05d31f29c3fb3e08d URL: https://source.winehq.org/git/wine.git/?a=commit;h=081a48ebabc5c258aa580ff0… Author: Ralf Habacker <ralf.habacker(a)freenet.de> Date: Mon Nov 26 13:14:01 2018 +0100 server: Release atoms when destroying a window class. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46180 Signed-off-by: Ralf Habacker <ralf.habacker(a)freenet.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/class.c | 4 ++++ server/class.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index d6910d9..2702fa0 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -115,6 +115,8 @@ static void ClassTest(HINSTANCE hInstance, BOOL global) return; ok(classatom, "failed to register class\n"); + ok(GetClipboardFormatNameW(classatom, str, ARRAY_SIZE(str)) != 0, "atom not found\n"); + ok(!RegisterClassW (&cls), "RegisterClass of the same class should fail for the second time\n"); @@ -230,6 +232,8 @@ static void ClassTest(HINSTANCE hInstance, BOOL global) ok(UnregisterClassW(className, hInstance), "UnregisterClass() failed\n"); + ok(GetClipboardFormatNameW(classatom, str, ARRAY_SIZE(str)) == 0, + "atom still found\n"); return; } diff --git a/server/class.c b/server/class.c index 403180d..b8240bd 100644 --- a/server/class.c +++ b/server/class.c @@ -76,6 +76,8 @@ static struct window_class *create_class( struct process *process, int extra_byt static void destroy_class( struct window_class *class ) { + release_global_atom( NULL, class->atom ); + release_global_atom( NULL, class->base_atom ); list_remove( &class->entry ); release_object( class->process ); free( class );

1 0

Zebediah Figura : dbghelp: Avoid using inline assembly in have_x86cpuid().
by Alexandre Julliard 28 Nov '18

28 Nov '18

Module: wine Branch: master Commit: 797f93be6553d4a759473886ad00826c3371d094 URL: https://source.winehq.org/git/wine.git/?a=commit;h=797f93be6553d4a759473886… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 27 19:29:45 2018 -0600 dbghelp: Avoid using inline assembly in have_x86cpuid(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/minidump.c | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 25c209c..04dc775 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -558,34 +558,29 @@ __ASM_GLOBAL_FUNC( do_x86cpuid, "popl %ebx\n\t" "popl %esi\n\t" "ret" ) +extern int have_x86cpuid(void); +__ASM_GLOBAL_FUNC( have_x86cpuid, + "pushfl\n\t" + "pushfl\n\t" + "movl (%esp),%ecx\n\t" + "xorl $0x00200000,(%esp)\n\t" + "popfl\n\t" + "pushfl\n\t" + "popl %eax\n\t" + "popfl\n\t" + "xorl %ecx,%eax\n\t" + "andl $0x00200000,%eax\n\t" + "ret" ) #else static void do_x86cpuid(unsigned int ax, unsigned int *p) { } -#endif -/* From xf86info havecpuid.c 1.11 */ -static inline int have_x86cpuid(void) +static int have_x86cpuid(void) { -#if defined(__GNUC__) && defined(__i386__) - unsigned int f1, f2; - __asm__("pushfl\n\t" - "pushfl\n\t" - "popl %0\n\t" - "movl %0,%1\n\t" - "xorl %2,%0\n\t" - "pushl %0\n\t" - "popfl\n\t" - "pushfl\n\t" - "popl %0\n\t" - "popfl" - : "=&r" (f1), "=&r" (f2) - : "ir" (0x00200000)); - return ((f1^f2) & 0x00200000) != 0; -#else return 0; -#endif } +#endif /****************************************************************** * dump_system_info

1 0

Zebediah Figura : dbghelp: Avoid using inline assembly in do_x86cpuid().
by Alexandre Julliard 28 Nov '18

28 Nov '18

Module: wine Branch: master Commit: b7f3e6ba317bec299e43156efcdb5469f39a8a3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7f3e6ba317bec299e43156e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 27 19:29:44 2018 -0600 dbghelp: Avoid using inline assembly in do_x86cpuid(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/minidump.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 975bb45..25c209c 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" #include <time.h> #define NONAMELESSUNION @@ -542,20 +543,26 @@ static unsigned dump_modules(struct dump_context* dc, BOOL dump_elf) return sz; } -/* Calls cpuid with an eax of 'ax' and returns the 16 bytes in *p - * We are compiled with -fPIC, so we can't clobber ebx. - */ -static inline void do_x86cpuid(unsigned int ax, unsigned int *p) +#ifdef __i386__ +extern void do_x86cpuid(unsigned int ax, unsigned int *p); +__ASM_GLOBAL_FUNC( do_x86cpuid, + "pushl %esi\n\t" + "pushl %ebx\n\t" + "movl 12(%esp),%eax\n\t" + "movl 16(%esp),%esi\n\t" + "cpuid\n\t" + "movl %eax,(%esi)\n\t" + "movl %ebx,4(%esi)\n\t" + "movl %ecx,8(%esi)\n\t" + "movl %edx,12(%esi)\n\t" + "popl %ebx\n\t" + "popl %esi\n\t" + "ret" ) +#else +static void do_x86cpuid(unsigned int ax, unsigned int *p) { -#if defined(__GNUC__) && defined(__i386__) - __asm__("pushl %%ebx\n\t" - "cpuid\n\t" - "movl %%ebx, %%esi\n\t" - "popl %%ebx" - : "=a" (p[0]), "=S" (p[1]), "=c" (p[2]), "=d" (p[3]) - : "0" (ax)); -#endif } +#endif /* From xf86info havecpuid.c 1.11 */ static inline int have_x86cpuid(void)

1 0

Nikolay Sivov : wincodecs: Grab TIFF decoder reference when creating frames.
by Alexandre Julliard 28 Nov '18

28 Nov '18

Module: wine Branch: master Commit: fc2b2b1bd49a08bfcbd15bda8ab0184a5e0cd285 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc2b2b1bd49a08bfcbd15bda… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 14 13:55:48 2018 +0300 wincodecs: Grab TIFF decoder reference when creating frames. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/tiffformat.c | 13 ++++++++++++- dlls/windowscodecs/tiffformat.c | 4 +++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index c6ec21a..36de69e 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -26,6 +26,15 @@ #include "wincodec.h" #include "wine/test.h" +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) +static void _expect_ref(IUnknown* obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); +} + #define IFD_BYTE 1 #define IFD_ASCII 2 #define IFD_SHORT 3 @@ -407,8 +416,11 @@ static void test_tiff_8bpp_alpha(void) ok(hr == S_OK, "GetFrameCount error %#x\n", hr); ok(frame_count == 1, "expected 1, got %u\n", frame_count); + EXPECT_REF(decoder, 1); hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); ok(hr == S_OK, "GetFrame error %#x\n", hr); + EXPECT_REF(decoder, 2); + IWICBitmapDecoder_Release(decoder); hr = IWICBitmapFrameDecode_GetSize(frame, &width, &height); ok(hr == S_OK, "GetSize error %#x\n", hr); @@ -443,7 +455,6 @@ static void test_tiff_8bpp_alpha(void) ok(data[i] == expected_data[i], "%u: expected %02x, got %02x\n", i, expected_data[i], data[i]); IWICBitmapFrameDecode_Release(frame); - IWICBitmapDecoder_Release(decoder); } static void test_tiff_resolution(void) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 5585718..67773fd 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -766,6 +766,7 @@ static HRESULT WINAPI TiffDecoder_GetFrame(IWICBitmapDecoder *iface, result->IWICMetadataBlockReader_iface.lpVtbl = &TiffFrameDecode_BlockVtbl; result->ref = 1; result->parent = This; + IWICBitmapDecoder_AddRef(iface); result->index = index; result->decode_info = decode_info; result->cached_tile_x = -1; @@ -776,7 +777,7 @@ static HRESULT WINAPI TiffDecoder_GetFrame(IWICBitmapDecoder *iface, else { hr = E_OUTOFMEMORY; - HeapFree(GetProcessHeap(), 0, result); + IWICBitmapFrameDecode_Release(&result->IWICBitmapFrameDecode_iface); } } else hr = E_OUTOFMEMORY; @@ -851,6 +852,7 @@ static ULONG WINAPI TiffFrameDecode_Release(IWICBitmapFrameDecode *iface) if (ref == 0) { + IWICBitmapDecoder_Release(&This->parent->IWICBitmapDecoder_iface); HeapFree(GetProcessHeap(), 0, This->cached_tile); HeapFree(GetProcessHeap(), 0, This); }

1 0

Nikolay Sivov : gdiplus: Remove unused brush fields.
by Alexandre Julliard 28 Nov '18

28 Nov '18

Module: wine Branch: master Commit: bb2e09804d7d38929c4d0d67c9dddd887e4cd12c URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb2e09804d7d38929c4d0d67… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 14 13:40:57 2018 +0300 gdiplus: Remove unused brush fields. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index b2e4f1e..8c4fcce 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -291,8 +291,6 @@ struct GpPathGradient{ struct GpLineGradient{ GpBrush brush; - GpPointF startpoint; - GpPointF endpoint; ARGB startcolor; ARGB endcolor; RectF rect;

1 0

Nikolay Sivov : gdiplus: Fix brush transform created with GdipCreateLineBrushFromRect().
by Alexandre Julliard 28 Nov '18

28 Nov '18

Module: wine Branch: master Commit: 0937186f7d15fed60f77fa2014d650f4d0b6b20b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0937186f7d15fed60f77fa20… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 14 13:40:56 2018 +0300 gdiplus: Fix brush transform created with GdipCreateLineBrushFromRect(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/brush.c | 34 ++++++---------------------------- dlls/gdiplus/tests/brush.c | 4 ---- 2 files changed, 6 insertions(+), 32 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 808e021..42b7e84 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -408,9 +408,7 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRect(GDIPCONST GpRectF* rect, ARGB startcolor, ARGB endcolor, LinearGradientMode mode, GpWrapMode wrap, GpLineGradient **line) { - GpPointF start, end; - GpStatus stat; - float far_x, far_y; + float angle; TRACE("(%p, %x, %x, %d, %d, %p)\n", rect, startcolor, endcolor, mode, wrap, line); @@ -418,45 +416,25 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRect(GDIPCONST GpRectF* rect, if(!line || !rect) return InvalidParameter; - far_x = rect->X + rect->Width; - far_y = rect->Y + rect->Height; - switch (mode) { case LinearGradientModeHorizontal: - start.X = min(rect->X, far_x); - start.Y = rect->Y; - end.X = max(rect->X, far_x); - end.Y = rect->Y; + angle = 0.0f; break; case LinearGradientModeVertical: - start.X = rect->X; - start.Y = min(rect->Y, far_y); - end.X = rect->X; - end.Y = max(rect->Y, far_y); + angle = 90.0f; break; case LinearGradientModeForwardDiagonal: - start.X = min(rect->X, far_x); - start.Y = min(rect->Y, far_y); - end.X = max(rect->X, far_x); - end.Y = max(rect->Y, far_y); + angle = 45.0f; break; case LinearGradientModeBackwardDiagonal: - start.X = max(rect->X, far_x); - start.Y = min(rect->Y, far_y); - end.X = min(rect->X, far_x); - end.Y = max(rect->Y, far_y); + angle = 135.0f; break; default: return InvalidParameter; } - stat = GdipCreateLineBrush(&start, &end, startcolor, endcolor, wrap, line); - - if (stat == Ok) - (*line)->rect = *rect; - - return stat; + return GdipCreateLineBrushFromRectWithAngle(rect, startcolor, endcolor, angle, TRUE, wrap, line); } GpStatus WINGDIPAPI GdipCreateLineBrushFromRectI(GDIPCONST GpRect* rect, diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index bc6b57f..bb645ff 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -764,15 +764,11 @@ static void test_gradientgetrect(void) #define expectf2(expected, got) ok(fabs(expected - got) < 0.001, "%u: expected %.3f, got %.3f.\n", i, expected, got) expectf2(create_from_rect[i].transform[0], elements[0]); - todo_wine_if(create_from_rect[i].mode == LinearGradientModeVertical) { expectf2(create_from_rect[i].transform[1], elements[1]); expectf2(create_from_rect[i].transform[2], elements[2]); - } expectf2(create_from_rect[i].transform[3], elements[3]); - todo_wine_if(create_from_rect[i].mode == LinearGradientModeVertical) { expectf2(create_from_rect[i].transform[4], elements[4]); expectf2(create_from_rect[i].transform[5], elements[5]); - } #undef expectf2 }

1 0

Nikolay Sivov : gdiplus: Add a helper to create gradient brush from rectangle.
by Alexandre Julliard 28 Nov '18

28 Nov '18

Module: wine Branch: master Commit: 6906117bc3d53dd9318a486b4e9cfd6dd5d1c77a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6906117bc3d53dd9318a486b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 14 13:40:55 2018 +0300 gdiplus: Add a helper to create gradient brush from rectangle. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/brush.c | 185 +++++++++++++++++++++++++++++---------------------- 1 file changed, 107 insertions(+), 78 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 3aeb654..808e021 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -265,12 +265,49 @@ GpStatus WINGDIPAPI GdipCreateHatchBrush(GpHatchStyle hatchstyle, ARGB forecol, return Ok; } -static void linegradient_init_transform(GpLineGradient *line) +static GpStatus create_line_brush(const GpRectF *rect, ARGB startcolor, ARGB endcolor, + GpWrapMode wrap, GpLineGradient **line) +{ + *line = heap_alloc_zero(sizeof(GpLineGradient)); + if(!*line) return OutOfMemory; + + (*line)->brush.bt = BrushTypeLinearGradient; + (*line)->startcolor = startcolor; + (*line)->endcolor = endcolor; + (*line)->wrap = wrap; + (*line)->gamma = FALSE; + (*line)->rect = *rect; + (*line)->blendcount = 1; + (*line)->blendfac = heap_alloc_zero(sizeof(REAL)); + (*line)->blendpos = heap_alloc_zero(sizeof(REAL)); + + if (!(*line)->blendfac || !(*line)->blendpos) + { + heap_free((*line)->blendfac); + heap_free((*line)->blendpos); + heap_free(*line); + *line = NULL; + return OutOfMemory; + } + + (*line)->blendfac[0] = 1.0f; + (*line)->blendpos[0] = 1.0f; + + (*line)->pblendcolor = NULL; + (*line)->pblendpos = NULL; + (*line)->pblendcount = 0; + + GdipSetMatrixElements(&(*line)->transform, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f); + + return Ok; +} + +static void linegradient_init_transform(const GpPointF *startpoint, const GpPointF *endpoint, GpLineGradient *line) { float trans_x = line->rect.X + (line->rect.Width / 2.f); float trans_y = line->rect.Y + (line->rect.Height / 2.f); - float dx = line->endpoint.X - line->startpoint.X; - float dy = line->endpoint.Y - line->startpoint.Y; + float dx = endpoint->X - startpoint->X; + float dy = endpoint->Y - startpoint->Y; float t_cos, t_sin, w_ratio, h_ratio; float h; GpMatrix rot; @@ -307,6 +344,9 @@ GpStatus WINGDIPAPI GdipCreateLineBrush(GDIPCONST GpPointF* startpoint, GDIPCONST GpPointF* endpoint, ARGB startcolor, ARGB endcolor, GpWrapMode wrap, GpLineGradient **line) { + GpStatus stat; + GpRectF rect; + TRACE("(%s, %s, %x, %x, %d, %p)\n", debugstr_pointf(startpoint), debugstr_pointf(endpoint), startcolor, endcolor, wrap, line); @@ -316,57 +356,27 @@ GpStatus WINGDIPAPI GdipCreateLineBrush(GDIPCONST GpPointF* startpoint, if (startpoint->X == endpoint->X && startpoint->Y == endpoint->Y) return OutOfMemory; - *line = heap_alloc_zero(sizeof(GpLineGradient)); - if(!*line) return OutOfMemory; + rect.X = startpoint->X < endpoint->X ? startpoint->X : endpoint->X; + rect.Y = startpoint->Y < endpoint->Y ? startpoint->Y : endpoint->Y; + rect.Width = fabs(startpoint->X - endpoint->X); + rect.Height = fabs(startpoint->Y - endpoint->Y); - (*line)->brush.bt = BrushTypeLinearGradient; - - (*line)->startpoint.X = startpoint->X; - (*line)->startpoint.Y = startpoint->Y; - (*line)->endpoint.X = endpoint->X; - (*line)->endpoint.Y = endpoint->Y; - (*line)->startcolor = startcolor; - (*line)->endcolor = endcolor; - (*line)->wrap = wrap; - (*line)->gamma = FALSE; - - (*line)->rect.X = (startpoint->X < endpoint->X ? startpoint->X: endpoint->X); - (*line)->rect.Y = (startpoint->Y < endpoint->Y ? startpoint->Y: endpoint->Y); - (*line)->rect.Width = fabs(startpoint->X - endpoint->X); - (*line)->rect.Height = fabs(startpoint->Y - endpoint->Y); - - if ((*line)->rect.Width == 0) + if (rect.Width == 0.0f) { - (*line)->rect.X -= (*line)->rect.Height / 2.0f; - (*line)->rect.Width = (*line)->rect.Height; + rect.X -= rect.Height / 2.0f; + rect.Width = rect.Height; } - else if ((*line)->rect.Height == 0) + else if (rect.Height == 0.0f) { - (*line)->rect.Y -= (*line)->rect.Width / 2.0f; - (*line)->rect.Height = (*line)->rect.Width; - } - - (*line)->blendcount = 1; - (*line)->blendfac = heap_alloc_zero(sizeof(REAL)); - (*line)->blendpos = heap_alloc_zero(sizeof(REAL)); - - if (!(*line)->blendfac || !(*line)->blendpos) - { - heap_free((*line)->blendfac); - heap_free((*line)->blendpos); - heap_free(*line); - *line = NULL; - return OutOfMemory; + rect.Y -= rect.Width / 2.0f; + rect.Height = rect.Width; } - (*line)->blendfac[0] = 1.0f; - (*line)->blendpos[0] = 1.0f; - - (*line)->pblendcolor = NULL; - (*line)->pblendpos = NULL; - (*line)->pblendcount = 0; + stat = create_line_brush(&rect, startcolor, endcolor, wrap, line); + if (stat != Ok) + return stat; - linegradient_init_transform(*line); + linegradient_init_transform(startpoint, endpoint, *line); TRACE("<-- %p\n", *line); @@ -474,9 +484,9 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngle(GDIPCONST GpRectF* rect GpLineGradient **line) { GpStatus stat; - LinearGradientMode mode; - REAL exofs, eyofs; + REAL exofs, eyofs, far_x, far_y; REAL sin_angle, cos_angle, sin_cos_angle; + GpPointF start, end; TRACE("(%p, %x, %x, %.2f, %d, %d, %p)\n", rect, startcolor, endcolor, angle, isAngleScalable, wrap, line); @@ -515,42 +525,61 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngle(GDIPCONST GpRectF* rect cos_angle = cosf(angle); sin_cos_angle = sin_angle * cos_angle; - if (sin_cos_angle >= 0) - mode = LinearGradientModeForwardDiagonal; + far_x = rect->X + rect->Width; + far_y = rect->Y + rect->Height; + + if (angle == 0.0f) + { + start.X = min(rect->X, far_x); + start.Y = rect->Y; + end.X = max(rect->X, far_x); + end.Y = rect->Y; + } + else if (sin_cos_angle >= 0) + { + start.X = min(rect->X, far_x); + start.Y = min(rect->Y, far_y); + end.X = max(rect->X, far_x); + end.Y = max(rect->Y, far_y); + } else - mode = LinearGradientModeBackwardDiagonal; + { + start.X = max(rect->X, far_x); + start.Y = min(rect->Y, far_y); + end.X = min(rect->X, far_x); + end.Y = max(rect->Y, far_y); + } - stat = GdipCreateLineBrushFromRect(rect, startcolor, endcolor, mode, wrap, line); + stat = create_line_brush(rect, startcolor, endcolor, wrap, line); + if (stat != Ok || angle == 0.0f) + return stat; - if (stat == Ok) + if (sin_cos_angle >= 0) { - if (sin_cos_angle >= 0) - { - exofs = rect->Height * sin_cos_angle + rect->Width * cos_angle * cos_angle; - eyofs = rect->Height * sin_angle * sin_angle + rect->Width * sin_cos_angle; - } - else - { - exofs = rect->Width * sin_angle * sin_angle + rect->Height * sin_cos_angle; - eyofs = -rect->Width * sin_cos_angle + rect->Height * sin_angle * sin_angle; - } - - if (sin_angle >= 0) - { - (*line)->endpoint.X = rect->X + exofs; - (*line)->endpoint.Y = rect->Y + eyofs; - } - else - { - (*line)->endpoint.X = (*line)->startpoint.X; - (*line)->endpoint.Y = (*line)->startpoint.Y; - (*line)->startpoint.X = rect->X + exofs; - (*line)->startpoint.Y = rect->Y + eyofs; - } + exofs = rect->Height * sin_cos_angle + rect->Width * cos_angle * cos_angle; + eyofs = rect->Height * sin_angle * sin_angle + rect->Width * sin_cos_angle; + } + else + { + exofs = rect->Width * sin_angle * sin_angle + rect->Height * sin_cos_angle; + eyofs = -rect->Width * sin_cos_angle + rect->Height * sin_angle * sin_angle; + } - linegradient_init_transform(*line); + if (sin_angle >= 0) + { + end.X = rect->X + exofs; + end.Y = rect->Y + eyofs; + } + else + { + end.X = start.X; + end.Y = start.Y; + start.X = rect->X + exofs; + start.Y = rect->Y + eyofs; } + linegradient_init_transform(&start, &end, *line); + return stat; }

1 0

Nikolay Sivov : gdiplus/tests: Add more tests for gradient brush rectangles.
by Alexandre Julliard 28 Nov '18

28 Nov '18

Module: wine Branch: master Commit: 1f95fd48117d5c0717a54eae8ca7eb2ed47c5ba3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f95fd48117d5c0717a54eae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 14 13:40:54 2018 +0300 gdiplus/tests: Add more tests for gradient brush rectangles. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/brush.c | 384 +++++++++++++++++++++------------------------ 1 file changed, 181 insertions(+), 203 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1f95fd48117d5c0717a5…

1 0

Nikolay Sivov : shcore: Add StrDupA()/StrDupW().
by Alexandre Julliard 28 Nov '18

28 Nov '18

Module: wine Branch: master Commit: 0046c1f5bd55d5f3ba40a760fd6a93bf84f26877 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0046c1f5bd55d5f3ba40a760… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 28 09:59:03 2018 +0300 shcore: Add StrDupA()/StrDupW(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/main.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/shcore/shcore.spec | 4 ++-- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 93effef..bf477ae 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -1409,3 +1409,49 @@ BOOL WINAPI SHCreateThread(LPTHREAD_START_ROUTINE thread_proc, void *data, DWORD return called; } + +/************************************************************************* + * SHStrDupW [SHCORE.@] + */ +HRESULT WINAPI SHStrDupW(const WCHAR *src, WCHAR **dest) +{ + size_t len; + + TRACE("(%s, %p)\n", debugstr_w(src), dest); + + *dest = NULL; + + if (!src) + return E_INVALIDARG; + + len = (strlenW(src) + 1) * sizeof(WCHAR); + *dest = CoTaskMemAlloc(len); + if (!*dest) + return E_OUTOFMEMORY; + + memcpy(*dest, src, len); + + return S_OK; +} + +/************************************************************************* + * SHStrDupA [SHCORE.@] + */ +HRESULT WINAPI SHStrDupA(const char *src, WCHAR **dest) +{ + DWORD len; + + *dest = NULL; + + if (!src) + return E_INVALIDARG; + + len = MultiByteToWideChar(CP_ACP, 0, src, -1, NULL, 0); + *dest = CoTaskMemAlloc(len * sizeof(WCHAR)); + if (!*dest) + return E_OUTOFMEMORY; + + MultiByteToWideChar(CP_ACP, 0, src, -1, *dest, len); + + return S_OK; +} diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index a08c2da..1473bf7 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -73,8 +73,8 @@ @ stdcall SHSetThreadRef(ptr) @ stdcall SHSetValueA(long str str long ptr long) shlwapi.SHSetValueA @ stdcall SHSetValueW(long wstr wstr long ptr long) shlwapi.SHSetValueW -@ stdcall SHStrDupA(str ptr) shlwapi.SHStrDupA -@ stdcall SHStrDupW(wstr ptr) shlwapi.SHStrDupW +@ stdcall SHStrDupA(str ptr) +@ stdcall SHStrDupW(wstr ptr) @ stdcall SHUnicodeToAnsi(wstr ptr ptr) shlwapi.SHUnicodeToAnsi @ stdcall SHUnicodeToUnicode(wstr ptr long) shlwapi.SHUnicodeToUnicode @ stdcall SetCurrentProcessExplicitAppUserModelID(wstr)

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2018