October 2020 - Wine-Devel - list.winehq.org

[PATCH 2/2] msado15: Implement _Command get/putref ActiveConnection
by Alistair Leslie-Hughes Oct. 9, 2020

Oct. 9, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/command.c | 20 ++++++++++++++++---- dlls/msado15/tests/msado15.c | 9 +++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index eb7b3a035eb..d19108a1a25 100644 --- a/dlls/msado15/command.c +++ b/dlls/msado15/command.c @@ -35,6 +35,7 @@ struct command LONG ref; CommandTypeEnum type; BSTR text; + _Connection *connection; }; static inline struct command *impl_from_Command( _Command *iface ) @@ -80,6 +81,7 @@ static ULONG WINAPI command_Release( _Command *iface ) if (!ref) { TRACE( "destroying %p\n", command ); + if (command->connection) _Connection_Release(command->connection); heap_free( command->text ); heap_free( command ); } @@ -121,14 +123,23 @@ static HRESULT WINAPI command_get_Properties( _Command *iface, Properties **prop static HRESULT WINAPI command_get_ActiveConnection( _Command *iface, _Connection **connection ) { - FIXME( "%p, %p\n", iface, connection ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + TRACE( "%p, %p\n", iface, connection ); + + *connection = command->connection; + if (command->connection) _Connection_AddRef(command->connection); + return S_OK; } static HRESULT WINAPI command_putref_ActiveConnection( _Command *iface, _Connection *connection ) { - FIXME( "%p, %p\n", iface, connection ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + TRACE( "%p, %p\n", iface, connection ); + + if (command->connection) _Connection_Release(command->connection); + command->connection = connection; + if (command->connection) _Connection_AddRef(command->connection); + return S_OK; } static HRESULT WINAPI command_put_ActiveConnection( _Command *iface, VARIANT connection ) @@ -343,6 +354,7 @@ HRESULT Command_create( void **obj ) command->Command_iface.lpVtbl = &command_vtbl; command->type = adCmdUnknown; command->text = NULL; + command->connection = NULL; command->ref = 1; *obj = &command->Command_iface; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index efcee58c561..378c2eb918c 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -850,6 +850,7 @@ static void test_Command(void) Command25 *command25; CommandTypeEnum cmd_type = adCmdUnspecified; BSTR cmd_text = (BSTR)"test"; + _Connection *connection; hr = CoCreateInstance( &CLSID_Command, NULL, CLSCTX_INPROC_SERVER, &IID__Command, (void **)&command ); ok( hr == S_OK, "got %08x\n", hr ); @@ -903,6 +904,14 @@ static void test_Command(void) ok( hr == S_OK, "got %08x\n", hr ); ok( !wcscmp( L"test", cmd_text ), "got %p\n", wine_dbgstr_w( cmd_text ) ); + connection = (_Connection*)0xdeadbeef; + hr = _Command_get_ActiveConnection( command, &connection ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( connection == NULL, "got %p\n", connection ); + + hr = _Command_putref_ActiveConnection( command, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + _Command_Release( command ); } -- 2.28.0

2 1

[PATCH 1/2] msado15: Implement _Connection get/put CursorLocation
by Alistair Leslie-Hughes Oct. 9, 2020

Oct. 9, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/connection.c | 18 ++++++++++++++---- dlls/msado15/tests/msado15.c | 17 +++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 357834a95fe..2773850236d 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -55,6 +55,7 @@ struct connection WCHAR *datasource; WCHAR *provider; ConnectModeEnum mode; + CursorLocationEnum location; struct connection_point cp_connev; }; @@ -325,14 +326,22 @@ static HRESULT WINAPI connection_put_Attributes( _Connection *iface, LONG attr ) static HRESULT WINAPI connection_get_CursorLocation( _Connection *iface, CursorLocationEnum *cursor_loc ) { - FIXME( "%p, %p\n", iface, cursor_loc ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + + TRACE( "%p, %p\n", iface, cursor_loc ); + + *cursor_loc = connection->location; + return S_OK; } static HRESULT WINAPI connection_put_CursorLocation( _Connection *iface, CursorLocationEnum cursor_loc ) { - FIXME( "%p, %u\n", iface, cursor_loc ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + + TRACE( "%p, %u\n", iface, cursor_loc ); + + connection->location = cursor_loc; + return S_OK; } static HRESULT WINAPI connection_get_Mode( _Connection *iface, ConnectModeEnum *mode ) @@ -674,6 +683,7 @@ HRESULT Connection_create( void **obj ) connection->datasource = NULL; connection->provider = SysAllocString(L"MSDASQL"); connection->mode = adModeUnknown; + connection->location = adUseServer; connection->cp_connev.conn = connection; connection->cp_connev.riid = &DIID_ConnectionEvents; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 8e8553c3b8d..efcee58c561 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -676,6 +676,7 @@ static void test_Connection(void) LONG state, timeout; BSTR str, str2, str3; ConnectModeEnum mode; + CursorLocationEnum location; hr = CoCreateInstance(&CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID__Connection, (void**)&connection); ok( hr == S_OK, "got %08x\n", hr ); @@ -719,6 +720,22 @@ if (0) /* Crashes on windows */ ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); ok(timeout == 300, "Unexpected timeout value %d\n", timeout); + location = 0; + hr = _Connection_get_CursorLocation(connection, &location); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(location == adUseServer, "Unexpected location value %d\n", location); + + hr = _Connection_put_CursorLocation(connection, adUseClient); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + + location = 0; + hr = _Connection_get_CursorLocation(connection, &location); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(location == adUseClient, "Unexpected location value %d\n", location); + + hr = _Connection_put_CursorLocation(connection, adUseServer); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + mode = 0xdeadbeef; hr = _Connection_get_Mode(connection, &mode); ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); -- 2.28.0

2 1

[PATCH 1/5] mf/evr: Implement GetMediaTypeCount().
by Nikolay Sivov Oct. 9, 2020

Oct. 9, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/evr.c | 9 +++++++-- dlls/mf/tests/mf.c | 9 +++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index ac3f17fa585..7567b1a7098 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -372,9 +372,14 @@ static HRESULT WINAPI video_stream_typehandler_IsMediaTypeSupported(IMFMediaType static HRESULT WINAPI video_stream_typehandler_GetMediaTypeCount(IMFMediaTypeHandler *iface, DWORD *count) { - FIXME("%p, %p.\n", iface, count); + TRACE("%p, %p.\n", iface, count); - return E_NOTIMPL; + if (!count) + return E_POINTER; + + *count = 0; + + return S_OK; } static HRESULT WINAPI video_stream_typehandler_GetMediaTypeByIndex(IMFMediaTypeHandler *iface, DWORD index, diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index a63c353a4b5..db442453d6d 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3296,6 +3296,15 @@ static void test_evr(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(IsEqualGUID(&guid, &MFMediaType_Video), "Unexpected type %s.\n", wine_dbgstr_guid(&guid)); + /* Supported types are not advertised. */ + hr = IMFMediaTypeHandler_GetMediaTypeCount(type_handler, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + count = 1; + hr = IMFMediaTypeHandler_GetMediaTypeCount(type_handler, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!count, "Unexpected count %u.\n", count); + IMFMediaTypeHandler_Release(type_handler); /* Stream uses an allocator. */ -- 2.28.0

1 4

[PATCH 5/5] dssenh: Implement CPImportKey and CPDestroyKey.
by Hans Leidekker Oct. 9, 2020

Oct. 9, 2020

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/main.c | 144 ++++++++++++++++++++++++++++++++++++- dlls/dssenh/tests/dssenh.c | 10 +-- 2 files changed, 147 insertions(+), 7 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index a3a4e1b2c37..f02e04585ac 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -317,13 +317,153 @@ BOOL WINAPI CPGenKey( HCRYPTPROV hprov, ALG_ID algid, DWORD flags, HCRYPTKEY *re BOOL WINAPI CPDestroyKey( HCRYPTPROV hprov, HCRYPTKEY hkey ) { - return FALSE; + struct key *key = (struct key *)hkey; + + TRACE( "%p, %p\n", (void *)hprov, (void *)hkey ); + + if (key->magic != MAGIC_KEY) + { + SetLastError( NTE_BAD_KEY ); + return FALSE; + } + + destroy_key( key ); + return TRUE; +} + +static BOOL store_key_pair( struct key *key, HKEY hkey, DWORD keyspec, DWORD flags ) +{ + const WCHAR *value; + DATA_BLOB blob_in, blob_out; + DWORD len; + BYTE *data; + BOOL ret = TRUE; + + if (!key) return TRUE; + if (!(value = map_keyspec_to_keypair_name( keyspec ))) return FALSE; + + if (BCryptExportKey( key->handle, NULL, LEGACY_DSA_V2_PRIVATE_BLOB, NULL, 0, &len, 0 )) return FALSE; + if (!(data = heap_alloc( len ))) return FALSE; + + if (!BCryptExportKey( key->handle, NULL, LEGACY_DSA_V2_PRIVATE_BLOB, data, len, &len, 0 )) + { + blob_in.pbData = data; + blob_in.cbData = len; + if ((ret = CryptProtectData( &blob_in, NULL, NULL, NULL, NULL, flags, &blob_out ))) + { + ret = !RegSetValueExW( hkey, value, 0, REG_BINARY, blob_out.pbData, blob_out.cbData ); + LocalFree( blob_out.pbData ); + } + } + + heap_free( data ); + return ret; +} + +static BOOL store_key_container_keys( struct container *container ) +{ + HKEY hkey; + DWORD flags; + BOOL ret; + + if (container->flags & CRYPT_MACHINE_KEYSET) + flags = CRYPTPROTECT_LOCAL_MACHINE; + else + flags = 0; + + if (!create_container_regkey( container, KEY_WRITE, &hkey )) return FALSE; + + ret = store_key_pair( container->exch_key, hkey, AT_KEYEXCHANGE, flags ); + if (ret) store_key_pair( container->sign_key, hkey, AT_SIGNATURE, flags ); + RegCloseKey( hkey ); + return ret; } +#define MAGIC_DSS1 ('D' | ('S' << 8) | ('S' << 16) | ('1' << 24)) +#define MAGIC_DSS2 ('D' | ('S' << 8) | ('S' << 16) | ('2' << 24)) + BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKEY hpubkey, DWORD flags, HCRYPTKEY *ret_key ) { - return FALSE; + struct container *container = (struct container *)hprov; + struct key *key; + BLOBHEADER *hdr; + DSSPUBKEY *pubkey; + const WCHAR *type; + NTSTATUS status; + + TRACE( "%p, %p, %u, %p, %08x, %p\n", (void *)hprov, data, len, (void *)hpubkey, flags, ret_key ); + + if (container->magic != MAGIC_CONTAINER) return FALSE; + if (len < sizeof(*hdr)) return FALSE; + + hdr = (BLOBHEADER *)data; + if ((hdr->bType != PRIVATEKEYBLOB && hdr->bType != PUBLICKEYBLOB) || hdr->bVersion != 2 || + hdr->aiKeyAlg != CALG_DSS_SIGN) + { + FIXME( "bType %u\n", hdr->bType ); + FIXME( "bVersion %u\n", hdr->bVersion ); + FIXME( "reserved %u\n", hdr->reserved ); + FIXME( "aiKeyAlg %08x\n", hdr->aiKeyAlg ); + return FALSE; + } + + if (len < sizeof(*hdr) + sizeof(*pubkey)) return FALSE; + pubkey = (DSSPUBKEY *)(hdr + 1); + + switch (pubkey->magic) + { + case MAGIC_DSS1: + type = LEGACY_DSA_V2_PUBLIC_BLOB; + break; + + case MAGIC_DSS2: + type = LEGACY_DSA_V2_PRIVATE_BLOB; + break; + + default: + FIXME( "unsupported key magic %08x\n", pubkey->magic ); + return FALSE; + } + + if (!(key = create_key( hdr->aiKeyAlg, flags ))) return FALSE; + + if ((status = BCryptImportKeyPair( key->alg_handle, NULL, type, &key->handle, (UCHAR *)data, len, 0 ))) + { + TRACE( "failed to import key %08x\n", status ); + destroy_key( key ); + return FALSE; + } + + if (!wcscmp(type, LEGACY_DSA_V2_PRIVATE_BLOB)) + { + switch (hdr->aiKeyAlg) + { + case AT_KEYEXCHANGE: + case CALG_DH_SF: + container->exch_key = key; + break; + + case AT_SIGNATURE: + case CALG_DSS_SIGN: + container->sign_key = key; + break; + + default: + FIXME( "unhandled key algorithm %u\n", hdr->aiKeyAlg ); + destroy_key( key ); + return FALSE; + } + + if (!store_key_container_keys( container )) + { + destroy_key( key ); + return FALSE; + } + } + + *ret_key = (HCRYPTKEY)key; + return TRUE; } BOOL WINAPI CPExportKey( HCRYPTPROV hprov, HCRYPTKEY hkey, HCRYPTKEY hexpkey, DWORD blobtype, DWORD flags, diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 3bd546524f0..d4a231562e9 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -853,11 +853,6 @@ static void test_signhash_array(HCRYPTPROV hProv, const struct signature_test *t /* Get a private key of array specified ALG_ID */ result = CryptImportKey(hProv, tests[i].privateKey, tests[i].keyLen, 0, 0, &privKey); - if (!result) - { - skip("skipping sign tests\n"); - return; - } ok(result, "Failed to imported key, got %x\n", GetLastError()); /* Create hash object and add data for signature 1 */ @@ -895,6 +890,11 @@ static void test_signhash_array(HCRYPTPROV hProv, const struct signature_test *t /* Sign hash 1 */ result = CryptSignHashA(hHash1, AT_SIGNATURE, NULL, 0, NULL, &signLen1); + if (!result) + { + skip("skipping sign tests\n"); + return; + } ok(result, "Failed to get signature length, got %x\n", GetLastError()); ok(signLen1 == 40, "Expected a 40-byte signature, got %d\n", signLen1); -- 2.28.0

1 0

[PATCH 4/5] dssenh: Implement CPGetHashParam.
by Hans Leidekker Oct. 9, 2020

Oct. 9, 2020

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/main.c | 40 +++++++++++++++++++++++++++++++++++++- dlls/dssenh/tests/dssenh.c | 5 ----- 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 44912ed4989..a3a4e1b2c37 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -431,7 +431,45 @@ BOOL WINAPI CPHashData( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *data, DW BOOL WINAPI CPGetHashParam( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD param, BYTE *data, DWORD *len, DWORD flags ) { - return FALSE; + struct hash *hash = (struct hash *)hhash; + + TRACE( "%p, %p, %08x, %p, %p, %08x\n", (void *)hprov, (void *)hhash, param, data, len, flags ); + + if (hash->magic != MAGIC_HASH) return FALSE; + + switch (param) + { + case HP_HASHSIZE: + if (sizeof(hash->len) > *len) + { + *len = sizeof(hash->len); + SetLastError( ERROR_MORE_DATA ); + return FALSE; + } + *(DWORD *)data = hash->len; + *len = sizeof(hash->len); + return TRUE; + + case HP_HASHVAL: + if (!hash->finished) + { + if (BCryptFinishHash( hash->handle, hash->value, hash->len, 0 )) return FALSE; + hash->finished = TRUE; + } + if (hash->len > *len) + { + *len = hash->len; + SetLastError( ERROR_MORE_DATA ); + return FALSE; + } + memcpy( data, hash->value, hash->len ); + *len = hash->len; + return TRUE; + + default: + SetLastError( NTE_BAD_TYPE ); + return FALSE; + } } BOOL WINAPI CPDeriveKey( HCRYPTPROV hprov, ALG_ID algid, HCRYPTHASH hhash, DWORD flags, HCRYPTKEY *ret_key ) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index cc4650b2c83..3bd546524f0 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -453,11 +453,6 @@ static void test_hash(const struct hash_test *tests, int testLen) dataLen = sizeof(DWORD); result = CryptGetHashParam(hHash, HP_HASHSIZE, (BYTE *)&hashLen, &dataLen, 0); - if (!result) - { - skip("skipping hash tests\n"); - return; - } ok(result && (hashLen == tests[i].hashLen), "Expected %d hash len, got %d.Error: %x\n", tests[i].hashLen, hashLen, GetLastError()); -- 2.28.0

1 0

[PATCH 3/5] dssenh: Implement CPHashData.
by Hans Leidekker Oct. 9, 2020

Oct. 9, 2020

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/main.c | 10 +++++++++- dlls/dssenh/tests/dssenh.c | 24 ++++++++++++------------ 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 66f3456d789..44912ed4989 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -1,5 +1,6 @@ /* * Copyright 2008 Maarten Lankhorst + * Copyright 2020 Hans Leidekker for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -418,7 +419,14 @@ BOOL WINAPI CPDestroyHash( HCRYPTPROV hprov, HCRYPTHASH hhash ) BOOL WINAPI CPHashData( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *data, DWORD len, DWORD flags ) { - return FALSE; + struct hash *hash = (struct hash *)hhash; + + TRACE("%p, %p, %p, %u, %08x\n", (void *)hprov, (void *)hhash, data, len, flags ); + + if (hash->magic != MAGIC_HASH) return FALSE; + + if (hash->finished || BCryptHashData( hash->handle, (UCHAR *)data, len, 0 )) return FALSE; + return TRUE; } BOOL WINAPI CPGetHashParam( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD param, BYTE *data, DWORD *len, DWORD flags ) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index f06cdd1433a..cc4650b2c83 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -449,15 +449,15 @@ static void test_hash(const struct hash_test *tests, int testLen) ok(result, "Expected creation of a hash.\n"); result = CryptHashData(hHash, data, dataLen, 0); + ok(result, "Expected data to be added to hash.\n"); + + dataLen = sizeof(DWORD); + result = CryptGetHashParam(hHash, HP_HASHSIZE, (BYTE *)&hashLen, &dataLen, 0); if (!result) { skip("skipping hash tests\n"); return; } - ok(result, "Expected data to be added to hash.\n"); - - dataLen = sizeof(DWORD); - result = CryptGetHashParam(hHash, HP_HASHSIZE, (BYTE *)&hashLen, &dataLen, 0); ok(result && (hashLen == tests[i].hashLen), "Expected %d hash len, got %d.Error: %x\n", tests[i].hashLen, hashLen, GetLastError()); @@ -608,15 +608,15 @@ static void test_data_encryption(const struct encrypt_test *tests, int testLen) ok(result, "Expected creation of a MD5 hash for key derivation.\n"); result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); + ok(result, "Expected data to be added to hash for key derivation.\n"); + + /* Derive key */ + result = CryptDeriveKey(hProv, tests[i].algid, hHash, tests[i].keyLength, &pKey); if (!result) { skip("skipping encryption tests\n"); return; } - ok(result, "Expected data to be added to hash for key derivation.\n"); - - /* Derive key */ - result = CryptDeriveKey(hProv, tests[i].algid, hHash, tests[i].keyLength, &pKey); ok(result, "Expected a derived key.\n"); result = CryptDestroyHash(hHash); @@ -698,15 +698,15 @@ static void test_cipher_modes(const struct ciphermode_test *tests, int testLen) ok(result, "Expected creation of a MD5 hash for key derivation.\n"); result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); + ok(result, "Expected data to be added to hash for key derivation.\n"); + + /* Derive a CALG_RC2 key, but could be any other encryption cipher */ + result = CryptDeriveKey(hProv, CALG_RC2, hHash, 40 << 16, &pKey); if (!result) { skip("skipping ciper modes tests\n"); return; } - ok(result, "Expected data to be added to hash for key derivation.\n"); - - /* Derive a CALG_RC2 key, but could be any other encryption cipher */ - result = CryptDeriveKey(hProv, CALG_RC2, hHash, 40 << 16, &pKey); ok(result, "Expected a derived key.\n"); result = CryptDestroyHash(hHash); -- 2.28.0

1 0

[PATCH 2/5] dssenh: Implement CPCreateHash and CPDestroyHash.
by Hans Leidekker Oct. 9, 2020

Oct. 9, 2020

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/main.c | 90 +++++++++++++++++++++++++++++++++++++- dlls/dssenh/tests/dssenh.c | 18 ++++---- 2 files changed, 97 insertions(+), 11 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 32c31a48a8d..66f3456d789 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -54,6 +54,17 @@ struct container char name[MAX_PATH]; }; +#define MAGIC_HASH (('H' << 24) | ('A' << 16) | ('S' << 8) | 'H') +struct hash +{ + DWORD magic; + BCRYPT_ALG_HANDLE alg_handle; + BCRYPT_HASH_HANDLE handle; + DWORD len; + UCHAR value[64]; + BOOL finished; +}; + static const char dss_path_fmt[] = "Software\\Wine\\Crypto\\DSS\\%s"; static BOOL create_container_regkey( struct container *container, REGSAM sam, HKEY *hkey ) @@ -320,14 +331,89 @@ BOOL WINAPI CPExportKey( HCRYPTPROV hprov, HCRYPTKEY hkey, HCRYPTKEY hexpkey, DW return FALSE; } +static struct hash *create_hash( ALG_ID algid ) +{ + struct hash *ret; + const WCHAR *alg; + DWORD len; + + switch (algid) + { + case CALG_MD5: + alg = BCRYPT_MD5_ALGORITHM; + len = 16; + break; + + case CALG_SHA1: + alg = BCRYPT_SHA1_ALGORITHM; + len = 20; + break; + + default: + FIXME( "unhandled algorithm %u\n", algid ); + return 0; + } + + if (!(ret = heap_alloc_zero( sizeof(*ret) ))) return 0; + + ret->magic = MAGIC_HASH; + ret->len = len; + if (BCryptOpenAlgorithmProvider( &ret->alg_handle, alg, MS_PRIMITIVE_PROVIDER, 0 )) + { + heap_free( ret ); + return 0; + } + if (BCryptCreateHash( ret->alg_handle, &ret->handle, NULL, 0, NULL, 0, 0 )) + { + BCryptCloseAlgorithmProvider( ret->alg_handle, 0 ); + heap_free( ret ); + return 0; + } + return ret; +} + BOOL WINAPI CPCreateHash( HCRYPTPROV hprov, ALG_ID algid, HCRYPTKEY hkey, DWORD flags, HCRYPTHASH *ret_hash ) { - return FALSE; + struct hash *hash; + + TRACE( "%p, %08x, %p, %08x, %p\n", (void *)hprov, algid, (void *)hkey, flags, ret_hash ); + + switch (algid) + { + case CALG_MD5: + case CALG_SHA1: + break; + + default: + FIXME( "algorithm %u not supported\n", algid ); + SetLastError( NTE_BAD_ALGID ); + return FALSE; + } + + if (!(hash = create_hash( algid ))) return FALSE; + + *ret_hash = (HCRYPTHASH)hash; + return TRUE; } BOOL WINAPI CPDestroyHash( HCRYPTPROV hprov, HCRYPTHASH hhash ) { - return FALSE; + struct hash *hash = (struct hash *)hhash; + + TRACE( "%p, %p\n", (void *)hprov, (void *)hhash); + + if (hash->magic != MAGIC_HASH) + { + SetLastError( NTE_BAD_HASH ); + return FALSE; + } + + BCryptDestroyHash( hash->handle ); + BCryptCloseAlgorithmProvider( hash->alg_handle, 0 ); + + hash->magic = 0; + heap_free( hash ); + return TRUE; } BOOL WINAPI CPHashData( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *data, DWORD len, DWORD flags ) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index d549b985d6f..f06cdd1433a 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -446,14 +446,14 @@ static void test_hash(const struct hash_test *tests, int testLen) /* test algid hash */ result = CryptCreateHash(hProv, tests[i].algid, 0, 0, &hHash); + ok(result, "Expected creation of a hash.\n"); + + result = CryptHashData(hHash, data, dataLen, 0); if (!result) { skip("skipping hash tests\n"); return; } - ok(result, "Expected creation of a hash.\n"); - - result = CryptHashData(hHash, data, dataLen, 0); ok(result, "Expected data to be added to hash.\n"); dataLen = sizeof(DWORD); @@ -605,14 +605,14 @@ static void test_data_encryption(const struct encrypt_test *tests, int testLen) SetLastError(0xdeadbeef); result = CryptCreateHash(hProv, CALG_MD5, 0, 0, &hHash); + ok(result, "Expected creation of a MD5 hash for key derivation.\n"); + + result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); if (!result) { skip("skipping encryption tests\n"); return; } - ok(result, "Expected creation of a MD5 hash for key derivation.\n"); - - result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); ok(result, "Expected data to be added to hash for key derivation.\n"); /* Derive key */ @@ -695,14 +695,14 @@ static void test_cipher_modes(const struct ciphermode_test *tests, int testLen) SetLastError(0xdeadbeef); result = CryptCreateHash(hProv, CALG_MD5, 0, 0, &hHash); + ok(result, "Expected creation of a MD5 hash for key derivation.\n"); + + result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); if (!result) { skip("skipping ciper modes tests\n"); return; } - ok(result, "Expected creation of a MD5 hash for key derivation.\n"); - - result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); ok(result, "Expected data to be added to hash for key derivation.\n"); /* Derive a CALG_RC2 key, but could be any other encryption cipher */ -- 2.28.0

1 0

[PATCH 1/5] dssenh: Implement CPAcquireContext and CPReleaseContext.
by Hans Leidekker Oct. 9, 2020

Oct. 9, 2020

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/Makefile.in | 1 + dlls/dssenh/main.c | 256 ++++++++++++++++++++++++++++++++++++- dlls/dssenh/tests/dssenh.c | 42 ++++++ 3 files changed, 297 insertions(+), 2 deletions(-) diff --git a/dlls/dssenh/Makefile.in b/dlls/dssenh/Makefile.in index 8015768f99b..67b0d6a141c 100644 --- a/dlls/dssenh/Makefile.in +++ b/dlls/dssenh/Makefile.in @@ -1,4 +1,5 @@ MODULE = dssenh.dll +IMPORTS = bcrypt crypt32 advapi32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 5aa885c8b86..32c31a48a8d 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -22,23 +22,275 @@ #include "windef.h" #include "winbase.h" #include "wincrypt.h" +#include "winreg.h" +#include "bcrypt.h" #include "objbase.h" #include "rpcproxy.h" #include "wine/debug.h" +#include "wine/heap.h" static HINSTANCE instance; WINE_DEFAULT_DEBUG_CHANNEL(dssenh); +#define MAGIC_KEY (('K' << 24) | ('E' << 16) | ('Y' << 8) | '0') +struct key +{ + DWORD magic; + DWORD algid; + DWORD flags; + BCRYPT_ALG_HANDLE alg_handle; + BCRYPT_KEY_HANDLE handle; +}; + +#define MAGIC_CONTAINER (('C' << 24) | ('O' << 16) | ('N' << 8) | 'T') +struct container +{ + DWORD magic; + DWORD flags; + struct key *exch_key; + struct key *sign_key; + char name[MAX_PATH]; +}; + +static const char dss_path_fmt[] = "Software\\Wine\\Crypto\\DSS\\%s"; + +static BOOL create_container_regkey( struct container *container, REGSAM sam, HKEY *hkey ) +{ + char path[sizeof(dss_path_fmt) + MAX_PATH]; + HKEY rootkey; + + sprintf( path, dss_path_fmt, container->name ); + + if (container->flags & CRYPT_MACHINE_KEYSET) + rootkey = HKEY_LOCAL_MACHINE; + else + rootkey = HKEY_CURRENT_USER; + + /* @@ Wine registry key: HKLM\Software\Wine\Crypto\DSS */ + /* @@ Wine registry key: HKCU\Software\Wine\Crypto\DSS */ + return !RegCreateKeyExA( rootkey, path, 0, NULL, REG_OPTION_NON_VOLATILE, sam, NULL, hkey, NULL ); +} + +static struct container *create_key_container( const char *name, DWORD flags ) +{ + struct container *ret; + + if (!(ret = heap_alloc_zero( sizeof(*ret) ))) return NULL; + ret->magic = MAGIC_CONTAINER; + ret->flags = flags; + if (name) strcpy( ret->name, name ); + + if (!(flags & CRYPT_VERIFYCONTEXT)) + { + HKEY hkey; + if (create_container_regkey( ret, KEY_WRITE, &hkey )) RegCloseKey( hkey ); + } + return ret; +} + +static BOOL open_container_regkey( const char *name, DWORD flags, REGSAM access, HKEY *hkey ) +{ + char path[sizeof(dss_path_fmt) + MAX_PATH]; + HKEY rootkey; + + sprintf( path, dss_path_fmt, name ); + + if (flags & CRYPT_MACHINE_KEYSET) + rootkey = HKEY_LOCAL_MACHINE; + else + rootkey = HKEY_CURRENT_USER; + + /* @@ Wine registry key: HKLM\Software\Wine\Crypto\DSS */ + /* @@ Wine registry key: HKCU\Software\Wine\Crypto\DSS */ + return !RegOpenKeyExA( rootkey, path, 0, access, hkey ); +} + +static const WCHAR *map_keyspec_to_keypair_name( DWORD keyspec ) +{ + const WCHAR *name; + + switch (keyspec) + { + case AT_KEYEXCHANGE: + name = L"KeyExchangeKeyPair"; + break; + case AT_SIGNATURE: + name = L"SignatureKeyPair"; + break; + default: + ERR( "invalid key spec %u\n", keyspec ); + return NULL; + } + return name; +} + +static struct key *create_key( ALG_ID algid, DWORD flags ) +{ + struct key *ret; + const WCHAR *alg; + + switch (algid) + { + case AT_SIGNATURE: + case CALG_DSS_SIGN: + alg = BCRYPT_DSA_ALGORITHM; + break; + + default: + FIXME( "unhandled algorithm %08x\n", algid ); + return NULL; + } + + if (!(ret = heap_alloc_zero( sizeof(*ret) ))) return NULL; + + ret->magic = MAGIC_KEY; + ret->algid = algid; + ret->flags = flags; + if (BCryptOpenAlgorithmProvider( &ret->alg_handle, alg, MS_PRIMITIVE_PROVIDER, 0 )) + { + heap_free( ret ); + return NULL; + } + return ret; +} + +static void destroy_key( struct key *key ) +{ + if (!key) return; + BCryptDestroyKey( key->handle ); + BCryptCloseAlgorithmProvider( key->alg_handle, 0 ); + key->magic = 0; + heap_free( key ); +} + +static struct key *import_key( DWORD keyspec, BYTE *data, DWORD len ) +{ + struct key *ret; + + if (!(ret = create_key( keyspec, 0 ))) return NULL; + + if (BCryptImportKeyPair( ret->alg_handle, NULL, LEGACY_DSA_V2_PRIVATE_BLOB, &ret->handle, data, len, 0 )) + { + WARN( "failed to import key\n" ); + destroy_key( ret ); + return NULL; + } + return ret; +} + +static struct key *read_key( HKEY hkey, DWORD keyspec, DWORD flags ) +{ + const WCHAR *value; + DWORD type, len; + BYTE *data; + DATA_BLOB blob_in, blob_out; + struct key *ret = NULL; + + if (!(value = map_keyspec_to_keypair_name( keyspec ))) return NULL; + if (RegQueryValueExW( hkey, value, 0, &type, NULL, &len )) return NULL; + if (!(data = heap_alloc( len ))) return NULL; + + if (!RegQueryValueExW( hkey, value, 0, &type, data, &len )) + { + blob_in.pbData = data; + blob_in.cbData = len; + if (CryptUnprotectData( &blob_in, NULL, NULL, NULL, NULL, flags, &blob_out )) + { + ret = import_key( keyspec, blob_out.pbData, blob_out.cbData ); + LocalFree( blob_out.pbData ); + } + } + + heap_free( data ); + return ret; +} + +static void destroy_container( struct container *container ) +{ + if (!container) return; + destroy_key( container->exch_key ); + destroy_key( container->sign_key ); + container->magic = 0; + heap_free( container ); +} + +static struct container *read_key_container( const char *name, DWORD flags ) +{ + DWORD protect_flags = (flags & CRYPT_MACHINE_KEYSET) ? CRYPTPROTECT_LOCAL_MACHINE : 0; + struct container *ret; + HKEY hkey; + + if (!open_container_regkey( name, flags, KEY_READ, &hkey )) return NULL; + + if ((ret = create_key_container( name, flags ))) + { + ret->exch_key = read_key( hkey, AT_KEYEXCHANGE, protect_flags ); + ret->sign_key = read_key( hkey, AT_SIGNATURE, protect_flags ); + } + + RegCloseKey( hkey ); + return ret; +} + BOOL WINAPI CPAcquireContext( HCRYPTPROV *ret_prov, LPSTR container, DWORD flags, PVTableProvStruc vtable ) { - return FALSE; + struct container *ret; + char name[MAX_PATH]; + + TRACE( "%p, %s, %08x, %p\n", ret_prov, debugstr_a(container), flags, vtable ); + + if (container && *container) + { + if (lstrlenA( container ) >= sizeof(name)) return FALSE; + lstrcpyA( name, container ); + } + else + { + DWORD len = sizeof(name); + if (!GetUserNameA( name, &len )) return FALSE; + } + + switch (flags) + { + case 0: + ret = read_key_container( name, flags ); + break; + + case CRYPT_NEWKEYSET: + if ((ret = read_key_container( name, flags ))) + { + heap_free( ret ); + SetLastError( NTE_EXISTS ); + return FALSE; + } + ret = create_key_container( name, flags ); + break; + + case CRYPT_VERIFYCONTEXT: + ret = create_key_container( "", flags ); + break; + + default: + FIXME( "unsupported flags %08x\n", flags ); + return FALSE; + } + + if (!ret) return FALSE; + *ret_prov = (HCRYPTPROV)ret; + return TRUE; } BOOL WINAPI CPReleaseContext( HCRYPTPROV hprov, DWORD flags ) { - return FALSE; + struct container *container = (struct container *)hprov; + + TRACE( "%p, %08x\n", (void *)hprov, flags ); + + if (container->magic != MAGIC_CONTAINER) return FALSE; + destroy_container( container ); + return TRUE; } BOOL WINAPI CPGetProvParam( HCRYPTPROV hprov, DWORD param, BYTE *data, DWORD *len, DWORD flags ) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index c88fcd14661..d549b985d6f 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -323,6 +323,7 @@ static void test_keylength_array(HCRYPTPROV hProv,const struct keylength_test *t static void test_keylength(void) { HCRYPTPROV hProv = 0; + HCRYPTKEY key; BOOL result; /* acquire base dss provider */ @@ -335,6 +336,17 @@ static void test_keylength(void) } ok(result, "Expected no errors.\n"); + result = CryptGenKey(hProv, AT_SIGNATURE, 0, &key); + todo_wine ok(result, "Expected no errors.\n"); + if (!result) + { + skip("skipping key length tests\n"); + return; + } + + result = CryptDestroyKey(key); + ok(result, "Expected no errors.\n"); + /* perform keylength tests */ test_keylength_array(hProv, baseDSS_keylength, ARRAY_SIZE(baseDSS_keylength)); @@ -434,6 +446,11 @@ static void test_hash(const struct hash_test *tests, int testLen) /* test algid hash */ result = CryptCreateHash(hProv, tests[i].algid, 0, 0, &hHash); + if (!result) + { + skip("skipping hash tests\n"); + return; + } ok(result, "Expected creation of a hash.\n"); result = CryptHashData(hHash, data, dataLen, 0); @@ -588,6 +605,11 @@ static void test_data_encryption(const struct encrypt_test *tests, int testLen) SetLastError(0xdeadbeef); result = CryptCreateHash(hProv, CALG_MD5, 0, 0, &hHash); + if (!result) + { + skip("skipping encryption tests\n"); + return; + } ok(result, "Expected creation of a MD5 hash for key derivation.\n"); result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); @@ -673,6 +695,11 @@ static void test_cipher_modes(const struct ciphermode_test *tests, int testLen) SetLastError(0xdeadbeef); result = CryptCreateHash(hProv, CALG_MD5, 0, 0, &hHash); + if (!result) + { + skip("skipping ciper modes tests\n"); + return; + } ok(result, "Expected creation of a MD5 hash for key derivation.\n"); result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); @@ -831,6 +858,11 @@ static void test_signhash_array(HCRYPTPROV hProv, const struct signature_test *t /* Get a private key of array specified ALG_ID */ result = CryptImportKey(hProv, tests[i].privateKey, tests[i].keyLen, 0, 0, &privKey); + if (!result) + { + skip("skipping sign tests\n"); + return; + } ok(result, "Failed to imported key, got %x\n", GetLastError()); /* Create hash object and add data for signature 1 */ @@ -1084,6 +1116,11 @@ static void test_keyExchange_baseDSS(HCRYPTPROV hProv, const struct keyExchange_ /* Generate key exchange keys for user1 and user2 */ result = CryptGenKey(hProv, tests[i].algid, 512 << 16 | CRYPT_PREGEN, &privKey1); + if (!result) + { + skip("skipping key exchange tests\n"); + return; + } ok(!result && GetLastError() == NTE_BAD_ALGID, "Expected NTE_BAD_ALGID, got %x\n", GetLastError()); @@ -1233,6 +1270,11 @@ static void test_keyExchange_dssDH(HCRYPTPROV hProv, const struct keyExchange_te /* Generate key exchange keys for user1 and user2 */ result = CryptGenKey(hProv, tests[i].algid, 512 << 16 | CRYPT_PREGEN, &privKey1); + if (!result) + { + skip("skipping key exchange tests\n"); + return; + } ok(result, "Failed to generate a key for user1, got %x\n", GetLastError()); result = CryptGenKey(hProv, tests[i].algid, 512 << 16 | CRYPT_PREGEN, &privKey2); -- 2.28.0

1 0

[PATCH 1/2] comctl32/ipaddress: Fix IPM_CLEARADDRESS return value.
by Nikolay Sivov Oct. 9, 2020

Oct. 9, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/ipaddress.c | 7 +++--- dlls/comctl32/tests/ipaddress.c | 43 +++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index 32816561e3d..82d47d4e576 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -354,7 +354,7 @@ static BOOL IPADDRESS_SetRange (IPADDRESS_INFO *infoPtr, int index, WORD range) } -static void IPADDRESS_ClearAddress (const IPADDRESS_INFO *infoPtr) +static LRESULT IPADDRESS_ClearAddress (const IPADDRESS_INFO *infoPtr) { int i; @@ -362,6 +362,8 @@ static void IPADDRESS_ClearAddress (const IPADDRESS_INFO *infoPtr) for (i = 0; i < 4; i++) SetWindowTextW (infoPtr->Part[i].EditHwnd, L""); + + return 1; } @@ -614,8 +616,7 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return 0; case IPM_CLEARADDRESS: - IPADDRESS_ClearAddress (infoPtr); - break; + return IPADDRESS_ClearAddress (infoPtr); case IPM_SETADDRESS: return IPADDRESS_SetAddress (infoPtr, (DWORD)lParam); diff --git a/dlls/comctl32/tests/ipaddress.c b/dlls/comctl32/tests/ipaddress.c index c87d0f56641..9bb9dd63d71 100644 --- a/dlls/comctl32/tests/ipaddress.c +++ b/dlls/comctl32/tests/ipaddress.c @@ -144,6 +144,47 @@ static void test_WM_SETFOCUS(void) DestroyWindow(hwnd); } +static void test_IPM_CLEARADDRESS(void) +{ + struct child_enum child_enum = { 0 }; + char buff[16]; + int i, ret; + HWND hwnd; + + hwnd = create_ipaddress_control(); + ok(!!hwnd, "Failed to create control.\n"); + + ret = SendMessageA(hwnd, IPM_SETADDRESS, 0, MAKEIPADDRESS(0, 1, 2, 3)); + ok(ret == 1, "Unexpected return value %d.\n", ret); + + EnumChildWindows(hwnd, test_child_enum_proc, (LPARAM)&child_enum); + ok(child_enum.count == 4, "Unexpected child count %u.\n", child_enum.count); + + ret = SendMessageA(hwnd, IPM_SETADDRESS, 0, MAKEIPADDRESS(1, 2, 3, 4)); + ok(ret == 1, "Unexpected return value %d.\n", ret); + + ret = GetWindowTextA(hwnd, buff, ARRAY_SIZE(buff)); + ok(ret == 7, "Unexpected return value %d.\n", ret); + ok(!strcmp(buff, "1.2.3.4"), "Unexpected address %s.\n", buff); + + ret = SendMessageA(hwnd, IPM_CLEARADDRESS, 0, 0); + ok(ret, "Unexpected return value %d.\n", ret); + + ret = GetWindowTextA(hwnd, buff, ARRAY_SIZE(buff)); + ok(ret == 7, "Unexpected return value %d.\n", ret); + ok(!strcmp(buff, "0.0.0.0"), "Unexpected address %s.\n", buff); + + for (i = 0; i < 4; ++i) + { + buff[0] = 1; + ret = GetWindowTextA(child_enum.fields[i], buff, ARRAY_SIZE(buff)); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ok(!*buff, "Unexpected field text %s.\n", buff); + } + + DestroyWindow(hwnd); +} + START_TEST(ipaddress) { ULONG_PTR cookie; @@ -152,6 +193,7 @@ START_TEST(ipaddress) test_get_set_text(); test_IPM_SETFOCUS(); test_WM_SETFOCUS(); + test_IPM_CLEARADDRESS(); if (!load_v6_module(&cookie, &ctxt)) return; @@ -159,6 +201,7 @@ START_TEST(ipaddress) test_get_set_text(); test_IPM_SETFOCUS(); test_WM_SETFOCUS(); + test_IPM_CLEARADDRESS(); unload_v6_module(cookie, ctxt); } -- 2.28.0

1 1

[PATCH 2/2] ntoskrnl.exe: Implement PsIsProcessBeingDebugged.
by Myah Caron Oct. 9, 2020

Oct. 9, 2020

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- Based on ReactOS's implementation (hence the first patch in this series). dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 4 ++++ include/ddk/wdm.h | 1 + 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 177816a2239..aea80c77fcd 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2962,6 +2962,16 @@ BOOLEAN WINAPI PsIsSystemThread(PETHREAD thread) } +/*********************************************************************** + * PsIsProcessBeingDebugged (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI PsIsProcessBeingDebugged(PEPROCESS process) +{ + TRACE( "%p\n", process ); + return !!PsGetProcessDebugPort( process ); +} + + /*********************************************************************** * PsGetVersion (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 8ca0f652f1d..6ada30e1f21 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -923,7 +923,7 @@ @ stdcall PsGetVersion(ptr ptr ptr ptr) @ stdcall PsImpersonateClient(ptr ptr long long long) @ extern PsInitialSystemProcess -@ stub PsIsProcessBeingDebugged +@ stdcall PsIsProcessBeingDebugged(ptr) @ stdcall PsIsSystemThread(ptr) @ stub PsIsThreadImpersonating @ stub PsIsThreadTerminating diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index e712ecf2f84..3d76bdf6856 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -2106,9 +2106,13 @@ static void test_permanence(void) static void test_debug(void) { PVOID debug_port; + BOOLEAN is_debugged; debug_port = PsGetProcessDebugPort( PsGetCurrentProcess() ); ok(!debug_port, "got %p\n", debug_port); + + is_debugged = PsIsProcessBeingDebugged( PsGetCurrentProcess() ); + ok(!is_debugged, "got %d\n", is_debugged); } static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 40f1d9754c0..8c639b50320 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1835,6 +1835,7 @@ HANDLE WINAPI PsGetCurrentThreadId(void); HANDLE WINAPI PsGetProcessInheritedFromUniqueProcessId(PEPROCESS); BOOLEAN WINAPI PsGetVersion(ULONG*,ULONG*,ULONG*,UNICODE_STRING*); PVOID WINAPI PsGetProcessDebugPort(PEPROCESS process); +BOOLEAN WINAPI PsIsProcessBeingDebugged(PEPROCESS process); NTSTATUS WINAPI PsTerminateSystemThread(NTSTATUS); #if defined(__x86_64__) || defined(__i386__) -- 2.28.0

1 0