December 2018 - Wine-Commits

Waritnan Sookbuntherng : comctl32/status: Checking size grip bounds in x-axis only.
by Alexandre Julliard Dec. 10, 2018

Dec. 10, 2018

Module: wine Branch: master Commit: 0f12fa1e432360431392ece417ae9ad02cb00647 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f12fa1e432360431392ece4… Author: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> Date: Mon Dec 10 09:52:10 2018 +0000 comctl32/status: Checking size grip bounds in x-axis only. Signed-off-by: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/status.c | 5 +---- dlls/comctl32/tests/status.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 3bf72fa..6ea7d9e 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -1009,10 +1009,7 @@ STATUSBAR_WMNCHitTest (const STATUS_INFO *infoPtr, INT x, INT y) pt.y = y; ScreenToClient (infoPtr->Self, &pt); - rect.left = rect.right - 13; - rect.top += 2; - - if (PtInRect (&rect, pt)) + if (pt.x >= rect.right - GetSystemMetrics(SM_CXVSCROLL)) { if (GetWindowLongW( infoPtr->Self, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) return HTBOTTOMLEFT; else return HTBOTTOMRIGHT; diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index b7b5fb2..c7d9989 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -615,17 +615,17 @@ static void test_sizegrip(void) /* check bounds when not maximized */ r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top)); - todo_wine expect(HTBOTTOMRIGHT, r); + expect(HTBOTTOMRIGHT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left - 1, rc.top)); expect(HTCLIENT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top - 1)); - todo_wine expect(HTBOTTOMRIGHT, r); + expect(HTBOTTOMRIGHT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom)); - todo_wine expect(HTBOTTOMRIGHT, r); + expect(HTBOTTOMRIGHT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right + 1, rc.bottom)); - todo_wine expect(HTBOTTOMRIGHT, r); + expect(HTBOTTOMRIGHT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); - todo_wine expect(HTBOTTOMRIGHT, r); + expect(HTBOTTOMRIGHT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right - 1, rc.bottom - 1)); expect(HTBOTTOMRIGHT, r); @@ -638,17 +638,17 @@ static void test_sizegrip(void) rc.right = pt.x; r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top)); - todo_wine expect(HTBOTTOMLEFT, r); + expect(HTBOTTOMLEFT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left + 1, rc.top)); expect(HTCLIENT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top - 1)); - todo_wine expect(HTBOTTOMLEFT, r); + expect(HTBOTTOMLEFT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom)); - todo_wine expect(HTBOTTOMLEFT, r); + expect(HTBOTTOMLEFT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right - 1, rc.bottom)); - todo_wine expect(HTBOTTOMLEFT, r); + expect(HTBOTTOMLEFT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); - todo_wine expect(HTBOTTOMLEFT, r); + expect(HTBOTTOMLEFT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right + 1, rc.bottom - 1)); expect(HTBOTTOMLEFT, r);

1 0

Francois Gouget : user32/tests: Make test_LoadImage_working_directory_run( ) static.
by Alexandre Julliard Dec. 10, 2018

Dec. 10, 2018

Module: wine Branch: master Commit: 1d52a6e1b6bdd7988754a27d2e25a6362db93e18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d52a6e1b6bdd7988754a27d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 9 01:41:57 2018 +0100 user32/tests: Make test_LoadImage_working_directory_run() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/cursoricon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 405856c..323db82 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1203,7 +1203,7 @@ static void create_ico_file(const char *filename, const test_icon_entries_t *tes HeapFree(GetProcessHeap(), 0, buf); } -void test_LoadImage_working_directory_run(char *path) +static void test_LoadImage_working_directory_run(char *path) { DWORD bytes_written; HANDLE handle;

1 0

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

Dec. 10, 2018

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: The Job priority is really a niceness field.
by Alexandre Julliard Dec. 10, 2018

Dec. 10, 2018

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 Dec. 10, 2018

Dec. 10, 2018

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

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

Dec. 10, 2018

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/WineRunReconfig: Don' t fail if the idle snapshot does not exist.
by Alexandre Julliard Dec. 10, 2018

Dec. 10, 2018

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

Alexandre Julliard : Wine release 4.0-rc1
by Alexandre Julliard Dec. 7, 2018

Dec. 7, 2018

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

Jacek Caban : secur32: Check for supported protocols when loading gnutls.
by Alexandre Julliard Dec. 7, 2018

Dec. 7, 2018

Module: wine Branch: master Commit: 9dd0f8f4b7ee49c5ed6793efea7f60d920e112e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9dd0f8f4b7ee49c5ed6793ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 7 15:29:51 2018 +0100 secur32: Check for supported protocols when loading gnutls. We mostly need to know if TLS1.3 is supported before attempting to handle it. It's just in gnutls backend now, so it will not be actually enabled yet. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 0a49421..a962c67 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -23,6 +23,7 @@ #include "wine/port.h" #include <stdarg.h> +#include <stdio.h> #ifdef SONAME_LIBGNUTLS #include <gnutls/gnutls.h> #include <gnutls/crypto.h> @@ -150,6 +151,7 @@ static const struct { DWORD enable_flag; const char *gnutls_flag; } protocol_priority_flags[] = { + {SP_PROT_TLS1_3_CLIENT, "VERS-TLS1.3"}, {SP_PROT_TLS1_2_CLIENT, "VERS-TLS1.2"}, {SP_PROT_TLS1_1_CLIENT, "VERS-TLS1.1"}, {SP_PROT_TLS1_0_CLIENT, "VERS-TLS1.0"}, @@ -157,10 +159,41 @@ static const struct { /* {SP_PROT_SSL2_CLIENT} is not supported by GnuTLS */ }; +static DWORD supported_protocols; + +static void check_supported_protocols(void) +{ + gnutls_session_t session; + char priority[64]; + unsigned i; + int err; + + err = pgnutls_init(&session, GNUTLS_CLIENT); + if (err != GNUTLS_E_SUCCESS) + { + pgnutls_perror(err); + return; + } + + for(i = 0; i < ARRAY_SIZE(protocol_priority_flags); i++) + { + sprintf(priority, "NORMAL:-%s", protocol_priority_flags[i].gnutls_flag); + err = pgnutls_priority_set_direct(session, priority, NULL); + if (err == GNUTLS_E_SUCCESS) + { + TRACE("%s is supported\n", protocol_priority_flags[i].gnutls_flag); + supported_protocols |= protocol_priority_flags[i].enable_flag; + } + else + TRACE("%s is not supported\n", protocol_priority_flags[i].gnutls_flag); + } + + pgnutls_deinit(session); +} + DWORD schan_imp_enabled_protocols(void) { - /* NOTE: No support for SSL 2.0 */ - return SP_PROT_SSL3_CLIENT | SP_PROT_TLS1_0_CLIENT | SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_2_CLIENT; + return supported_protocols; } BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred) @@ -593,6 +626,7 @@ BOOL schan_imp_init(void) pgnutls_global_set_log_function(schan_gnutls_log); } + check_supported_protocols(); return TRUE; fail:

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICBitmapDecoder:: GetMetadataQueryReader in the PNG decoder.
by Alexandre Julliard Dec. 7, 2018

Dec. 7, 2018

Module: wine Branch: master Commit: b4c3a9c089fa55e50fde7ba6700075c8eb1f9479 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4c3a9c089fa55e50fde7ba6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 7 13:06:14 2018 +0300 windowscodecs: Implement IWICBitmapDecoder::GetMetadataQueryReader in the PNG decoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 786d836..7050c95 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -842,10 +842,14 @@ static HRESULT WINAPI PngDecoder_CopyPalette(IWICBitmapDecoder *iface, } static HRESULT WINAPI PngDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, - IWICMetadataQueryReader **ppIMetadataQueryReader) + IWICMetadataQueryReader **reader) { - FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, reader); + + if (!reader) return E_INVALIDARG; + + *reader = NULL; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI PngDecoder_GetPreview(IWICBitmapDecoder *iface,

1 0