June 2022 - Wine-Devel - list.winehq.org

[tools] testbot: Access the master columns directly instead of going through GetMasterKey().

by Francois Gouget

We now have read-only access to them. This makes the code more readable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Steps.pm | 5 ++--- testbot/lib/WineTestBot/StepsTasks.pm | 6 ++---- testbot/lib/WineTestBot/Tasks.pm | 6 ++---- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index cd585e9db..48d020949 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -153,9 +153,8 @@ sub GetFullFileName($;$) $FileName = $self->FileName if (!defined $FileName); return undef if (!defined $FileName); - my ($JobId, $StepNo) = @{$self->GetMasterKey()}; - my $Path = "$DataDir/jobs/$JobId/"; - foreach my $StepNo ($StepNo, $self->PreviousNo) + my $Path = "$DataDir/jobs/". $self->JobId ."/"; + foreach my $StepNo ($self->No, $self->PreviousNo) { next if (!$StepNo); my $Full = "$Path$StepNo/$FileName"; diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 0b1655a37..5970c872e 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -37,8 +37,7 @@ use WineTestBot::Missions; sub GetStepDir($) { my ($self) = @_; - my ($JobId, $_StepTaskId) = @{$self->GetMasterKey()}; - return "$DataDir/jobs/$JobId/". $self->StepNo; + return "$DataDir/jobs/". $self->JobId ."/". $self->StepNo; } # Keep in sync with WineTestBot::Step::GetFullFileName() @@ -49,8 +48,7 @@ sub GetFullFileName($;$) $FileName = $self->FileName if (!defined $FileName); return undef if (!defined $FileName); - my ($JobId, $_StepTaskId) = @{$self->GetMasterKey()}; - my $Path = "$DataDir/jobs/$JobId/"; + my $Path = "$DataDir/jobs/". $self->JobId ."/"; foreach my $StepNo ($self->StepNo, $self->PreviousNo) { next if (!$StepNo); diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 8c9f89ce8..a7d9e820e 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -139,8 +139,7 @@ sub GetReportNames($) sub GetRefReportName($$) { my ($self, $ReportName) = @_; - my ($JobId, $_StepNo, $_TaskNo) = @{$self->GetMasterKey()}; - return sprintf("%s-job%06d-%s", $self->VM->Name, $JobId, $ReportName); + return sprintf("%s-job%06d-%s", $self->VM->Name, $self->JobId, $ReportName); } sub GetRefReportPaths($$;$$) @@ -237,13 +236,12 @@ sub Run($$) { my ($self, $Step) = @_; - my ($JobId, $StepNo, $TaskNo) = @{$self->GetMasterKey()}; my $Script = $Step->Type eq "reconfig" ? "Reconfig" : $self->VM->Type eq "wine" ? "WineTest" : $Step->Type eq "build" ? "Build" : "Task"; my $Args = ["$BinDir/${ProjectName}Run$Script.pl", "--log-only", - $JobId, $StepNo, $TaskNo]; + $self->JobId, $self->StepNo, $self->No]; my $ErrMessage = $self->VM->Run("running", $Args, $self->Timeout + $TimeoutMargin, -- 2.30.2

June 6, 2022

[tools] testbot: Slightly simplify $Job->Restart().

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Jobs.pm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 778a0f4df..1eb7bb7eb 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -417,11 +417,9 @@ sub Restart($) return "This job is already " . $self->Status; } - my $Steps = $self->Steps; - foreach my $Step (@{$Steps->GetSortedItems()}) + foreach my $Step (@{$self->Steps->GetSortedItems()}) { - my $Tasks = $Step->Tasks; - foreach my $Task (@{$Tasks->GetItems()}) + foreach my $Task (@{$Step->Tasks->GetItems()}) { $Task->Status("queued"); $Task->Started(undef); -- 2.30.2

June 6, 2022

[PATCH] cryptnet: Resolve object id to algorithm id when verifying OCSP response.

by Torge Matthies

From: Torge Matthies <tmatthies(a)codeweavers.com> Instead of only allowing the SHA256RSA algorithm. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53102 Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/cryptnet/cryptnet_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index e8c17407a9b..ac282f5aa82 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1918,6 +1918,7 @@ static DWORD verify_signed_ocsp_response_info(const CERT_INFO *cert, const CERT_ HCRYPTPROV prov = 0; HCRYPTHASH hash = 0; HCRYPTKEY key = 0; + DWORD algid; if (!CryptDecodeObjectEx(X509_ASN_ENCODING, OCSP_BASIC_SIGNED_RESPONSE, blob->pbData, blob->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size)) return GetLastError(); @@ -1925,7 +1926,7 @@ static DWORD verify_signed_ocsp_response_info(const CERT_INFO *cert, const CERT_ if ((error = check_ocsp_response_info(cert, issuer, &info->ToBeSigned, &status))) goto done; alg = &info->SignatureInfo.SignatureAlgorithm; - if (!alg->pszObjId || strcmp(alg->pszObjId, szOID_RSA_SHA256RSA)) + if (!alg->pszObjId || !(algid = CertOIDToAlgId(alg->pszObjId))) { FIXME("unhandled signature algorithm %s\n", debugstr_a(alg->pszObjId)); error = CRYPT_E_NO_REVOCATION_CHECK; @@ -1933,7 +1934,7 @@ static DWORD verify_signed_ocsp_response_info(const CERT_INFO *cert, const CERT_ } if (!CryptAcquireContextW(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) goto done; - if (!CryptCreateHash(prov, CALG_SHA_256, 0, 0, &hash)) goto done; + if (!CryptCreateHash(prov, algid, 0, 0, &hash)) goto done; if (!CryptHashData(hash, info->ToBeSigned.pbData, info->ToBeSigned.cbData, 0)) goto done; sig = &info->SignatureInfo.Signature; -- 2.36.1

June 6, 2022

Re: [PATCH] include: Allow making Wine Server requests from C++ code

by Stefan Dösinger

> Am 03.06.2022 um 19:15 schrieb Mahdi Tayarani <tayarani(a)google.com>: > > Using SERVER_START_REQ/SERVER_END_REQ in C++ code calls helper methods > which need an explicit cast from a void* to __server_request_info*. Why do you need this? include/wine/server.h (and pretty much everything in include/wine/) is a private header that should not be used by external code (e.g. programs linking to winelib)

June 5, 2022

Re: [PATCH 1/1] shell32: Partially implement IShellItemImageFactory (icon only, no thumbnail).

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=116256 Your paranoid android. === w1064v1809 (32 bit report) === shell32: shlfolder.c:4976: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) === w1064 (32 bit report) === shell32: shlfolder.c:4976: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) === w1064_tsign (32 bit report) === shell32: shlfolder.c:4959: Test failed: CREATE: expected notification type 2, got: 40000 shlfolder.c:4966: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4976: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 2) === w10pro64 (32 bit report) === shell32: shlfolder.c:4959: Test failed: MKDIR: expected notification type 8, got: 4000000 shlfolder.c:4966: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4967: Test failed: Expected PIDL to be NULL shlfolder.c:4976: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) shlfolder.c:4976: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) shlfolder.c:4976: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) shlfolder.c:4976: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) === w1064v1809 (64 bit report) === shell32: shlfolder.c:4976: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) === w1064 (64 bit report) === shell32: shlfolder.c:4976: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) === w1064_2qxl (64 bit report) === shell32: shlfolder.c:4959: Test failed: CREATE: expected notification type 2, got: 40000 shlfolder.c:4966: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4976: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 2) === w1064_adm (64 bit report) === shell32: shlfolder.c:4976: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) === w1064_tsign (64 bit report) === shell32: shlfolder.c:4959: Test failed: RMDIR: expected notification type 10, got: 40000 shlfolder.c:4966: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4976: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 10) === w10pro64 (64 bit report) === shell32: shlfolder.c:4976: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) shlfolder.c:4976: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) shlfolder.c:4976: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) === w10pro64_en_AE_u8 (64 bit report) === shell32: shlfolder.c:4976: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) === w10pro64_ar (64 bit report) === shell32: shlfolder.c:4976: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) shlfolder.c:4976: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) === w10pro64_ja (64 bit report) === shell32: shlfolder.c:4976: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 2) shlfolder.c:4959: Test failed: RMDIR: expected notification type 10, got: 40000 shlfolder.c:4966: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4976: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 10) === w10pro64_zh_CN (64 bit report) === shell32: shlfolder.c:4976: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) shlfolder.c:4976: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) shlfolder.c:4976: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) shlfolder.c:4976: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) shlfolder.c:4976: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) shlfolder.c:4959: Test failed: CREATE: expected notification type 2, got: 40000 shlfolder.c:4966: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4976: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3)

June 5, 2022

[PATCH 1/1] shell32: Partially implement IShellItemImageFactory (icon only, no thumbnail).

by Jinoh Kang

From: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52673 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/shell32/Makefile.in | 2 +- dlls/shell32/shellitem.c | 161 ++++++++++++++++++++++++++++++++- dlls/shell32/tests/shlfolder.c | 1 - 3 files changed, 160 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 9e2395126fc..95afa482de5 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -1,7 +1,7 @@ MODULE = shell32.dll IMPORTLIB = shell32 IMPORTS = uuid shlwapi user32 gdi32 advapi32 -DELAYIMPORTS = ole32 oleaut32 shdocvw version comctl32 gdiplus +DELAYIMPORTS = ole32 oleaut32 shdocvw version comctl32 gdiplus windowscodecs C_SRCS = \ appbar.c \ diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index 3e8bd24a429..a1d893487e9 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -31,9 +31,13 @@ #include "pidl.h" #include "shell32_main.h" #include "debughlp.h" +#include "wincodec.h" +#include "commoncontrols.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); +HRESULT WINAPI WICCreateImagingFactory_Proxy(UINT, IWICImagingFactory**); + typedef struct _ShellItem { IShellItem2 IShellItem2_iface; LONG ref; @@ -565,17 +569,170 @@ static ULONG WINAPI ShellItem_IShellItemImageFactory_Release(IShellItemImageFact return IShellItem2_Release(&This->IShellItem2_iface); } +static HICON get_icon_via_cache(LPCWSTR icon_file, INT source_index, DWORD flags, SIZE size) +{ + HRESULT hr; + HICON icon = NULL; + int i, ic_index; + IImageList *icon_list = NULL; + + if (source_index == -1) + source_index = 0; /* special case for some control panel applications */ + + for (i = 0; i <= SHIL_LAST; i++) + { + IImageList *cur_list; + int cx, cy; + + hr = SHGetImageList(i, &IID_IImageList, (void **)&cur_list); + if (SUCCEEDED(hr)) + { + hr = IImageList_GetIconSize(cur_list, &cx, &cy); + if (SUCCEEDED(hr) && cx == size.cx && cy == size.cy) + { + icon_list = cur_list; + break; + } + IImageList_Release(cur_list); + } + } + + if (icon_list) + { + ic_index = SIC_GetIconIndex(icon_file, source_index, flags); + if (ic_index != -1) + { + hr = IImageList_GetIcon(icon_list, ic_index, ILD_NORMAL, &icon); + if (FAILED(hr)) icon = NULL; + } + IImageList_Release(icon_list); + } + return icon; +} + +static HRESULT ShellItem_get_icon(ShellItem *This, SIZE size, HICON *icon) +{ + HRESULT hr; + IExtractIconW *ei; + WCHAR icon_file[MAX_PATH]; + INT source_index; + UINT gil_out_flags; + HICON cached_icon; + + hr = IShellItem2_BindToHandler(&This->IShellItem2_iface, NULL, &BHID_SFUIObject, + &IID_IExtractIconW, (void **)&ei); + if (FAILED(hr)) goto done; + + hr = IExtractIconW_GetIconLocation(ei, 0, icon_file, MAX_PATH, &source_index, &gil_out_flags); + if (FAILED(hr)) goto free_ei; + + if (!(gil_out_flags & (GIL_NOTFILENAME | GIL_DONTCACHE)) && + (cached_icon = get_icon_via_cache(icon_file, source_index, 0, size))) + { + *icon = cached_icon; + hr = S_OK; + } + else + { + INT iconsize = min(size.cx, size.cy); + if (iconsize <= 0 || iconsize > 0x7fff) + iconsize = 0x7fff; + hr = IExtractIconW_Extract(ei, icon_file, source_index, icon, NULL, MAKELONG(0, iconsize)); + } + +free_ei: + IExtractIconW_Release(ei); +done: + return hr; +} + +static HRESULT convert_wicbitmapsource_to_gdi(IWICImagingFactory *imgfactory, + IWICBitmapSource *bitmapsource, HBITMAP *gdibitmap) +{ + BITMAPINFOHEADER bmi; + HRESULT hr; + UINT width, height; + IWICBitmapSource *newsrc; + HBITMAP bm; + void *bits; + + *gdibitmap = NULL; + + hr = WICConvertBitmapSource(&GUID_WICPixelFormat32bppBGRA, bitmapsource, &newsrc); + if (FAILED(hr)) goto done; + + hr = IWICBitmapSource_GetSize(newsrc, &width, &height); + if (FAILED(hr)) goto free_newsrc; + + memset(&bmi, 0, sizeof(bmi)); + bmi.biSize = sizeof(bmi); + bmi.biWidth = width; + bmi.biHeight = -height; + bmi.biPlanes = 1; + bmi.biBitCount = 32; + bmi.biCompression = BI_RGB; + + bm = CreateDIBSection(NULL, (const BITMAPINFO *)&bmi, DIB_RGB_COLORS, &bits, NULL, 0); + if (!bm) + { + WARN("Cannot create bitmap.\n"); + hr = E_FAIL; + goto free_newsrc; + } + + hr = IWICBitmapSource_CopyPixels(newsrc, NULL, width * 4, width * height * 4, bits); + if (FAILED(hr)) + { + DeleteObject(bm); + goto free_newsrc; + } + + hr = S_OK; + *gdibitmap = bm; + +free_newsrc: + IWICBitmapSource_Release(newsrc); +done: + return hr; +} + static HRESULT WINAPI ShellItem_IShellItemImageFactory_GetImage(IShellItemImageFactory *iface, SIZE size, SIIGBF flags, HBITMAP *phbm) { ShellItem *This = impl_from_IShellItemImageFactory(iface); + HRESULT hr; + IWICImagingFactory *imgfactory; + IWICBitmap *bitmap = NULL; static int once; if (!once++) - FIXME("%p ({%lu, %lu} %d %p): stub\n", This, size.cx, size.cy, flags, phbm); + FIXME("%p ({%lu, %lu} %d %p): partial stub\n", This, size.cx, size.cy, flags, phbm); *phbm = NULL; - return E_NOTIMPL; + + if (flags != SIIGBF_BIGGERSIZEOK) return E_NOTIMPL; + + hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &imgfactory); + if (SUCCEEDED(hr)) + { + HICON hicon; + + hr = ShellItem_get_icon(This, size, &hicon); + if (SUCCEEDED(hr)) + { + hr = IWICImagingFactory_CreateBitmapFromHICON(imgfactory, hicon, &bitmap); + DeleteObject(hicon); + + if (SUCCEEDED(hr)) + { + hr = convert_wicbitmapsource_to_gdi(imgfactory, (IWICBitmapSource *)bitmap, phbm); + IWICBitmap_Release(bitmap); + } + } + IWICImagingFactory_Release(imgfactory); + } + + return hr; } static const IShellItemImageFactoryVtbl ShellItem_IShellItemImageFactory_Vtbl = { diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index da606a9e707..49614aed3c4 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4456,7 +4456,6 @@ static void test_IShellItemImageFactory(void) ret = IShellItemImageFactory_GetImage(siif, size, SIIGBF_BIGGERSIZEOK, &hbm); IShellItemImageFactory_Release(siif); - todo_wine ok(ret == S_OK, "GetImage returned %lx\n", ret); ok(FAILED(ret) == !hbm, "result = %lx but bitmap = %p\n", ret, hbm); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/190

June 5, 2022

[PATCH 0/1] MR190: shell32: Partially implement IShellItemImageFactory (icon only, no thumbnail).

by Jinoh Kang (＠iamahuman)

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52673 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/190

June 5, 2022

Re: [PATCH 0/1] MR189: windows.gaming.input: Fix a leak on error path (Coverity). - approved

by Rémi Bernon

This merge request was approved by Rémi Bernon. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/189

June 5, 2022

[PATCH 1/1] windows.gaming.input: Fix a leak on error path (Coverity).

by Nikolay Sivov

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/windows.gaming.input/async.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/windows.gaming.input/async.c b/dlls/windows.gaming.input/async.c index 2cb6e51c9c5..8483f301b83 100644 --- a/dlls/windows.gaming.input/async.c +++ b/dlls/windows.gaming.input/async.c @@ -335,6 +335,7 @@ static HRESULT async_info_create( IUnknown *invoker, IUnknown *param, async_oper IInspectable *outer, IWineAsyncInfoImpl **out ) { struct async_info *impl; + HRESULT hr; if (!(impl = calloc( 1, sizeof(struct async_info) ))) return E_OUTOFMEMORY; impl->IWineAsyncInfoImpl_iface.lpVtbl = &async_impl_vtbl; @@ -346,7 +347,11 @@ static HRESULT async_info_create( IUnknown *invoker, IUnknown *param, async_oper impl->handler = HANDLER_NOT_SET; impl->status = Started; if (!(impl->async_run_work = CreateThreadpoolWork( async_info_callback, &impl->IWineAsyncInfoImpl_iface, NULL ))) - return HRESULT_FROM_WIN32( GetLastError() ); + { + hr = HRESULT_FROM_WIN32( GetLastError() ); + free( impl ); + return hr; + } if ((impl->invoker = invoker)) IUnknown_AddRef( impl->invoker ); if ((impl->param = param)) IUnknown_AddRef( impl->param ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/189

June 5, 2022

[PATCH 0/1] MR189: windows.gaming.input: Fix a leak on error path (Coverity).

by Nikolay Sivov (＠nsivov)

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/189

June 5, 2022