November 2018 - Wine-Commits

Francois Gouget : testbot/WineRunBuild: Trust the build task's missions.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: tools Branch: master Commit: aa9453eafa1b6db778f7e18c7afa411e89479286 URL: https://source.winehq.org/git/tools.git/?a=commit;h=aa9453eafa1b6db778f7e18… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 29 11:53:39 2018 +0100 testbot/WineRunBuild: Trust the build task's missions. We now set the build task's missions field with the list of builds to perform so there is no need to recompute it in WineRunBuild. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 5a3a683..68e6be4 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -336,22 +336,6 @@ if ($Step->FileType ne "patch") # -# Figure out what to build -# - -my (%Missions, %TestExes); -foreach my $TestStep (@{$Job->Steps->GetItems()}) -{ - if (($TestStep->PreviousNo || 0) == $Step->No and - $TestStep->FileType =~ /^exe/) - { - $Missions{$TestStep->FileType} = 1; - $TestExes{$TestStep->FileName} = $TestStep->FileType; - } -} - - -# # Run the build # @@ -364,7 +348,7 @@ if (!$TA->SendFile($FileName, "staging/patch.diff", 0)) } my $Script = "#!/bin/sh\n". "( set -x\n". - " ../bin/build/Build.pl patch.diff ". join(":", sort keys %Missions) ."\n". + " ../bin/build/Build.pl patch.diff ". $Task->Missions ."\n". ") >Build.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n"); if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE)) @@ -446,6 +430,16 @@ FatalTAError(undef, $TAError) if (defined $TAError); # Grab the executables for the next steps # +my %TestExes; +foreach my $TestStep (@{$Job->Steps->GetItems()}) +{ + if (($TestStep->PreviousNo || 0) == $Step->No and + $TestStep->FileType =~ /^exe/) + { + $TestExes{$TestStep->FileName} = $TestStep->FileType; + } +} + my $Impacts = GetPatchImpacts($FileName); my $StepDir = $Step->CreateDir(); foreach my $TestInfo (values %{$Impacts->{Tests}})

1 0

Francois Gouget : testbot: Better identify when multiple locales are tested.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: tools Branch: master Commit: 3c518bbb1ce891083e970f4ea75e9b137cf66b55 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3c518bbb1ce891083e970f4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 29 11:50:28 2018 +0100 testbot: Better identify when multiple locales are tested. Previously testing the default English locale and one other locale would only show the latter in the mission description. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Missions.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Missions.pm b/testbot/lib/WineTestBot/Missions.pm index 18d4f5e..2662340 100644 --- a/testbot/lib/WineTestBot/Missions.pm +++ b/testbot/lib/WineTestBot/Missions.pm @@ -125,14 +125,16 @@ sub GetTaskMissionDescription($$) my $Lang; foreach my $Mission (@{$TaskMission->{Missions}}) { - next if (!$Mission->{lang}); - if (defined $Lang) + if (!defined $Lang) + { + $Lang = $Mission->{lang} || ""; + } + elsif ($Lang ne ($Mission->{lang} || "")) { $Description .= " + Locales"; $Lang = undef; last; } - $Lang = $Mission->{lang}; } $Description .= " ". LocaleName($Lang) if ($Lang); $Description .= " tests";

1 0

Francois Gouget : testbot/web: Clean up Submit's page handling.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: tools Branch: master Commit: 5b74d743f56c780af214ba3e589ab32b9b3ca8ed URL: https://source.winehq.org/git/tools.git/?a=commit;h=5b74d743f56c780af214ba3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 29 11:50:44 2018 +0100 testbot/web: Clean up Submit's page handling. Also validate the page like every parameter coming from the web browser. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 5c40ef5..a81a954 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -48,6 +48,9 @@ sub _initialize($$$) my ($self, $Request, $RequiredRole) = @_; $self->{Page} = $self->GetParam("Page") || 1; + # Page is a hidden parameter so fix it instead of issuing an error + $self->{Page} = 1 if ($self->{Page} !~ /^[1-4]$/); + $self->{LastPage} = $self->{Page}; my @PropertyDescriptors1 = ( CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 128), @@ -132,8 +135,7 @@ sub GenerateFields($) { my ($self) = @_; - print "<div><input type='hidden' name='Page' value='", $self->{Page}, - "'></div>\n"; + print "<div><input type='hidden' name='Page' value='$self->{Page}'></div>\n"; if ($self->{Page} == 1) { print "<div class='ItemProperty'><label>File</label>", @@ -215,7 +217,7 @@ sub GenerateFields($) } if ($self->{Page} == 2) { - if ($self->GetParam("Page") == 3) + if ($self->{LastPage} == 3) { my $VMs = CreateVMs(); # VMs that are only visible with ShowAll @@ -274,7 +276,7 @@ sub GenerateFields($) $Checked = undef; } if ($Checked and - ($self->GetParam("Page") == 1 || $self->GetParam($FieldName))) + ($self->{LastPage} == 1 || $self->GetParam($FieldName))) { print " checked='checked'"; } @@ -454,7 +456,7 @@ sub Validate($) { my ($self) = @_; - if ($self->{Page} == 2 && $self->GetParam("Page") == 2) + if ($self->{Page} == 2 && $self->{LastPage} == 2) { my $VMSelected = !1; my $VMs = CreateVMs(); @@ -474,7 +476,7 @@ sub Validate($) return !1; } } - elsif ($self->{Page} == 3 && $self->GetParam("Page") == 3) + elsif ($self->{Page} == 3 && $self->{LastPage} == 3) { if (($self->GetParam("FileType") eq "patch" && $self->GetParam("TestExecutable") !~ m/^[\w_.]+_test\.exe$/) ||

1 0

Alexandre Julliard : libwine: Look for the 64-bit wineserver using the 64-bit loader symlink.
by Alexandre Julliard Nov. 28, 2018

Nov. 28, 2018

Module: wine Branch: master Commit: 493129d638b5ee05522d4b1e0dd026f3f416ffcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=493129d638b5ee05522d4b1e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 28 13:24:19 2018 +0100 libwine: Look for the 64-bit wineserver using the 64-bit loader symlink. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/config.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 8ebe970..f638412 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -47,6 +47,7 @@ static char *server_dir; static char *build_dir; static char *user_name; static char *argv0_name; +static char *wineserver64; #ifdef __GNUC__ static void fatal_error( const char *err, ... ) __attribute__((noreturn,format(printf,1,2))); @@ -156,7 +157,7 @@ static char *get_runtime_libdir(void) /* read a symlink and return its directory */ static char *symlink_dirname( const char *name ) { - char *p, *buffer; + char *p, *buffer, *absdir = NULL; int ret, size; for (size = 256; ; size *= 2) @@ -169,11 +170,19 @@ static char *symlink_dirname( const char *name ) if (!(p = strrchr( buffer, '/' ))) break; if (p == buffer) p++; *p = 0; - return buffer; + if (buffer[0] == '/') return buffer; + /* make it absolute */ + absdir = xmalloc( strlen(name) + strlen(buffer) + 1 ); + strcpy( absdir, name ); + if (!(p = strrchr( absdir, '/' ))) break; + strcpy( p + 1, buffer ); + free( buffer ); + return absdir; } free( buffer ); } free( buffer ); + free( absdir ); return NULL; } @@ -446,6 +455,16 @@ done: if (build_dir) { argv0_name = build_path( "loader/", basename ); + if (sizeof(int) == sizeof(void *)) + { + char *loader, *linkname = build_path( build_dir, "loader/wine64" ); + if ((loader = symlink_dirname( linkname ))) + { + wineserver64 = build_path( loader, "../server/wineserver" ); + free( loader ); + } + free( linkname ); + } } else { @@ -565,7 +584,10 @@ void wine_exec_wine_binary( const char *name, char **argv, const char *env_var ) /* if we are in build dir and name contains a path, try that */ if (build_dir) { - argv[0] = build_path( build_dir, name ); + if (wineserver64 && !strcmp( name, "server/wineserver" )) + argv[0] = xstrdup( wineserver64 ); + else + argv[0] = build_path( build_dir, name ); preloader_exec( argv, use_preloader ); free( argv[0] ); }

1 0

Gabriel Ivăncescu : comctl32/tests: Also include LBS_NODATA cases when testing ownerdraw.
by Alexandre Julliard Nov. 28, 2018

Nov. 28, 2018

Module: wine Branch: master Commit: 423ea9790b8cbe17de325327dd4c7457cc1929c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=423ea9790b8cbe17de325327… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 20 12:57:40 2018 +0200 comctl32/tests: Also include LBS_NODATA cases when testing ownerdraw. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listbox.c | 79 ++++++++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 35 deletions(-) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 362447e..e789483 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -462,62 +462,71 @@ static HWND create_parent( void ) static void test_ownerdraw(void) { + static const DWORD styles[] = + { + 0, + LBS_NODATA + }; HWND parent, hLB; INT ret; RECT rc; + UINT i; parent = create_parent(); ok(parent != NULL, "Failed to create parent window.\n"); - hLB = create_listbox(LBS_OWNERDRAWFIXED | WS_CHILD | WS_VISIBLE, parent); - ok(hLB != NULL, "Failed to create listbox window.\n"); + for (i = 0; i < ARRAY_SIZE(styles); i++) + { + hLB = create_listbox(LBS_OWNERDRAWFIXED | WS_CHILD | WS_VISIBLE | styles[i], parent); + ok(hLB != NULL, "Failed to create listbox window.\n"); - SetForegroundWindow(hLB); - UpdateWindow(hLB); + SetForegroundWindow(hLB); + UpdateWindow(hLB); - /* make height short enough */ - SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); - SetWindowPos(hLB, 0, 0, 0, 100, rc.bottom - rc.top + 1, SWP_NOZORDER | SWP_NOMOVE); + /* make height short enough */ + SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); + SetWindowPos(hLB, 0, 0, 0, 100, rc.bottom - rc.top + 1, SWP_NOZORDER | SWP_NOMOVE); - /* make 0 item invisible */ - SendMessageA(hLB, LB_SETTOPINDEX, 1, 0); - ret = SendMessageA(hLB, LB_GETTOPINDEX, 0, 0); - ok(ret == 1, "wrong top index %d\n", ret); + /* make 0 item invisible */ + SendMessageA(hLB, LB_SETTOPINDEX, 1, 0); + ret = SendMessageA(hLB, LB_GETTOPINDEX, 0, 0); + ok(ret == 1, "wrong top index %d\n", ret); - SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); - ok(!IsRectEmpty(&rc), "empty item rect\n"); - ok(rc.top < 0, "rc.top is not negative (%d)\n", rc.top); + SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); + ok(!IsRectEmpty(&rc), "empty item rect\n"); + ok(rc.top < 0, "rc.top is not negative (%d)\n", rc.top); - DestroyWindow(hLB); + DestroyWindow(hLB); - /* Both FIXED and VARIABLE, FIXED should override VARIABLE. */ - hLB = CreateWindowA(WC_LISTBOXA, "TestList", LBS_OWNERDRAWFIXED | LBS_OWNERDRAWVARIABLE, 0, 0, 100, 100, - NULL, NULL, NULL, 0); - ok(hLB != NULL, "last error 0x%08x\n", GetLastError()); + /* Both FIXED and VARIABLE, FIXED should override VARIABLE. */ + hLB = CreateWindowA(WC_LISTBOXA, "TestList", LBS_OWNERDRAWFIXED | LBS_OWNERDRAWVARIABLE | styles[i], + 0, 0, 100, 100, NULL, NULL, NULL, 0); + ok(hLB != NULL, "last error 0x%08x\n", GetLastError()); - ok(GetWindowLongA(hLB, GWL_STYLE) & LBS_OWNERDRAWVARIABLE, "Unexpected window style.\n"); + ok(GetWindowLongA(hLB, GWL_STYLE) & LBS_OWNERDRAWVARIABLE, "Unexpected window style.\n"); - ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); - ok(ret == 0, "Unexpected return value %d.\n", ret); - ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); - ok(ret == 1, "Unexpected return value %d.\n", ret); + ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); + ok(ret == 1, "Unexpected return value %d.\n", ret); - ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 0, 13); - ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); + ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 0, 13); + ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); - ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); - ok(ret == 13, "Unexpected item height %d.\n", ret); + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); + ok(ret == 13, "Unexpected item height %d.\n", ret); - ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 1, 42); - ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); + ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 1, 42); + ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); - ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); - ok(ret == 42, "Unexpected item height %d.\n", ret); + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); + ok(ret == 42, "Unexpected item height %d.\n", ret); - ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 1, 0); - ok(ret == 42, "Unexpected item height %d.\n", ret); + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 1, 0); + ok(ret == 42, "Unexpected item height %d.\n", ret); - DestroyWindow (hLB); + DestroyWindow (hLB); + } DestroyWindow(parent); }

1 0

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

Nov. 28, 2018

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

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

Nov. 28, 2018

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: Add a helper to create gradient brush from rectangle.
by Alexandre Julliard Nov. 28, 2018

Nov. 28, 2018

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: Fix brush transform created with GdipCreateLineBrushFromRect().
by Alexandre Julliard Nov. 28, 2018

Nov. 28, 2018

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

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

Nov. 28, 2018

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