April 2021 - Wine-commits - list.winehq.org

Francois Gouget : testbot/Janitor: Round the file age down when purging.
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: tools Branch: master Commit: b63d7a92059708d207848674ffb6d72367cd4a36 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b63d7a92059708d20784867… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 13 12:24:06 2021 +0200 testbot/Janitor: Round the file age down when purging. There is not much point in rounding to nearest and rounding down is simpler. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 35a7e5d..c68920e 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -269,7 +269,7 @@ if (opendir(my $dh, "$DataDir/staging")) $Entry =~ m%^([^/]+)$%; # untaint my $FileName = "$DataDir/staging/$1"; - my $Age = int((-M $FileName) + 0.5); + my $Age = int(-M $FileName); my $TTL = $JobPurgeDays ? $JobPurgeDays - $Age : undef; # FIXME: There are still some obsolete unexpired 31 characters session ids. @@ -326,7 +326,7 @@ if (opendir(my $dh, "$DataDir/latest")) $Entry =~ m%^([^/]+)$%; # untaint my $FileName = "$DataDir/latest/$1"; - my $Age = int((-M $FileName) + 0.5); + my $Age = int(-M $FileName); my $TTL = $JobPurgeDays ? $JobPurgeDays - $Age : undef; # Keep the regexp in sync with WineTestBot::Task::GetRefReportName()

1 0

Francois Gouget : winetest: Split the Windows 10 page by version.
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: tools Branch: master Commit: 7210ca49d33db5e6e1816942045af6f161bf0fca URL: https://source.winehq.org/git/tools.git/?a=commit;h=7210ca49d33db5e6e181694… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 13 14:04:06 2021 +0200 winetest: Split the Windows 10 page by version. There are many Windows 10 versions and mixing them all together makes for a very large page, with more and more differences between the oldest and newest versions. So create multiple Windows 10 pages. Add a new group every couple of years; put the results for the latest Windows 10 in the Win10 group; and the locale tests in the Win10L one. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 11 +++++++++-- winetest/gather | 18 ++++++++++++------ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index f8a0a88..a469dfb 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -94,7 +94,11 @@ my %vista = (name => "Vista"); my %w2k8 = (name => "2008"); my %win7 = (name => "Win7"); my %win8 = (name => "Win8"); +my %win1507 = (name => "Win1507+"); +my %win1709 = (name => "Win1709+"); +my %win1909 = (name => "Win1909+"); my %win10 = (name => "Win10"); +my %win10l = (name => "Win10L"); my %unknown = (name => "Other"); my %linux = (name => "Linux"); my %mac = (name => "Mac"); @@ -103,7 +107,10 @@ my %solaris = (name => "Solaris"); my %wine = (name => "Wine"); # Define the order of version groups in the summary -my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%win7, \%win8, \%win10, +my @groups = (\%w95, \%w98, \%me, + \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, + \%vista, \%w2k8, \%win7, \%win8, + \%win1507, \%win1709, \%win1909, \%win10, \%win10l, \%unknown, \%linux, \%mac, \%bsd, \%solaris, \%wine); @@ -386,7 +393,7 @@ foreach my $build (@builds) { while (<TOTAL>) { - if (/^([A-Za-z0-9]+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)(?:\s+(\d+))?/) + if (/^([A-Za-z0-9+]+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)(?:\s+(\d+))?/) { my ($name, $runs, $tests, $errors, $todos, $successes) = ($1, $2, $3, $4, $5, $6); $versions{$name}++; diff --git a/winetest/gather b/winetest/gather index f7dcc16..a3a0a65 100755 --- a/winetest/gather +++ b/winetest/gather @@ -139,7 +139,11 @@ my %vista = (name => "Vista"); my %w2k8 = (name => "2008"); my %win7 = (name => "Win7"); my %win8 = (name => "Win8"); +my %win1507 = (name => "Win1507+"); +my %win1709 = (name => "Win1709+"); +my %win1909 = (name => "Win1909+"); my %win10 = (name => "Win10"); +my %win10l = (name => "Win10L"); my %unknown = (name => "Other"); my %linux = (name => "Linux"); my %mac = (name => "Mac"); @@ -150,7 +154,8 @@ my %wine = (name => "Wine"); # Define the order of version groups in the summary my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, - \%vista, \%w2k8, \%win7, \%win8, \%win10, + \%vista, \%w2k8, \%win7, \%win8, + \%win1507, \%win1709, \%win1909, \%win10, \%win10l, \%unknown, \%linux, \%mac, \%bsd, \%solaris, \%wine); # Map dissect's IDs to the above hashes @@ -160,11 +165,12 @@ my %idmap = (95 => \%w95, 98 => \%w98, me => \%me, vista => \%vista, 2008 => \%w2k8, win7 => \%win7, win8 => \%win8, win81 => \%win8, - win1507 => \%win10, win1511 => \%win10, - win1607 => \%win10, win1703 => \%win10, - win1709 => \%win10, win1803 => \%win10, - win1809 => \%win10, win1903 => \%win10, - win1909 => \%win10, win2004 => \%win10, + win1507 => \%win1507, win1511 => \%win1507, + win1607 => \%win1507, win1703 => \%win1507, + win1709 => \%win1709, win1803 => \%win1709, + win1809 => \%win1709, win1903 => \%win1709, + win1909 => \%win1909, + win2004 => \%win10l, win2009 => \%win10, win10 => \%win10, # for backward compatibility unknown => \%unknown,

1 0

Nikolay Sivov : mf/session: Handle shutdown state on GetService().
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: a2728cdeced4d1ae28f56eb73b822b8e9779a7fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2728cdeced4d1ae28f56eb7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 12 12:19:53 2021 +0300 mf/session: Handle shutdown state on GetService(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 110 ++++++++++++++++++++++++++++++----------------------- dlls/mf/tests/mf.c | 11 ++++++ 2 files changed, 73 insertions(+), 48 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 20ccdd0535e..7a8c7e9f598 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2020,15 +2020,66 @@ static ULONG WINAPI session_get_service_Release(IMFGetService *iface) return IMFMediaSession_Release(&session->IMFMediaSession_iface); } +static HRESULT session_get_video_render_service(struct media_session *session, REFGUID service, + REFIID riid, void **obj) +{ + IMFStreamSink *stream_sink; + IMFTopologyNode *node; + IMFCollection *nodes; + IMFMediaSink *sink; + unsigned int i = 0; + IUnknown *vr; + HRESULT hr = E_FAIL; + + /* Use first sink to support IMFVideoRenderer. */ + if (session->presentation.current_topology) + { + if (SUCCEEDED(IMFTopology_GetOutputNodeCollection(session->presentation.current_topology, + &nodes))) + { + while (IMFCollection_GetElement(nodes, i++, (IUnknown **)&node) == S_OK) + { + if (SUCCEEDED(topology_node_get_object(node, &IID_IMFStreamSink, (void **)&stream_sink))) + { + if (SUCCEEDED(IMFStreamSink_GetMediaSink(stream_sink, &sink))) + { + if (SUCCEEDED(IMFMediaSink_QueryInterface(sink, &IID_IMFVideoRenderer, (void **)&vr))) + { + if (FAILED(hr = MFGetService(vr, service, riid, obj))) + WARN("Failed to get service from video renderer %#x.\n", hr); + IUnknown_Release(vr); + } + } + IMFStreamSink_Release(stream_sink); + } + + IMFTopologyNode_Release(node); + + if (*obj) + break; + } + + IMFCollection_Release(nodes); + } + } + + return hr; +} + static HRESULT WINAPI session_get_service_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) { struct media_session *session = impl_from_IMFGetService(iface); + HRESULT hr = S_OK; TRACE("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); *obj = NULL; - if (IsEqualGUID(service, &MF_RATE_CONTROL_SERVICE)) + EnterCriticalSection(&session->cs); + if (FAILED(hr = session_is_shut_down(session))) + { + } + else if (IsEqualGUID(service, &MF_RATE_CONTROL_SERVICE)) { if (IsEqualIID(riid, &IID_IMFRateSupport)) { @@ -2038,68 +2089,31 @@ static HRESULT WINAPI session_get_service_GetService(IMFGetService *iface, REFGU { *obj = &session->IMFRateControl_iface; } + else + hr = E_NOINTERFACE; + + if (*obj) + IUnknown_AddRef((IUnknown *)*obj); } else if (IsEqualGUID(service, &MF_LOCAL_MFT_REGISTRATION_SERVICE)) { - return IMFLocalMFTRegistration_QueryInterface(&local_mft_registration, riid, obj); + hr = IMFLocalMFTRegistration_QueryInterface(&local_mft_registration, riid, obj); } else if (IsEqualGUID(service, &MF_TOPONODE_ATTRIBUTE_EDITOR_SERVICE)) { *obj = &session->IMFTopologyNodeAttributeEditor_iface; + IUnknown_AddRef((IUnknown *)*obj); } else if (IsEqualGUID(service, &MR_VIDEO_RENDER_SERVICE)) { - IMFStreamSink *stream_sink; - IMFTopologyNode *node; - IMFCollection *nodes; - IMFMediaSink *sink; - unsigned int i = 0; - IUnknown *vr; - HRESULT hr; - - EnterCriticalSection(&session->cs); - - /* Use first sink to support IMFVideoRenderer. */ - if (session->presentation.current_topology) - { - if (SUCCEEDED(IMFTopology_GetOutputNodeCollection(session->presentation.current_topology, - &nodes))) - { - while (IMFCollection_GetElement(nodes, i++, (IUnknown **)&node) == S_OK) - { - if (SUCCEEDED(topology_node_get_object(node, &IID_IMFStreamSink, (void **)&stream_sink))) - { - if (SUCCEEDED(IMFStreamSink_GetMediaSink(stream_sink, &sink))) - { - if (SUCCEEDED(IMFMediaSink_QueryInterface(sink, &IID_IMFVideoRenderer, (void **)&vr))) - { - if (FAILED(hr = MFGetService(vr, service, riid, obj))) - WARN("Failed to get service from video renderer %#x.\n", hr); - IUnknown_Release(vr); - } - } - IMFStreamSink_Release(stream_sink); - } - - IMFTopologyNode_Release(node); - - if (*obj) - break; - } - - IMFCollection_Release(nodes); - } - } - - LeaveCriticalSection(&session->cs); + hr = session_get_video_render_service(session, service, riid, obj); } else FIXME("Unsupported service %s.\n", debugstr_guid(service)); - if (*obj) - IUnknown_AddRef((IUnknown *)*obj); + LeaveCriticalSection(&session->cs); - return *obj ? S_OK : E_NOINTERFACE; + return hr; } static const IMFGetServiceVtbl session_get_service_vtbl = diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 20440499227..308c1fae529 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1170,6 +1170,7 @@ static void test_media_session(void) IMFShutdown *shutdown; PROPVARIANT propvar; DWORD status, caps; + IMFGetService *gs; IMFClock *clock; IUnknown *unk; HRESULT hr; @@ -1271,6 +1272,16 @@ todo_wine hr = IMFMediaSession_Shutdown(session); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + check_interface(session, &IID_IMFGetService, TRUE); + + hr = IMFMediaSession_QueryInterface(session, &IID_IMFGetService, (void **)&gs); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFGetService_GetService(gs, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rate_support); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + IMFGetService_Release(gs); + hr = IMFShutdown_GetShutdownStatus(shutdown, &status); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(status == MFSHUTDOWN_COMPLETED, "Unexpected shutdown status %u.\n", status);

1 0

Nikolay Sivov : mf/session: Forward MEReconnect* events to the application.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: 6ff7575ae81caaf87de579da57eefb34acf61eca URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ff7575ae81caaf87de579da… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 12 12:19:54 2021 +0300 mf/session: Forward MEReconnect* events to the application. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 7a8c7e9f598..6e0f65e6998 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -3233,6 +3233,15 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM LeaveCriticalSection(&session->cs); break; + case MEReconnectStart: + case MEReconnectEnd: + + EnterCriticalSection(&session->cs); + if (session_get_media_source(session, (IMFMediaSource *)event_source)) + IMFMediaEventQueue_QueueEvent(session->event_queue, event); + LeaveCriticalSection(&session->cs); + break; + case MENewStream: stream = (IMFMediaStream *)value.punkVal;

1 0

Nikolay Sivov : mf/session: Forward more events to the application.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: 662095c6b3e1f039b70da759ff91279b61fd5254 URL: https://source.winehq.org/git/wine.git/?a=commit;h=662095c6b3e1f039b70da759… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 12 12:19:55 2021 +0300 mf/session: Forward more events to the application. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 6e0f65e6998..925a8c93d20 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -3242,6 +3242,13 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM LeaveCriticalSection(&session->cs); break; + case MEExtendedType: + case MERendererEvent: + case MEStreamSinkFormatChanged: + + IMFMediaEventQueue_QueueEvent(session->event_queue, event); + break; + case MENewStream: stream = (IMFMediaStream *)value.punkVal;

1 0

Dmitry Timoshkov : crypt32: Implement CryptImportPublicKeyInfoEx2.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: c2c7946680b61bfccd4c4f5788864d4130af9baf URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2c7946680b61bfccd4c4f57… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 12 15:20:57 2021 +0300 crypt32: Implement CryptImportPublicKeyInfoEx2. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 2 +- dlls/crypt32/crypt32_private.h | 2 ++ dlls/crypt32/encode.c | 9 ++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index aad8fa047b7..95e2746a7d5 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2689,7 +2689,7 @@ done: return !status; } -static BOOL CNG_ImportPubKey(CERT_PUBLIC_KEY_INFO *pubKeyInfo, BCRYPT_KEY_HANDLE *key) +BOOL CNG_ImportPubKey(CERT_PUBLIC_KEY_INFO *pubKeyInfo, BCRYPT_KEY_HANDLE *key) { if (!strcmp(pubKeyInfo->Algorithm.pszObjId, szOID_ECC_PUBLIC_KEY)) return CNG_ImportECCPubKey(pubKeyInfo, key); diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 30cf4334de4..9f8f43e7632 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -21,6 +21,8 @@ #include "wine/list.h" +BOOL CNG_ImportPubKey(CERT_PUBLIC_KEY_INFO *pubKeyInfo, BCRYPT_KEY_HANDLE *key) DECLSPEC_HIDDEN; + /* a few asn.1 tags we need */ #define ASN_BOOL (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x01) #define ASN_BITSTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x03) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 46f4b8f25e7..02b235696ce 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -5050,8 +5050,11 @@ BOOL WINAPI CryptImportPublicKeyInfoEx2(DWORD dwCertEncodingType, PCERT_PUBLIC_KEY_INFO pInfo, DWORD dwFlags, void *pvAuxInfo, BCRYPT_KEY_HANDLE *phKey) { - FIXME_(crypt)("(%d, %p, %08x, %p, %p): stub\n", dwCertEncodingType, pInfo, + TRACE_(crypt)("(%d, %p, %08x, %p, %p)\n", dwCertEncodingType, pInfo, dwFlags, pvAuxInfo, phKey); - SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; + + if (dwFlags) + FIXME("flags %#x ignored\n", dwFlags); + + return CNG_ImportPubKey(pInfo, phKey); }

1 0

Dmitry Timoshkov : crypt32: Add support for importing RSA public keys with BCrypt.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: 9d1ae850dfd73c60fbe2904c443f79a050a20b96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d1ae850dfd73c60fbe2904c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 12 15:21:04 2021 +0300 crypt32: Add support for importing RSA public keys with BCrypt. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50925 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 83 +++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/encode.c | 13 ++++++- 2 files changed, 95 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 95e2746a7d5..7d4041f1fb3 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2689,11 +2689,94 @@ done: return !status; } +static BOOL CNG_ImportRSAPubKey(CERT_PUBLIC_KEY_INFO *info, BCRYPT_KEY_HANDLE *key) +{ + DWORD size, modulus_len, i; + BLOBHEADER *hdr; + RSAPUBKEY *rsapubkey; + const WCHAR *rsa_algo; + BCRYPT_ALG_HANDLE alg = NULL; + BCRYPT_RSAKEY_BLOB *rsakey; + BYTE *s, *d; + NTSTATUS status; + + if (!info->PublicKey.cbData) + { + SetLastError(NTE_BAD_ALGID); + return FALSE; + } + + if (!CryptDecodeObjectEx(X509_ASN_ENCODING, RSA_CSP_PUBLICKEYBLOB, info->PublicKey.pbData, + info->PublicKey.cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &hdr, &size)) + { + WARN("CryptDecodeObjectEx failed\n"); + return FALSE; + } + + if (hdr->aiKeyAlg == CALG_RSA_KEYX) + rsa_algo = BCRYPT_RSA_ALGORITHM; + else if (hdr->aiKeyAlg == CALG_RSA_SIGN) + rsa_algo = BCRYPT_RSA_SIGN_ALGORITHM; + else + { + FIXME("Unsupported RSA algorithm: %#x\n", hdr->aiKeyAlg); + CryptMemFree(hdr); + SetLastError(NTE_BAD_ALGID); + return FALSE; + } + + if ((status = BCryptOpenAlgorithmProvider(&alg, rsa_algo, NULL, 0))) + goto done; + + rsapubkey = (RSAPUBKEY *)(hdr + 1); + + modulus_len = size - sizeof(*hdr) - sizeof(*rsapubkey); + if (modulus_len != rsapubkey->bitlen / 8) + FIXME("RSA pubkey has wrong modulus_len %u\n", modulus_len); + + size = sizeof(*rsakey) + sizeof(ULONG) + modulus_len; + + if (!(rsakey = CryptMemAlloc(size))) + { + status = STATUS_NO_MEMORY; + goto done; + } + + rsakey->Magic = BCRYPT_RSAPUBLIC_MAGIC; + rsakey->BitLength = rsapubkey->bitlen; + rsakey->cbPublicExp = sizeof(ULONG); + rsakey->cbModulus = modulus_len; + rsakey->cbPrime1 = 0; + rsakey->cbPrime2 = 0; + + d = (BYTE *)(rsakey + 1); + /* According to MSDN modulus and pubexp are in LE while + * BCRYPT_RSAKEY_BLOB is supposed to have them in BE format */ + *(ULONG *)d = RtlUlongByteSwap(rsapubkey->pubexp); + d += sizeof(ULONG); + s = (BYTE *)(rsapubkey + 1); + for (i = 0; i < modulus_len; i++) + d[i] = s[modulus_len - i - 1]; + + status = BCryptImportKeyPair(alg, NULL, BCRYPT_RSAPUBLIC_BLOB, key, (BYTE *)rsakey, size, 0); + CryptMemFree(rsakey); + +done: + CryptMemFree(hdr); + if (alg) BCryptCloseAlgorithmProvider(alg, 0); + if (status) SetLastError(RtlNtStatusToDosError(status)); + return !status; +} + BOOL CNG_ImportPubKey(CERT_PUBLIC_KEY_INFO *pubKeyInfo, BCRYPT_KEY_HANDLE *key) { if (!strcmp(pubKeyInfo->Algorithm.pszObjId, szOID_ECC_PUBLIC_KEY)) return CNG_ImportECCPubKey(pubKeyInfo, key); + + if (!strcmp(pubKeyInfo->Algorithm.pszObjId, szOID_RSA_RSA)) + return CNG_ImportRSAPubKey(pubKeyInfo, key); + FIXME("Unsupported public key type: %s\n", debugstr_a(pubKeyInfo->Algorithm.pszObjId)); SetLastError(NTE_BAD_ALGID); return FALSE; diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 38d2f84db14..7c72eba1b9b 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -30,6 +30,7 @@ static BOOL (WINAPI *pCryptDecodeObjectEx)(DWORD,LPCSTR,const BYTE*,DWORD,DWORD,PCRYPT_DECODE_PARA,void*,DWORD*); static BOOL (WINAPI *pCryptEncodeObjectEx)(DWORD,LPCSTR,const void*,DWORD,PCRYPT_ENCODE_PARA,void*,DWORD*); +static DWORD (WINAPI *pBCryptDestroyKey)(BCRYPT_KEY_HANDLE); struct encodedInt { @@ -8400,6 +8401,7 @@ static void testImportPublicKey(HCRYPTPROV csp, PCERT_PUBLIC_KEY_INFO info) { BOOL ret; HCRYPTKEY key; + BCRYPT_KEY_HANDLE key2; PCCERT_CONTEXT context; DWORD dwSize; ALG_ID ai; @@ -8469,6 +8471,12 @@ static void testImportPublicKey(HCRYPTPROV csp, PCERT_PUBLIC_KEY_INFO info) &context->pCertInfo->SubjectPublicKeyInfo, 0, 0, NULL, &key); ok(ret, "CryptImportPublicKeyInfoEx failed: %08x\n", GetLastError()); CryptDestroyKey(key); + + ret = CryptImportPublicKeyInfoEx2(X509_ASN_ENCODING, + &context->pCertInfo->SubjectPublicKeyInfo, 0, NULL, &key2); + ok(ret, "CryptImportPublicKeyInfoEx2 failed: %08x\n", GetLastError()); + if (pBCryptDestroyKey) pBCryptDestroyKey(key2); + CertFreeCertificateContext(context); } } @@ -8502,7 +8510,7 @@ START_TEST(encode) { static const DWORD encodings[] = { X509_ASN_ENCODING, PKCS_7_ASN_ENCODING, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING }; - HMODULE hCrypt32; + HMODULE hCrypt32, hBcrypt; DWORD i; hCrypt32 = GetModuleHandleA("crypt32.dll"); @@ -8514,6 +8522,9 @@ START_TEST(encode) return; } + hBcrypt = GetModuleHandleA("bcrypt.dll"); + pBCryptDestroyKey = (void*)GetProcAddress(hBcrypt, "BCryptDestroyKey"); + for (i = 0; i < ARRAY_SIZE(encodings); i++) { test_encodeInt(encodings[i]);

1 0

Jacek Caban : jscript: Support passing EXPRVAL_JSVAL through JS stack.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: 3c91e5ed60c9feb29d517182ee7ca37e54c9f9c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c91e5ed60c9feb29d517182… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 12 15:47:45 2021 +0200 jscript: Support passing EXPRVAL_JSVAL through JS stack. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 018597829ed..106fdabd81c 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -171,7 +171,10 @@ static HRESULT stack_push_exprval(script_ctx_t *ctx, exprval_t *val) switch(val->type) { case EXPRVAL_JSVAL: - assert(0); + hres = stack_push(ctx, jsval_null()); + if(SUCCEEDED(hres)) + hres = stack_push(ctx, val->u.val); + return hres; case EXPRVAL_IDREF: hres = stack_push(ctx, jsval_disp(val->u.idref.disp)); if(SUCCEEDED(hres)) @@ -245,6 +248,10 @@ static BOOL stack_topn_exprval(script_ctx_t *ctx, unsigned n, exprval_t *r) assert(is_number(stack_topn(ctx, n))); r->u.hres = get_number(stack_topn(ctx, n)); return FALSE; + case JSV_NULL: + r->type = EXPRVAL_JSVAL; + r->u.val = stack_topn(ctx, n); + return TRUE; default: assert(0); return FALSE; @@ -268,6 +275,9 @@ static HRESULT exprval_propput(script_ctx_t *ctx, exprval_t *ref, jsval_t v) } case EXPRVAL_IDREF: return disp_propput(ctx, ref->u.idref.disp, ref->u.idref.id, v); + case EXPRVAL_JSVAL: + WARN("ignoring an attempt to set value reference\n"); + return S_OK; default: assert(0); return E_FAIL; @@ -281,6 +291,8 @@ static HRESULT exprval_propget(script_ctx_t *ctx, exprval_t *ref, jsval_t *r) return jsval_copy(ctx->stack[ref->u.off], r); case EXPRVAL_IDREF: return disp_propget(ctx, ref->u.idref.disp, ref->u.idref.id, r); + case EXPRVAL_JSVAL: + return jsval_copy(ref->u.val, r); default: assert(0); return E_FAIL; @@ -302,6 +314,17 @@ static HRESULT exprval_call(script_ctx_t *ctx, exprval_t *ref, WORD flags, unsig } case EXPRVAL_IDREF: return disp_call(ctx, ref->u.idref.disp, ref->u.idref.id, flags, argc, argv, r); + case EXPRVAL_JSVAL: { + IDispatch *obj; + HRESULT hres; + + hres = to_object(ctx, ref->u.val, &obj); + if(SUCCEEDED(hres)) { + hres = disp_call_value(ctx, obj, NULL, flags, argc, argv, r); + IDispatch_Release(obj); + } + return hres; + } default: assert(0); return E_FAIL;

1 0

Jacek Caban : jscript: Ignore an attempt to set visible host object identifier's value in ES5 mode.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: c7fc18a6c771d6796e6dee67c9616467ce697821 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7fc18a6c771d6796e6dee67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 12 15:47:51 2021 +0200 jscript: Ignore an attempt to set visible host object identifier's value in ES5 mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 106fdabd81c..06b0fd673b3 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1291,7 +1291,8 @@ static HRESULT interp_identifier_ref(script_ctx_t *ctx, BSTR identifier, unsigne exprval_set_disp_ref(&exprval, to_disp(script_obj), id); } - if(exprval.type == EXPRVAL_JSVAL || exprval.type == EXPRVAL_INVALID) { + if(exprval.type == EXPRVAL_INVALID || + (exprval.type == EXPRVAL_JSVAL && ctx->version < SCRIPTLANGUAGEVERSION_ES5)) { WARN("invalid ref\n"); exprval_release(&exprval); exprval_set_exception(&exprval, JS_E_OBJECT_EXPECTED);

1 0

Jacek Caban : jscript: Add function name to its scope chain in ES5 mode.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: 1985f330f8a8790bc3b23b999b84b7f615d6f508 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1985f330f8a8790bc3b23b99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 12 15:47:58 2021 +0200 jscript: Add function name to its scope chain in ES5 mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 8 ++++++++ dlls/mshtml/tests/documentmode.js | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 06b0fd673b3..f3d9d694b2a 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -661,6 +661,14 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re if(FAILED(hres)) return hres; } + + /* ECMA-262 5.1 Edition 13 */ + if(func->name && ctx->version >= SCRIPTLANGUAGEVERSION_ES5 && !wcscmp(identifier, func->name)) { + TRACE("returning a function from scope chain\n"); + ret->type = EXPRVAL_JSVAL; + ret->u.val = jsval_obj(jsdisp_addref(scope->frame->function_instance)); + return S_OK; + } } if(scope->jsobj) hres = jsdisp_get_id(scope->jsobj, identifier, fdexNameImplicit, &id); diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 75a132e83a7..82f8aae4ed9 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -534,3 +534,39 @@ sync_test("delete_prop", function() { todo_wine. ok(!("globalprop4" in obj), "globalprop4 is still in obj"); }); + +var func_scope_val = 1; + +sync_test("func_scope", function() { + var func_scope_val = 2; + + var f = function func_scope_val() { + return func_scope_val; + }; + + func_scope_val = 3; + if(document.documentMode < 9) { + ok(f() === 3, "f() = " + f()); + return; + } + ok(f === f(), "f() = " + f()); + + f = function func_scope_val(a) { + func_scope_val = 4; + return func_scope_val; + }; + + func_scope_val = 3; + ok(f === f(), "f() = " + f()); + ok(func_scope_val === 3, "func_scope_val = " + func_scope_val); + ok(window.func_scope_val === 1, "window.func_scope_val = " + window.func_scope_val); + + f = function func_scope_val(a) { + return (function() { return a ? func_scope_val(false) : func_scope_val; })(); + }; + + ok(f === f(true), "f(true) = " + f(true)); + + window = 1; + ok(window === window.self, "window = " + window); +});

1 0