December 2018 - Wine-commits

Michael Stefaniuc : shell32: Use SetRect() instead of open coding it.
by Alexandre Julliard 10 Dec '18

10 Dec '18

Module: wine Branch: master Commit: db850cd75817d1a7e41a6ad044d6866488e267ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=db850cd75817d1a7e41a6ad0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Dec 7 21:57:15 2018 +0100 shell32: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/ebrowser.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index 2d5a30a..637104c 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -314,9 +314,7 @@ static void update_layout(ExplorerBrowserImpl *This) if(navpane_width_actual) { - This->navpane.rc.left = This->navpane.rc.top = 0; - This->navpane.rc.right = navpane_width_actual; - This->navpane.rc.bottom = rc.bottom; + SetRect(&This->navpane.rc, 0, 0, navpane_width_actual, rc.bottom); if(!This->navpane.hwnd_splitter) initialize_navpane(This, This->hwnd_main, &This->navpane.rc); @@ -324,10 +322,8 @@ static void update_layout(ExplorerBrowserImpl *This) else ZeroMemory(&This->navpane.rc, sizeof(RECT)); - This->sv_rc.left = navpane_width_actual; - This->sv_rc.top = 0; - This->sv_rc.right = This->sv_rc.left + shellview_width_actual; - This->sv_rc.bottom = rc.bottom; + SetRect(&This->sv_rc, navpane_width_actual, 0, navpane_width_actual + shellview_width_actual, + rc.bottom); } static void size_panes(ExplorerBrowserImpl *This)

1 0

Francois Gouget : dbghelp: Make symt_get_best_at() static.
by Alexandre Julliard 10 Dec '18

10 Dec '18

Module: wine Branch: master Commit: edcff4046c5aa70c047c1a523a93a5cc5782fb44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=edcff4046c5aa70c047c1a52… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 9 01:41:20 2018 +0100 dbghelp: Make symt_get_best_at() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/symbol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index c9585c5..96a1f87 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -851,7 +851,7 @@ static void symt_get_length(struct module* module, const struct symt* symt, ULON } /* neede by symt_find_nearest */ -int symt_get_best_at(struct module* module, int idx_sorttab) +static int symt_get_best_at(struct module* module, int idx_sorttab) { ULONG64 ref_addr; int idx_sorttab_orig = idx_sorttab;

1 0

Francois Gouget : testbot/WineRunReconfig: Don' t fail if the idle snapshot does not exist.
by Alexandre Julliard 10 Dec '18

10 Dec '18

Module: tools Branch: master Commit: fb463416b2296dac488af9aa5c8b9867dbb03493 URL: https://source.winehq.org/git/tools.git/?a=commit;h=fb463416b2296dac488af9a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 10 16:47:46 2018 +0100 testbot/WineRunReconfig: Don't fail if the idle snapshot does not exist. This simplifies recovery if an error occurred in a previous run that resulted in the snapshot being deleted. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index c903ae3..11f92c8 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -458,23 +458,28 @@ FatalTAError(undef, $TAError) if (defined $TAError); if ($NewStatus eq 'completed') { - Debug(Elapsed($Start), " Deleting the old ", $VM->IdleSnapshot, " snapshot\n"); - $ErrMessage = $VM->GetDomain()->RemoveSnapshot(); - if (defined $ErrMessage) + my $Domain = $VM->GetDomain(); + my $IdleSnapshot = $VM->IdleSnapshot; + if ($Domain->HasSnapshot($IdleSnapshot)) { - # It's not clear if the snapshot is still usable. Rather than try to figure - # it out now, let the next task deal with it. - FatalError("Could not remove the ". $VM->IdleSnapshot ." snapshot: $ErrMessage\n", "retry"); + Debug(Elapsed($Start), " Deleting the old $IdleSnapshot snapshot\n"); + $ErrMessage = $Domain->RemoveSnapshot(); + if (defined $ErrMessage) + { + # It's not clear if the snapshot is still usable. Rather than try to + # figure it out now, let the next task deal with it. + FatalError("Could not remove the $IdleSnapshot snapshot: $ErrMessage\n", "retry"); + } } - Debug(Elapsed($Start), " Recreating the ", $VM->IdleSnapshot, " snapshot\n"); - $ErrMessage = $VM->GetDomain()->CreateSnapshot(); + Debug(Elapsed($Start), " Recreating the $IdleSnapshot snapshot\n"); + $ErrMessage = $Domain->CreateSnapshot(); if (defined $ErrMessage) { # Without the snapshot the VM is not usable anymore but FatalError() will # just mark it as 'dirty'. It's only the next time it is used that the # problem will be noticed and that it will be taken offline. - FatalError("Could not recreate the ". $VM->IdleSnapshot ." snapshot: $ErrMessage\n"); + FatalError("Could not recreate the $IdleSnapshot snapshot: $ErrMessage\n"); } }

1 0

Francois Gouget : testbot/web: Fix showing the local job / task completion time.
by Alexandre Julliard 10 Dec '18

10 Dec '18

Module: tools Branch: master Commit: 8229ab69bd59a30083b03f89ef3c0b58f20b6233 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8229ab69bd59a30083b03f8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 10 16:48:12 2018 +0100 testbot/web: Fix showing the local job / task completion time. The ShowDateTime() JavaScript call must be on its own line otherwise it's ignored. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 5 +++-- testbot/web/index.pl | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 92f9d19..84b9e37 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -598,8 +598,9 @@ sub GenerateDataCell($$$$$) print "<td><a id='$TagId' class='title' title='", strftime("%Y/%m/%d %H:%M:%S", localtime($StepTask->Ended)), "'>", DurationToString($Duration), "</a>\n"; - print "<script type='text/javascript'></script>\n"; + print "<script type='text/javascript'></script>\n"; print "</td>\n"; } else diff --git a/testbot/web/index.pl b/testbot/web/index.pl index e06f515..b20c7bf 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -161,8 +161,9 @@ sub GenerateDataCell($$$$) print "<td><a id='$TagId' class='title' title='", strftime("%Y/%m/%d %H:%M:%S", localtime($Item->Ended)), "'>", DurationToString($Duration), "</a>\n"; - print "<script type='text/javascript'></script>\n"; + print "<script type='text/javascript'></script>\n"; print "</td>\n"; } else

1 0

Francois Gouget : testbot: Sort VMs by name if they have the same role and sort order.
by Alexandre Julliard 10 Dec '18

10 Dec '18

Module: tools Branch: master Commit: 1432ff9bcf7fa16032ad0b936064870cb8e6409a URL: https://source.winehq.org/git/tools.git/?a=commit;h=1432ff9bcf7fa16032ad0b9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 10 16:48:16 2018 +0100 testbot: Sort VMs by name if they have the same role and sort order. This makes it possible to add all locale VMs with the same SortOrder value and still have them displayed in a meaningful order. This also allows them to retain a meaningful order even as locales are added or removed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/VMs.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 6a08bc1..6770547 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -748,12 +748,14 @@ sub SortKeysBySortOrder($$) foreach my $Key (@$Keys) { my $Item = $self->GetItem($Key); - $SortOrder{$Key} = [$RoleOrders{$Item->Role} || 0, $Item->SortOrder]; + $SortOrder{$Key} = [$RoleOrders{$Item->Role} || 0, $Item->SortOrder, $Item->Name]; } my @SortedKeys = sort { my ($soa, $sob) = ($SortOrder{$a}, $SortOrder{$b}); - return @$soa[0] <=> @$sob[0] || @$soa[1] <=> @$sob[1]; + return @$soa[0] <=> @$sob[0] || + @$soa[1] <=> @$sob[1] || + @$soa[2] cmp @$sob[2]; } @$Keys; return \@SortedKeys; }

1 0

Francois Gouget : testbot: The Job priority is really a niceness field.
by Alexandre Julliard 10 Dec '18

10 Dec '18

Module: tools Branch: master Commit: 015ecebb427851e1d55e3cff1dcdeb4e86a72dae URL: https://source.winehq.org/git/tools.git/?a=commit;h=015ecebb427851e1d55e3cf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 10 16:48:20 2018 +0100 testbot: The Job priority is really a niceness field. Change the display name so it is shown as a niceness to make it clearer that higher values indicate a lower priority. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/index.pl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index b20c7bf..39fea3e 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -73,7 +73,11 @@ sub GenerateHeaderCell($$$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - if ($PropertyName eq "Ended") + if ($PropertyName eq "Priority") + { + print "<th><a class='title' title='Higher values indicate a lower priority'>Nice</a></th>\n"; + } + elsif ($PropertyName eq "Ended") { print "<th><a class='title' title='Ended'>Time</a></th>\n"; }

1 0

Francois Gouget : testbot/web: Show the mission in the arguments column for Wine VMs.
by Alexandre Julliard 10 Dec '18

10 Dec '18

Module: tools Branch: master Commit: a4ac0056c300d74993071af9f7af1e3958f4bb3c URL: https://source.winehq.org/git/tools.git/?a=commit;h=a4ac0056c300d74993071af… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 10 16:48:25 2018 +0100 testbot/web: Show the mission in the arguments column for Wine VMs. When handling a patch Wine VMs don't take arguments except for the mission which specifies what they should do. Also a Wine VM may run multiple tasks only differing in their mission. So this helps identify what each task does. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 25 ++++++++++++++++++++++++- testbot/web/WineTestBot.css | 12 ++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 84b9e37..3e4f94d 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -32,6 +32,7 @@ use URI::Escape; use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::LogUtils; +use WineTestBot::Missions; use WineTestBot::StepsTasks; use WineTestBot::Utils; use WineTestBot::Engine::Notify; @@ -92,7 +93,11 @@ sub GenerateHeaderCell($$$) my ($self, $CollectionBlock, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - if ($PropertyName eq "Ended") + if ($PropertyName eq "CmdLineArg") + { + print "<th>Arguments / <span class='MissionHeader'>Missions</span></th>\n"; + } + elsif ($PropertyName eq "Ended") { print "<th><a class='title' title='Execution ended'>Time</a></th>\n"; } @@ -589,6 +594,24 @@ sub GenerateDataCell($$$$$) $self->SUPER::GenerateDataCell($CollectionBlock, $StepTask, $PropertyDescriptor, $DetailsPage); } } + elsif ($PropertyName eq "CmdLineArg") + { + my $Args = $self->escapeHTML($StepTask->CmdLineArg); + if ($Args eq "" or $StepTask->VM->Type eq "wine") + { + $Args .= "<br>" if ($Args ne ""); + my ($ErrMessage, $Missions) = ParseMissionStatement($StepTask->Missions); + if (defined $ErrMessage) + { + $Args .= "<span class='Mission'>$ErrMessage</span>"; + } + else + { + $Args .= "<span class='Mission'>". $self->escapeHTML(GetTaskMissionDescription($Missions->[0], $StepTask->VM->Type)) ."</span>"; + } + } + print "<td>$Args</td>\n"; + } elsif ($PropertyName eq "Ended") { if (defined $StepTask->Ended) diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index df683f8..1456036 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -290,6 +290,18 @@ h2 font-style: italic; } +.MissionHeader +{ + font-size: small; + font-style: italic; +} + +.Mission +{ + font-size: small; + font-style: italic; + color: navy; +} .Screenshot {

1 0

Alexandre Julliard : Wine release 4.0-rc1
by Alexandre Julliard 07 Dec '18

07 Dec '18

Module: website Branch: master Commit: 49cd06b06ffcad00eb6254f99c96f216aa735389 URL: https://source.winehq.org/git/website.git/?a=commit;h=49cd06b06ffcad00eb625… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 7 19:13:29 2018 +0100 Wine release 4.0-rc1 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018120701.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/news/en/2018120701.xml b/news/en/2018120701.xml new file mode 100644 index 0000000..3d89d3a --- /dev/null +++ b/news/en/2018120701.xml @@ -0,0 +1,20 @@ +<news> +<date>December 7, 2018</date> +<title>Wine 4.0-rc1 Released</title> +<body> +<p> The Wine development release 4.0-rc1 is now available.</p> +<p> This is the first release candidate for the upcoming Wine 4.0. It marks the beginning of the code freeze period. There have been many last minute changes, so please give this release a good testing to help us make 4.0 as good as possible.</p> +<p> <a href="{$root}/announce/4.0-rc1">What's new</a> in this release: +<ul> + <li>Preloader implemented on mac OS.</li> + <li>Mouse cursor support on Android.</li> + <li>Updates to the timezone database.</li> + <li>Vulkan support updated to the latest spec.</li> + <li>Stream I/O support in WebServices.</li> + <li>Better palette support in WindowsCodecs.</li> + <li>Synchronization objects support for kernel drivers.</li> + <li>Various bug fixes.</li> +</ul> +<p>The source is <a href="//dl.winehq.org/wine/source/4.0/wine-4.0-rc1.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>. +</p></body></news>

1 0

Dmitry Timoshkov : windowscodecs: Add registration for GUID_WICPixelFormat32bppGrayFloat pixel format.
by Alexandre Julliard 07 Dec '18

07 Dec '18

Module: wine Branch: master Commit: a4a5c38089afad9b3f53c7cd06d034c87e53a16c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4a5c38089afad9b3f53c7cd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 7 13:02:58 2018 +0300 windowscodecs: Add registration for GUID_WICPixelFormat32bppGrayFloat pixel format. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/regsvr.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 7b0fbf8..9a580c6 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1736,6 +1736,8 @@ static BYTE const channel_mask_16bit2[] = { 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, static BYTE const channel_mask_16bit3[] = { 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00 }; static BYTE const channel_mask_16bit4[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff }; +static BYTE const channel_mask_32bit[] = { 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }; + static BYTE const channel_mask_5bit[] = { 0x1f, 0x00 }; static BYTE const channel_mask_5bit2[] = { 0xe0, 0x03 }; static BYTE const channel_mask_5bit3[] = { 0x00, 0x7c }; @@ -1752,6 +1754,8 @@ static BYTE const * const channel_masks_8bit[] = { channel_mask_8bit, static BYTE const * const channel_masks_16bit[] = { channel_mask_16bit, channel_mask_16bit2, channel_mask_16bit3, channel_mask_16bit4}; +static BYTE const * const channel_masks_32bit[] = { channel_mask_32bit }; + static BYTE const * const channel_masks_BGRA5551[] = { channel_mask_5bit, channel_mask_5bit2, channel_mask_5bit3, channel_mask_5bit4 }; @@ -1946,6 +1950,17 @@ static struct regsvr_pixelformat const pixelformat_list[] = { WICPixelFormatNumericRepresentationUnsignedInteger, 1 }, + { &GUID_WICPixelFormat32bppGrayFloat, + "The Wine Project", + "32bpp GrayFloat", + NULL, /* no version */ + &GUID_VendorMicrosoft, + 32, /* bitsperpixel */ + 1, /* channel count */ + channel_masks_32bit, + WICPixelFormatNumericRepresentationFloat, + 1 + }, { &GUID_WICPixelFormat48bppRGB, "The Wine Project", "48bpp RGB",

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICBitmapDecoder:: GetMetadataQueryReader in the TIFF decoder.
by Alexandre Julliard 07 Dec '18

07 Dec '18

Module: wine Branch: master Commit: 849807c973b4b381b9fdbd5844180e1ad6aa7186 URL: https://source.winehq.org/git/wine.git/?a=commit;h=849807c973b4b381b9fdbd58… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 7 13:06:07 2018 +0300 windowscodecs: Implement IWICBitmapDecoder::GetMetadataQueryReader in the TIFF decoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tiffformat.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 95a39cd..93af559 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -694,8 +694,12 @@ static HRESULT WINAPI TiffDecoder_CopyPalette(IWICBitmapDecoder *iface, static HRESULT WINAPI TiffDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, IWICMetadataQueryReader **ppIMetadataQueryReader) { - FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIMetadataQueryReader); + + if (!ppIMetadataQueryReader) return E_INVALIDARG; + + *ppIMetadataQueryReader = NULL; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI TiffDecoder_GetPreview(IWICBitmapDecoder *iface,

1 0