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

Francois Gouget : winetest/gather: Fix the name of a generated file in a comment.
by Alexandre Julliard April 13, 2021

April 13, 2021

Module: tools Branch: master Commit: 395586d897a73248a27f8bb93f424180e53b348d URL: https://source.winehq.org/git/tools.git/?a=commit;h=395586d897a73248a27f8bb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 13 12:22:10 2021 +0200 winetest/gather: Fix the name of a generated file in a comment. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/gather b/winetest/gather index 750f0ee..f7dcc16 100755 --- a/winetest/gather +++ b/winetest/gather @@ -899,7 +899,7 @@ EOF # -# Write the data/BUILD/totals.txt file +# Write the data/BUILD/total.txt file # This provides the statistics for the main index page. #

1 0

Francois Gouget : winetest/build-index: Streamline the build check.
by Alexandre Julliard April 13, 2021

April 13, 2021

Module: tools Branch: master Commit: 27324e831f00189649fa55df4ba8c157c7830c0b URL: https://source.winehq.org/git/tools.git/?a=commit;h=27324e831f00189649fa55d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 13 12:22:27 2021 +0200 winetest/build-index: Streamline the build check. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 01533c4..f8a0a88 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -211,10 +211,12 @@ my @too_old; opendir(DIR, "data") or die "could not open the 'data' directory: $!"; foreach my $build (readdir(DIR)) { - next if ($build =~ /^(\.\.?|index\.html|errors\.html|tests)$/); if ($build !~ /^[0-9a-f]{40}$/) { - error("'data/$build' is not a valid build directory\n"); + if ($build !~ /^(\.\.?|errors\.html|index\.html|tests)$/) + { + error("'data/$build' is not a valid build directory\n"); + } next; } next unless -f "data/$build/index.html";

1 0

Rémi Bernon : mfplat: Read queue subscriber within the critical section.
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: 4904d90870a716fda971fc12240ddbc23323475c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4904d90870a716fda971fc12… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 12 18:36:02 2021 +0200 mfplat: Read queue subscriber within the critical section. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 6fb8661dba4..9078702c854 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -7109,7 +7109,7 @@ static void queue_notify_subscriber(struct event_queue *queue) static HRESULT WINAPI eventqueue_BeginGetEvent(IMFMediaEventQueue *iface, IMFAsyncCallback *callback, IUnknown *state) { struct event_queue *queue = impl_from_IMFMediaEventQueue(iface); - MFASYNCRESULT *result_data = (MFASYNCRESULT *)queue->subscriber; + MFASYNCRESULT *result_data; HRESULT hr; TRACE("%p, %p, %p.\n", iface, callback, state); @@ -7121,7 +7121,7 @@ static HRESULT WINAPI eventqueue_BeginGetEvent(IMFMediaEventQueue *iface, IMFAsy if (queue->is_shut_down) hr = MF_E_SHUTDOWN; - else if (result_data) + else if ((result_data = (MFASYNCRESULT *)queue->subscriber)) { if (result_data->pCallback == callback) hr = IRtwqAsyncResult_GetStateNoAddRef(queue->subscriber) == state ?

1 0

Nikolay Sivov : mf/session: Forward MEReconnect* events to the application.
by Alexandre Julliard April 12, 2021

April 12, 2021

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

Dmitry Timoshkov : crypt32: Add support for importing RSA public keys with BCrypt.
by Alexandre Julliard April 12, 2021

April 12, 2021

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

Nikolay Sivov : setupapi: Fix use after free in trace message (Coverity).
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: babdaffff7b25a1db9059598bd3c85da46469d17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=babdaffff7b25a1db9059598… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 12 17:28:14 2021 +0300 setupapi: Fix use after free in trace message (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 7ff3cb01eb6..0758fef5603 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1773,7 +1773,7 @@ BOOL WINAPI SetupDiRemoveDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) { SC_HANDLE manager = NULL, service = NULL; struct device *device; - WCHAR *service_name; + WCHAR *service_name = NULL; DWORD size; TRACE("devinfo %p, device_data %p.\n", devinfo, device_data); @@ -1789,7 +1789,6 @@ BOOL WINAPI SetupDiRemoveDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) service_name = malloc(size); if (!RegGetValueW(device->key, NULL, L"Service", RRF_RT_REG_SZ, NULL, service_name, &size)) service = OpenServiceW(manager, service_name, SERVICE_USER_DEFINED_CONTROL); - free(service_name); } remove_device(device); @@ -1803,6 +1802,8 @@ BOOL WINAPI SetupDiRemoveDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) } CloseServiceHandle(manager); + free(service_name); + remove_all_device_ifaces(device); return TRUE;

1 0

Nikolay Sivov : mfreadwrite/reader: Add missing allocation check (Coverity).
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: 129e5660e3588f4ccfd919870fb71497b61d3a0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=129e5660e3588f4ccfd91987… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 12 17:40:02 2021 +0300 mfreadwrite/reader: Add missing allocation check (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 2edc83b8685..8b3230ad4d2 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -442,12 +442,14 @@ static void source_reader_set_sa_response(struct source_reader *reader, struct s } } -static void source_reader_queue_response(struct source_reader *reader, struct media_stream *stream, HRESULT status, +static HRESULT source_reader_queue_response(struct source_reader *reader, struct media_stream *stream, HRESULT status, DWORD stream_flags, LONGLONG timestamp, IMFSample *sample) { struct stream_response *response; - response = calloc(1, sizeof(*response)); + if (!(response = calloc(1, sizeof(*response)))) + return E_OUTOFMEMORY; + response->status = status; response->stream_index = stream->index; response->stream_flags = stream_flags; @@ -466,6 +468,8 @@ static void source_reader_queue_response(struct source_reader *reader, struct me stream->responses++; source_reader_response_ready(reader, response); + + return S_OK; } static HRESULT source_reader_request_sample(struct source_reader *reader, struct media_stream *stream) @@ -716,8 +720,7 @@ static HRESULT source_reader_process_sample(struct source_reader *reader, struct if (FAILED(IMFSample_GetSampleTime(sample, &timestamp))) WARN("Sample time wasn't set.\n"); - source_reader_queue_response(reader, stream, S_OK, 0, timestamp, sample); - return S_OK; + return source_reader_queue_response(reader, stream, S_OK, 0, timestamp, sample); } /* It's assumed that decoder has 1 input and 1 output, both id's are 0. */

1 0

Piotr Caban : winemac.drv: Take all online monitors into account when computing desktop rect.
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: 66b593049c62978fbbb607117b78fde35f6db936 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66b593049c62978fbbb60711… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 12 17:55:23 2021 +0200 winemac.drv: Take all online monitors into account when computing desktop rect. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/gdi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 8073a875df5..0acddc1dd98 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -68,7 +68,7 @@ static void compute_desktop_rect(void) uint32_t count, i; desktop_rect = CGRectNull; - if (CGGetActiveDisplayList(ARRAY_SIZE(displayIDs), displayIDs, &count) != kCGErrorSuccess || + if (CGGetOnlineDisplayList(ARRAY_SIZE(displayIDs), displayIDs, &count) != kCGErrorSuccess || !count) { displayIDs[0] = CGMainDisplayID();

1 0

Dmitry Timoshkov : crypt32: Implement CryptImportPublicKeyInfoEx2.
by Alexandre Julliard April 12, 2021

April 12, 2021

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

Gijs Vermeulen : rasapi32: Update spec file.
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: a8d4ea1d0aae4c2c7c172029cf4789415e9fe337 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8d4ea1d0aae4c2c7c172029… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Apr 11 16:12:24 2021 +0200 rasapi32: Update spec file. File version: 10.0.19041.450 (Windows 10). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50851 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rasapi32/rasapi32.spec | 77 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/rasapi32/rasapi32.spec b/dlls/rasapi32/rasapi32.spec index e8a28a8814e..90ebcbce072 100644 --- a/dlls/rasapi32/rasapi32.spec +++ b/dlls/rasapi32/rasapi32.spec @@ -1,5 +1,32 @@ +# @ stub DDMComputeLuid +# @ stub DDMFreeDialingParam +# @ stub DDMFreePhonebookContext +# @ stub DDMFreeRemoteEndpoint +# @ stub DDMGetAddressesFromPhonebook +# @ stub DDMGetEapInfo +# @ stub DDMGetEapUserIdentityW +# @ stub DDMGetPhoneBookContext +# @ stub DDMGetPhonebookInfo +# @ stub DDMGetProtocolStartParams +# @ stub DDMGetRasDialParams +# @ stub DDMGetRasDialingParams +# @ stub DDMGetTunnelEndpoints +# @ stub DDMRasPbkEntryCleanup +# @ stub DDMUpdateProtocolConfigInfoFromEntry +# @ stub DwCloneEntry +# @ stub DwEnumEntryDetails +# @ stub DwEnumEntryDetailsEx +# @ stub DwRasUninitialize +# @ stub GetAutoTriggerProfileInfo +# @ stub IsActiveAutoTriggerConnection +# @ stub IsActiveAutoTriggerConnectionEx +# @ stub RasAutoDialSharedConnection @ stub RasAutodialAddressToNetwork @ stub RasAutodialEntryToNetwork +@ stub RasClearConnectionStatistics +# @ stub RasClearLinkStatistics +# @ stub RasCompleteDialMachineCleanup +# @ stub RasConfigUserProxySettingsW @ stdcall RasConnectionNotificationA(ptr long long) @ stdcall RasConnectionNotificationW(ptr long long) @ stdcall RasCreatePhonebookEntryA(long str) @@ -23,6 +50,10 @@ @ stdcall RasEnumEntriesA(str str ptr ptr ptr) @ stdcall RasEnumEntriesW(wstr wstr ptr ptr ptr) @ stub RasEnumEntriesWow +# @ stub RasFreeEapUserIdentityA +# @ stub RasFreeEapUserIdentityW +# @ stub RasFreeEntryAdvancedProperties +# @ stub RasGetAutoTriggerConnectStatus @ stdcall RasGetAutodialAddressA(str ptr ptr ptr ptr) @ stdcall RasGetAutodialAddressW(wstr ptr ptr ptr ptr) @ stdcall RasGetAutodialEnableA(long ptr) @@ -33,13 +64,22 @@ @ stdcall RasGetConnectStatusA(ptr ptr) @ stdcall RasGetConnectStatusW(ptr ptr) @ stub RasGetConnectStatusWow +# @ stub RasGetConnectionErrorStringW @ stdcall RasGetConnectionStatistics(ptr ptr) @ stub RasGetCountryInfoA @ stub RasGetCountryInfoW @ stub RasGetCredentialsA @ stub RasGetCredentialsW +# @ stub RasGetCustomAuthDataA +# @ stub RasGetCustomAuthDataW +# @ stub RasGetEapUserDataA +# @ stub RasGetEapUserDataW +# @ stub RasGetEapUserIdentityA +# @ stub RasGetEapUserIdentityW +# @ stub RasGetEntryAdvancedProperties @ stdcall RasGetEntryDialParamsA(str ptr ptr) @ stdcall RasGetEntryDialParamsW(wstr ptr ptr) +# @ stub RasGetEntryHrasconnW @ stdcall RasGetEntryPropertiesA(str str ptr ptr ptr ptr) @ stdcall RasGetEntryPropertiesW(wstr wstr ptr ptr ptr ptr) @ stdcall RasGetErrorStringA(long ptr long) @@ -47,17 +87,39 @@ @ stub RasGetErrorStringWow @ stub RasGetHport @ stdcall RasGetLinkStatistics(ptr long ptr) +# @ stub RasGetNapStatus +# @ stub RasGetPCscf +# @ stub RasGetPbkPath @ stdcall RasGetProjectionInfoA(ptr ptr ptr ptr) +# @ stub RasGetProjectionInfoEx @ stdcall RasGetProjectionInfoW(ptr ptr ptr ptr) @ stub RasGetSubEntryHandleA @ stub RasGetSubEntryHandleW @ stub RasGetSubEntryPropertiesA @ stub RasGetSubEntryPropertiesW +# @ stub RasHandleTriggerConnDisconnect @ stdcall RasHangUpA(long) @ stdcall RasHangUpW(long) @ stub RasHangUpWow +# @ stub RasInvokeEapUI +# @ stub RasIsPublicPhonebook +# @ stub RasIsSharedConnection +# @ stub RasNQMStateEnteredNotification +# @ stub RasQueryRedialOnLinkFailure +# @ stub RasQuerySharedAutoDial +# @ stub RasQuerySharedConnection +# @ stub RasRegisterEntryChangeNotification @ stdcall RasRenameEntryA(str str str) @ stdcall RasRenameEntryW(wstr wstr wstr) +# @ stub RasRestoreDefaultLegacyProxySettings +# @ stub RasScriptExecute +# @ stub RasScriptGetIpAddress +# @ stub RasScriptInit +# @ stub RasScriptReceive +# @ stub RasScriptSend +# @ stub RasScriptTerm +# @ stub RasSetAutoTriggerProfile +# @ stub RasSetAutoTriggerProfileEx @ stdcall RasSetAutodialAddressA(str long ptr long long) @ stdcall RasSetAutodialAddressW(wstr long ptr long long) @ stdcall RasSetAutodialEnableA(long long) @@ -68,15 +130,30 @@ @ stub RasSetCredentialsW @ stdcall RasSetCustomAuthDataA(str str ptr long) @ stdcall RasSetCustomAuthDataW(wstr wstr ptr long) +# @ stub RasSetEapUserDataA +# @ stub RasSetEapUserDataAEx +# @ stub RasSetEapUserDataW +# @ stub RasSetEapUserDataWEx +# @ stub RasSetEntryAdvancedProperties @ stdcall RasSetEntryDialParamsA(str ptr long) @ stdcall RasSetEntryDialParamsW(wstr ptr long) @ stdcall RasSetEntryPropertiesA(str str ptr long ptr long) @ stdcall RasSetEntryPropertiesW(wstr wstr ptr long ptr long) @ stub RasSetOldPassword +# @ stub RasSetPerConnectionProxy +# @ stub RasSetSharedAutoDial @ stdcall RasSetSubEntryPropertiesA(str str long ptr long ptr long) @ stdcall RasSetSubEntryPropertiesW(wstr wstr long ptr long ptr long) +# @ stub RasTriggerConnection +# @ stub RasTriggerConnectionEx +# @ stub RasTriggerDisconnection +# @ stub RasTriggerDisconnectionEx +# @ stub RasUnregisterEntryChangeNotification +# @ stub RasUpdateConnection @ stdcall RasValidateEntryNameA(str str) @ stdcall RasValidateEntryNameW(wstr wstr) +# stub @ RasWriteSharedPbkOptions +# stub @ UnInitializeRAS 500 stub RnaEngineRequest 501 stub DialEngineRequest

1 0