November 2019 - Wine-Devel - list.winehq.org

[PATCH 05/10] dssenh: refactor rsaenh - move store_key_container_keys, store_key_container_permissions, map_key_spec_to_permissions_name from rsaenh/rsaenh.c to rsaenh/cryptoprovutils.c
by shuai zhang Nov. 17, 2019

Nov. 17, 2019

Signed-off-by: Zhang Shuai <wxsxsdz(a)gmail.com> --- dlls/rsaenh/cryptoprovutils.c | 111 ++++++++++++++++++++++++++++++++++ dlls/rsaenh/cryptoprovutils.h | 4 ++ dlls/rsaenh/rsaenh.c | 111 ---------------------------------- 3 files changed, 115 insertions(+), 111 deletions(-) diff --git a/dlls/rsaenh/cryptoprovutils.c b/dlls/rsaenh/cryptoprovutils.c index 9f774bad1d..44bbc923b8 100644 --- a/dlls/rsaenh/cryptoprovutils.c +++ b/dlls/rsaenh/cryptoprovutils.c @@ -208,3 +208,114 @@ void store_key_pair(HCRYPTKEY hCryptKey, HKEY hKey, DWORD dwKeySpec, DWORD dwFla } } +/****************************************************************************** + * store_key_container_keys [Internal] + * + * Stores key container's keys in a persistent location. + * + * PARAMS + * pKeyContainer [I] Pointer to the key container whose keys are to be saved + */ +void store_key_container_keys(KEYCONTAINER *pKeyContainer) +{ + HKEY hKey; + DWORD dwFlags; + + /* On WinXP, persistent keys are stored in a file located at: + * $AppData$\\Microsoft\\Crypto\\RSA\\$SID$\\some_hex_string + */ + + if (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET) + dwFlags = CRYPTPROTECT_LOCAL_MACHINE; + else + dwFlags = 0; + + if (create_container_key(pKeyContainer, KEY_WRITE, &hKey)) + { + store_key_pair(pKeyContainer->hKeyExchangeKeyPair, hKey, + AT_KEYEXCHANGE, dwFlags); + store_key_pair(pKeyContainer->hSignatureKeyPair, hKey, + AT_SIGNATURE, dwFlags); + RegCloseKey(hKey); + } +} + +/****************************************************************************** + * map_key_spec_to_permissions_name [Internal] + * + * Returns the name of the registry value associated with the permissions for + * a key spec. + * + * PARAMS + * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE + * + * RETURNS + * Success: Name of registry value. + * Failure: NULL + */ +LPCSTR map_key_spec_to_permissions_name(DWORD dwKeySpec) +{ + LPCSTR szValueName; + + switch (dwKeySpec) + { + case AT_KEYEXCHANGE: + szValueName = "KeyExchangePermissions"; + break; + case AT_SIGNATURE: + szValueName = "SignaturePermissions"; + break; + default: + WARN("invalid key spec %d\n", dwKeySpec); + szValueName = NULL; + } + return szValueName; +} + +/****************************************************************************** + * store_key_permissions [Internal] + * + * Stores a key's permissions to the registry + * + * PARAMS + * hCryptKey [I] Handle to the key whose permissions are to be stored + * hKey [I] Registry key where the key permissions are to be stored + * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE + */ +void store_key_permissions(HCRYPTKEY hCryptKey, HKEY hKey, DWORD dwKeySpec) +{ + LPCSTR szValueName; + CRYPTKEY *pKey; + + if (!(szValueName = map_key_spec_to_permissions_name(dwKeySpec))) + return; + if (lookup_handle(&handle_table, hCryptKey, RSAENH_MAGIC_KEY, + (OBJECTHDR**)&pKey)) + RegSetValueExA(hKey, szValueName, 0, REG_DWORD, + (BYTE *)&pKey->dwPermissions, + sizeof(pKey->dwPermissions)); +} + +/****************************************************************************** + * store_key_container_permissions [Internal] + * + * Stores key container's key permissions in a persistent location. + * + * PARAMS + * pKeyContainer [I] Pointer to the key container whose key permissions are to + * be saved + */ +void store_key_container_permissions(KEYCONTAINER *pKeyContainer) +{ + HKEY hKey; + + if (create_container_key(pKeyContainer, KEY_WRITE, &hKey)) + { + store_key_permissions(pKeyContainer->hKeyExchangeKeyPair, hKey, + AT_KEYEXCHANGE); + store_key_permissions(pKeyContainer->hSignatureKeyPair, hKey, + AT_SIGNATURE); + RegCloseKey(hKey); + } +} + diff --git a/dlls/rsaenh/cryptoprovutils.h b/dlls/rsaenh/cryptoprovutils.h index 499b0b8140..4b5fcf2f22 100644 --- a/dlls/rsaenh/cryptoprovutils.h +++ b/dlls/rsaenh/cryptoprovutils.h @@ -77,4 +77,8 @@ BOOL crypt_export_key(CRYPTKEY *pCryptKey, HCRYPTKEY hPubKey, DWORD dwBlobType, DWORD dwFlags, BOOL force, BYTE *pbData, DWORD *pdwDataLen); LPCSTR map_key_spec_to_key_pair_name(DWORD dwKeySpec); void store_key_pair(HCRYPTKEY hCryptKey, HKEY hKey, DWORD dwKeySpec, DWORD dwFlags); +void store_key_container_keys(KEYCONTAINER *pKeyContainer); +LPCSTR map_key_spec_to_permissions_name(DWORD dwKeySpec); +void store_key_permissions(HCRYPTKEY hCryptKey, HKEY hKey, DWORD dwKeySpec); +void store_key_container_permissions(KEYCONTAINER *pKeyContainer); #endif /* __WINE_CRYPTOPROVUTILS_H */ diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 8925abefab..5557068813 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -862,117 +862,6 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK return hCryptKey; } -/****************************************************************************** - * map_key_spec_to_permissions_name [Internal] - * - * Returns the name of the registry value associated with the permissions for - * a key spec. - * - * PARAMS - * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE - * - * RETURNS - * Success: Name of registry value. - * Failure: NULL - */ -static LPCSTR map_key_spec_to_permissions_name(DWORD dwKeySpec) -{ - LPCSTR szValueName; - - switch (dwKeySpec) - { - case AT_KEYEXCHANGE: - szValueName = "KeyExchangePermissions"; - break; - case AT_SIGNATURE: - szValueName = "SignaturePermissions"; - break; - default: - WARN("invalid key spec %d\n", dwKeySpec); - szValueName = NULL; - } - return szValueName; -} - -/****************************************************************************** - * store_key_permissions [Internal] - * - * Stores a key's permissions to the registry - * - * PARAMS - * hCryptKey [I] Handle to the key whose permissions are to be stored - * hKey [I] Registry key where the key permissions are to be stored - * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE - */ -static void store_key_permissions(HCRYPTKEY hCryptKey, HKEY hKey, DWORD dwKeySpec) -{ - LPCSTR szValueName; - CRYPTKEY *pKey; - - if (!(szValueName = map_key_spec_to_permissions_name(dwKeySpec))) - return; - if (lookup_handle(&handle_table, hCryptKey, RSAENH_MAGIC_KEY, - (OBJECTHDR**)&pKey)) - RegSetValueExA(hKey, szValueName, 0, REG_DWORD, - (BYTE *)&pKey->dwPermissions, - sizeof(pKey->dwPermissions)); -} - -/****************************************************************************** - * store_key_container_keys [Internal] - * - * Stores key container's keys in a persistent location. - * - * PARAMS - * pKeyContainer [I] Pointer to the key container whose keys are to be saved - */ -static void store_key_container_keys(KEYCONTAINER *pKeyContainer) -{ - HKEY hKey; - DWORD dwFlags; - - /* On WinXP, persistent keys are stored in a file located at: - * $AppData$\\Microsoft\\Crypto\\RSA\\$SID$\\some_hex_string - */ - - if (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET) - dwFlags = CRYPTPROTECT_LOCAL_MACHINE; - else - dwFlags = 0; - - if (create_container_key(pKeyContainer, KEY_WRITE, &hKey)) - { - store_key_pair(pKeyContainer->hKeyExchangeKeyPair, hKey, - AT_KEYEXCHANGE, dwFlags); - store_key_pair(pKeyContainer->hSignatureKeyPair, hKey, - AT_SIGNATURE, dwFlags); - RegCloseKey(hKey); - } -} - -/****************************************************************************** - * store_key_container_permissions [Internal] - * - * Stores key container's key permissions in a persistent location. - * - * PARAMS - * pKeyContainer [I] Pointer to the key container whose key permissions are to - * be saved - */ -static void store_key_container_permissions(KEYCONTAINER *pKeyContainer) -{ - HKEY hKey; - - if (create_container_key(pKeyContainer, KEY_WRITE, &hKey)) - { - store_key_permissions(pKeyContainer->hKeyExchangeKeyPair, hKey, - AT_KEYEXCHANGE); - store_key_permissions(pKeyContainer->hSignatureKeyPair, hKey, - AT_SIGNATURE); - RegCloseKey(hKey); - } -} - /****************************************************************************** * release_key_container_keys [Internal] * -- 2.21.0

2 1

[PATCH 04/10] dssenh: refactor rsaenh - move map_key_spec_to_permissions_name, store_key_permissions from rsaenh/rsaenh.c to rsaenh/cryptoprovutils.c
by shuai zhang Nov. 17, 2019

Nov. 17, 2019

Signed-off-by: Zhang Shuai <wxsxsdz(a)gmail.com> --- dlls/rsaenh/cryptoprovconfig.h | 14 ++++ dlls/rsaenh/cryptoprovutils.c | 87 +++++++++++++++++++++ dlls/rsaenh/cryptoprovutils.h | 35 +++++++++ dlls/rsaenh/rsaenh.c | 133 +-------------------------------- 4 files changed, 139 insertions(+), 130 deletions(-) diff --git a/dlls/rsaenh/cryptoprovconfig.h b/dlls/rsaenh/cryptoprovconfig.h index d282d0db1e..10cbc31b8b 100644 --- a/dlls/rsaenh/cryptoprovconfig.h +++ b/dlls/rsaenh/cryptoprovconfig.h @@ -29,6 +29,7 @@ #ifndef __WINE_CRYPTOPROVCONFIG_H #define __WINE_CRYPTOPROVCONFIG_H #include "wincrypt.h" +#include "implglue.h" /****************************************************************************** * KEYCONTAINER - key containers @@ -62,9 +63,22 @@ static const PROVNAMEPERSONALITYPAIR aProvNamePersonalityPairs[6] = {MS_ENH_RSA_AES_PROV_XP_A, RSAENH_PERSONALITY_AES} }; +/****************************************************************************** + * CRYPTKEY - key objects + */ +#define RSAENH_MAGIC_KEY 0x73620457u +#define RSAENH_KEYSTATE_IDLE 0 +#define RSAENH_KEYSTATE_ENCRYPTING 1 +#define RSAENH_KEYSTATE_MASTERKEY 2 + /****************************************************************************** * Some magic constants */ #define RSAENH_REGKEY "Software\\Wine\\Crypto\\RSA\\%s" +/****************************************************************************** + * Definitions concerning prefix. + */ +#define RSAENH_SCHANNEL_INFO SCHANNEL_INFO + #endif /* __WINE_CRYPTOPROVCONFIG_H */ diff --git a/dlls/rsaenh/cryptoprovutils.c b/dlls/rsaenh/cryptoprovutils.c index 23e0e11626..9f774bad1d 100644 --- a/dlls/rsaenh/cryptoprovutils.c +++ b/dlls/rsaenh/cryptoprovutils.c @@ -33,6 +33,13 @@ #include "cryptoprovutils.h" #include "wine/debug.h" +WINE_DEFAULT_DEBUG_CHANNEL(crypt); + +/****************************************************************************** + * CSP's handle table (used by all acquired key containers) + */ +extern struct handle_table handle_table; + /****************************************************************************** * create_container_key [Internal] * @@ -121,3 +128,83 @@ BOOL delete_container_key(LPCSTR pszContainerName, DWORD dwFlags) } } +/****************************************************************************** + * map_key_spec_to_key_pair_name [Internal] + * + * Returns the name of the registry value associated with a key spec. + * + * PARAMS + * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE + * + * RETURNS + * Success: Name of registry value. + * Failure: NULL + */ +LPCSTR map_key_spec_to_key_pair_name(DWORD dwKeySpec) +{ + LPCSTR szValueName; + + switch (dwKeySpec) + { + case AT_KEYEXCHANGE: + szValueName = "KeyExchangeKeyPair"; + break; + case AT_SIGNATURE: + szValueName = "SignatureKeyPair"; + break; + default: + WARN("invalid key spec %d\n", dwKeySpec); + szValueName = NULL; + } + return szValueName; +} + +/****************************************************************************** + * store_key_pair [Internal] + * + * Stores a key pair to the registry + * + * PARAMS + * hCryptKey [I] Handle to the key to be stored + * hKey [I] Registry key where the key pair is to be stored + * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE + * dwFlags [I] Flags for protecting the key + */ +void store_key_pair(HCRYPTKEY hCryptKey, HKEY hKey, DWORD dwKeySpec, DWORD dwFlags) +{ + LPCSTR szValueName; + DATA_BLOB blobIn, blobOut; + CRYPTKEY *pKey; + DWORD dwLen; + BYTE *pbKey; + + if (!(szValueName = map_key_spec_to_key_pair_name(dwKeySpec))) + return; + if (lookup_handle(&handle_table, hCryptKey, RSAENH_MAGIC_KEY, + (OBJECTHDR**)&pKey)) + { + if (crypt_export_key(pKey, 0, PRIVATEKEYBLOB, 0, TRUE, 0, &dwLen)) + { + pbKey = HeapAlloc(GetProcessHeap(), 0, dwLen); + if (pbKey) + { + if (crypt_export_key(pKey, 0, PRIVATEKEYBLOB, 0, TRUE, pbKey, + &dwLen)) + { + blobIn.pbData = pbKey; + blobIn.cbData = dwLen; + + if (CryptProtectData(&blobIn, NULL, NULL, NULL, NULL, + dwFlags, &blobOut)) + { + RegSetValueExA(hKey, szValueName, 0, REG_BINARY, + blobOut.pbData, blobOut.cbData); + LocalFree(blobOut.pbData); + } + } + HeapFree(GetProcessHeap(), 0, pbKey); + } + } + } +} + diff --git a/dlls/rsaenh/cryptoprovutils.h b/dlls/rsaenh/cryptoprovutils.h index 17d665e398..499b0b8140 100644 --- a/dlls/rsaenh/cryptoprovutils.h +++ b/dlls/rsaenh/cryptoprovutils.h @@ -39,7 +39,42 @@ typedef struct tagKEYCONTAINER HCRYPTKEY hSignatureKeyPair; } KEYCONTAINER; +typedef struct _SCHANNEL_INFO +{ + SCHANNEL_ALG saEncAlg; + SCHANNEL_ALG saMACAlg; + CRYPT_DATA_BLOB blobClientRandom; + CRYPT_DATA_BLOB blobServerRandom; +} SCHANNEL_INFO; + +#define RSAENH_MAX_KEY_SIZE 64 +#define RSAENH_MAX_BLOCK_SIZE 24 +typedef struct tagCRYPTKEY +{ + OBJECTHDR header; + ALG_ID aiAlgid; + HCRYPTPROV hProv; + DWORD dwMode; + DWORD dwModeBits; + DWORD dwPermissions; + DWORD dwKeyLen; + DWORD dwEffectiveKeyLen; + DWORD dwSaltLen; + DWORD dwBlockLen; + DWORD dwState; + KEY_CONTEXT context; + BYTE abKeyValue[RSAENH_MAX_KEY_SIZE]; + BYTE abInitVector[RSAENH_MAX_BLOCK_SIZE]; + BYTE abChainVector[RSAENH_MAX_BLOCK_SIZE]; + SCHANNEL_INFO siSChannelInfo; + CRYPT_DATA_BLOB blobHmacKey; +} CRYPTKEY; + BOOL create_container_key(KEYCONTAINER *pKeyContainer, REGSAM sam, HKEY *phKey); BOOL open_container_key(LPCSTR pszContainerName, DWORD dwFlags, REGSAM access, HKEY *phKey); BOOL delete_container_key(LPCSTR pszContainerName, DWORD dwFlags); +BOOL crypt_export_key(CRYPTKEY *pCryptKey, HCRYPTKEY hPubKey, DWORD dwBlobType, + DWORD dwFlags, BOOL force, BYTE *pbData, DWORD *pdwDataLen); +LPCSTR map_key_spec_to_key_pair_name(DWORD dwKeySpec); +void store_key_pair(HCRYPTKEY hCryptKey, HKEY hKey, DWORD dwKeySpec, DWORD dwFlags); #endif /* __WINE_CRYPTOPROVUTILS_H */ diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 069aee569f..8925abefab 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -67,44 +67,6 @@ typedef struct tagCRYPTHASH RSAENH_TLS1PRF_PARAMS tpPRFParams; } CRYPTHASH; -/****************************************************************************** - * CRYPTKEY - key objects - */ -#define RSAENH_MAGIC_KEY 0x73620457u -#define RSAENH_MAX_KEY_SIZE 64 -#define RSAENH_MAX_BLOCK_SIZE 24 -#define RSAENH_KEYSTATE_IDLE 0 -#define RSAENH_KEYSTATE_ENCRYPTING 1 -#define RSAENH_KEYSTATE_MASTERKEY 2 -typedef struct _RSAENH_SCHANNEL_INFO -{ - SCHANNEL_ALG saEncAlg; - SCHANNEL_ALG saMACAlg; - CRYPT_DATA_BLOB blobClientRandom; - CRYPT_DATA_BLOB blobServerRandom; -} RSAENH_SCHANNEL_INFO; - -typedef struct tagCRYPTKEY -{ - OBJECTHDR header; - ALG_ID aiAlgid; - HCRYPTPROV hProv; - DWORD dwMode; - DWORD dwModeBits; - DWORD dwPermissions; - DWORD dwKeyLen; - DWORD dwEffectiveKeyLen; - DWORD dwSaltLen; - DWORD dwBlockLen; - DWORD dwState; - KEY_CONTEXT context; - BYTE abKeyValue[RSAENH_MAX_KEY_SIZE]; - BYTE abInitVector[RSAENH_MAX_BLOCK_SIZE]; - BYTE abChainVector[RSAENH_MAX_BLOCK_SIZE]; - RSAENH_SCHANNEL_INFO siSChannelInfo; - CRYPT_DATA_BLOB blobHmacKey; -} CRYPTKEY; - /****************************************************************************** * Some magic constants */ @@ -293,16 +255,6 @@ RSAENH_CPDestroyHash( HCRYPTHASH hHash ); -static BOOL crypt_export_key( - CRYPTKEY *pCryptKey, - HCRYPTKEY hPubKey, - DWORD dwBlobType, - DWORD dwFlags, - BOOL force, - BYTE *pbData, - DWORD *pdwDataLen -); - static BOOL import_key( HCRYPTPROV hProv, const BYTE *pbData, @@ -325,7 +277,7 @@ RSAENH_CPHashData( /****************************************************************************** * CSP's handle table (used by all acquired key containers) */ -static struct handle_table handle_table; +struct handle_table handle_table; /****************************************************************************** * DllMain (RSAENH.@) @@ -910,86 +862,6 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK return hCryptKey; } -/****************************************************************************** - * map_key_spec_to_key_pair_name [Internal] - * - * Returns the name of the registry value associated with a key spec. - * - * PARAMS - * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE - * - * RETURNS - * Success: Name of registry value. - * Failure: NULL - */ -static LPCSTR map_key_spec_to_key_pair_name(DWORD dwKeySpec) -{ - LPCSTR szValueName; - - switch (dwKeySpec) - { - case AT_KEYEXCHANGE: - szValueName = "KeyExchangeKeyPair"; - break; - case AT_SIGNATURE: - szValueName = "SignatureKeyPair"; - break; - default: - WARN("invalid key spec %d\n", dwKeySpec); - szValueName = NULL; - } - return szValueName; -} - -/****************************************************************************** - * store_key_pair [Internal] - * - * Stores a key pair to the registry - * - * PARAMS - * hCryptKey [I] Handle to the key to be stored - * hKey [I] Registry key where the key pair is to be stored - * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE - * dwFlags [I] Flags for protecting the key - */ -static void store_key_pair(HCRYPTKEY hCryptKey, HKEY hKey, DWORD dwKeySpec, DWORD dwFlags) -{ - LPCSTR szValueName; - DATA_BLOB blobIn, blobOut; - CRYPTKEY *pKey; - DWORD dwLen; - BYTE *pbKey; - - if (!(szValueName = map_key_spec_to_key_pair_name(dwKeySpec))) - return; - if (lookup_handle(&handle_table, hCryptKey, RSAENH_MAGIC_KEY, - (OBJECTHDR**)&pKey)) - { - if (crypt_export_key(pKey, 0, PRIVATEKEYBLOB, 0, TRUE, 0, &dwLen)) - { - pbKey = HeapAlloc(GetProcessHeap(), 0, dwLen); - if (pbKey) - { - if (crypt_export_key(pKey, 0, PRIVATEKEYBLOB, 0, TRUE, pbKey, - &dwLen)) - { - blobIn.pbData = pbKey; - blobIn.cbData = dwLen; - - if (CryptProtectData(&blobIn, NULL, NULL, NULL, NULL, - dwFlags, &blobOut)) - { - RegSetValueExA(hKey, szValueName, 0, REG_BINARY, - blobOut.pbData, blobOut.cbData); - LocalFree(blobOut.pbData); - } - } - HeapFree(GetProcessHeap(), 0, pbKey); - } - } - } -} - /****************************************************************************** * map_key_spec_to_permissions_name [Internal] * @@ -2773,6 +2645,7 @@ static BOOL crypt_export_plaintext_key(CRYPTKEY *pCryptKey, BYTE *pbData, *pdwDataLen = dwDataLen; return TRUE; } + /****************************************************************************** * crypt_export_key [Internal] * @@ -2794,7 +2667,7 @@ static BOOL crypt_export_plaintext_key(CRYPTKEY *pCryptKey, BYTE *pbData, * Success: TRUE. * Failure: FALSE. */ -static BOOL crypt_export_key(CRYPTKEY *pCryptKey, HCRYPTKEY hPubKey, +BOOL crypt_export_key(CRYPTKEY *pCryptKey, HCRYPTKEY hPubKey, DWORD dwBlobType, DWORD dwFlags, BOOL force, BYTE *pbData, DWORD *pdwDataLen) { -- 2.21.0

2 1

[PATCH 03/10] dssenh: refactor rsaenh - move create_container_key, open_container_key, delete_container_key from rsaenh/rsaenh.c to rsaenh/cryptoprovutils.c
by shuai zhang Nov. 17, 2019

Nov. 17, 2019

Signed-off-by: Zhang Shuai <wxsxsdz(a)gmail.com> --- dlls/rsaenh/cryptoprovconfig.h | 7 +++ dlls/rsaenh/cryptoprovutils.c | 89 +++++++++++++++++++++++++++ dlls/rsaenh/cryptoprovutils.h | 16 +++++ dlls/rsaenh/rsaenh.c | 106 --------------------------------- 4 files changed, 112 insertions(+), 106 deletions(-) diff --git a/dlls/rsaenh/cryptoprovconfig.h b/dlls/rsaenh/cryptoprovconfig.h index da6d526be2..d282d0db1e 100644 --- a/dlls/rsaenh/cryptoprovconfig.h +++ b/dlls/rsaenh/cryptoprovconfig.h @@ -39,6 +39,8 @@ #define RSAENH_PERSONALITY_SCHANNEL 3u #define RSAENH_PERSONALITY_AES 4u +#define RSAENH_MAGIC_CONTAINER 0x26384993u + /****************************************************************************** * Used by new_key_container to determine the personality via provider name. * The first entry in aProvNamePersonalityPairs should be the default personality. @@ -60,4 +62,9 @@ static const PROVNAMEPERSONALITYPAIR aProvNamePersonalityPairs[6] = {MS_ENH_RSA_AES_PROV_XP_A, RSAENH_PERSONALITY_AES} }; +/****************************************************************************** + * Some magic constants + */ +#define RSAENH_REGKEY "Software\\Wine\\Crypto\\RSA\\%s" + #endif /* __WINE_CRYPTOPROVCONFIG_H */ diff --git a/dlls/rsaenh/cryptoprovutils.c b/dlls/rsaenh/cryptoprovutils.c index 76ee7bbe86..23e0e11626 100644 --- a/dlls/rsaenh/cryptoprovutils.c +++ b/dlls/rsaenh/cryptoprovutils.c @@ -32,3 +32,92 @@ #include "handle.h" #include "cryptoprovutils.h" #include "wine/debug.h" + +/****************************************************************************** + * create_container_key [Internal] + * + * Creates the registry key for a key container's persistent storage. + * + * PARAMS + * pKeyContainer [I] Pointer to the key container + * sam [I] Desired registry access + * phKey [O] Returned key + */ +BOOL create_container_key(KEYCONTAINER *pKeyContainer, REGSAM sam, HKEY *phKey) +{ + CHAR szRSABase[sizeof(RSAENH_REGKEY) + MAX_PATH]; + HKEY hRootKey; + + sprintf(szRSABase, RSAENH_REGKEY, pKeyContainer->szName); + + if (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET) + hRootKey = HKEY_LOCAL_MACHINE; + else + hRootKey = HKEY_CURRENT_USER; + + /* @@ Wine registry key: HKLM\Software\Wine\Crypto\RSA */ + /* @@ Wine registry key: HKCU\Software\Wine\Crypto\RSA */ + return RegCreateKeyExA(hRootKey, szRSABase, 0, NULL, + REG_OPTION_NON_VOLATILE, sam, NULL, phKey, NULL) + == ERROR_SUCCESS; +} + +/****************************************************************************** + * open_container_key [Internal] + * + * Opens a key container's persistent storage for reading. + * + * PARAMS + * pszContainerName [I] Name of the container to be opened. May be the empty + * string if the parent key of all containers is to be + * opened. + * dwFlags [I] Flags indicating which keyset to be opened. + * phKey [O] Returned key + */ +BOOL open_container_key(LPCSTR pszContainerName, DWORD dwFlags, REGSAM access, HKEY *phKey) +{ + CHAR szRSABase[sizeof(RSAENH_REGKEY) + MAX_PATH]; + HKEY hRootKey; + + sprintf(szRSABase, RSAENH_REGKEY, pszContainerName); + + if (dwFlags & CRYPT_MACHINE_KEYSET) + hRootKey = HKEY_LOCAL_MACHINE; + else + hRootKey = HKEY_CURRENT_USER; + + /* @@ Wine registry key: HKLM\Software\Wine\Crypto\RSA */ + /* @@ Wine registry key: HKCU\Software\Wine\Crypto\RSA */ + return RegOpenKeyExA(hRootKey, szRSABase, 0, access, phKey) == + ERROR_SUCCESS; +} + +/****************************************************************************** + * delete_container_key [Internal] + * + * Deletes a key container's persistent storage. + * + * PARAMS + * pszContainerName [I] Name of the container to be opened. + * dwFlags [I] Flags indicating which keyset to be opened. + */ +BOOL delete_container_key(LPCSTR pszContainerName, DWORD dwFlags) +{ + CHAR szRegKey[sizeof(RSAENH_REGKEY) + MAX_PATH]; + HKEY hRootKey; + + sprintf(szRegKey, RSAENH_REGKEY, pszContainerName); + + if (dwFlags & CRYPT_MACHINE_KEYSET) + hRootKey = HKEY_LOCAL_MACHINE; + else + hRootKey = HKEY_CURRENT_USER; + if (!RegDeleteKeyA(hRootKey, szRegKey)) { + SetLastError(ERROR_SUCCESS); + return TRUE; + } else { + SetLastError(NTE_BAD_KEYSET); + return FALSE; + } +} + diff --git a/dlls/rsaenh/cryptoprovutils.h b/dlls/rsaenh/cryptoprovutils.h index 832b09e4ce..17d665e398 100644 --- a/dlls/rsaenh/cryptoprovutils.h +++ b/dlls/rsaenh/cryptoprovutils.h @@ -26,4 +26,20 @@ #define __WINE_CRYPTOPROVUTILS_H #include <cryptoprovconfig.h> #include "implglue.h" +typedef struct tagKEYCONTAINER +{ + OBJECTHDR header; + DWORD dwFlags; + DWORD dwPersonality; + DWORD dwEnumAlgsCtr; + DWORD dwEnumContainersCtr; + CHAR szName[MAX_PATH]; + CHAR szProvName[MAX_PATH]; + HCRYPTKEY hKeyExchangeKeyPair; + HCRYPTKEY hSignatureKeyPair; +} KEYCONTAINER; + +BOOL create_container_key(KEYCONTAINER *pKeyContainer, REGSAM sam, HKEY *phKey); +BOOL open_container_key(LPCSTR pszContainerName, DWORD dwFlags, REGSAM access, HKEY *phKey); +BOOL delete_container_key(LPCSTR pszContainerName, DWORD dwFlags); #endif /* __WINE_CRYPTOPROVUTILS_H */ diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index e05785e142..069aee569f 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -105,23 +105,6 @@ typedef struct tagCRYPTKEY CRYPT_DATA_BLOB blobHmacKey; } CRYPTKEY; -/****************************************************************************** - * KEYCONTAINER - key containers - */ -#define RSAENH_MAGIC_CONTAINER 0x26384993u -typedef struct tagKEYCONTAINER -{ - OBJECTHDR header; - DWORD dwFlags; - DWORD dwPersonality; - DWORD dwEnumAlgsCtr; - DWORD dwEnumContainersCtr; - CHAR szName[MAX_PATH]; - CHAR szProvName[MAX_PATH]; - HCRYPTKEY hKeyExchangeKeyPair; - HCRYPTKEY hSignatureKeyPair; -} KEYCONTAINER; - /****************************************************************************** * Some magic constants */ @@ -144,7 +127,6 @@ typedef struct tagKEYCONTAINER #define RSAENH_SSL3_VERSION_MINOR 0 #define RSAENH_TLS1_VERSION_MAJOR 3 #define RSAENH_TLS1_VERSION_MINOR 1 -#define RSAENH_REGKEY "Software\\Wine\\Crypto\\RSA\\%s" #define RSAENH_MIN(a,b) ((a)<(b)?(a):(b)) /****************************************************************************** @@ -1064,94 +1046,6 @@ static void store_key_permissions(HCRYPTKEY hCryptKey, HKEY hKey, DWORD dwKeySpe sizeof(pKey->dwPermissions)); } -/****************************************************************************** - * create_container_key [Internal] - * - * Creates the registry key for a key container's persistent storage. - * - * PARAMS - * pKeyContainer [I] Pointer to the key container - * sam [I] Desired registry access - * phKey [O] Returned key - */ -static BOOL create_container_key(KEYCONTAINER *pKeyContainer, REGSAM sam, HKEY *phKey) -{ - CHAR szRSABase[sizeof(RSAENH_REGKEY) + MAX_PATH]; - HKEY hRootKey; - - sprintf(szRSABase, RSAENH_REGKEY, pKeyContainer->szName); - - if (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET) - hRootKey = HKEY_LOCAL_MACHINE; - else - hRootKey = HKEY_CURRENT_USER; - - /* @@ Wine registry key: HKLM\Software\Wine\Crypto\RSA */ - /* @@ Wine registry key: HKCU\Software\Wine\Crypto\RSA */ - return RegCreateKeyExA(hRootKey, szRSABase, 0, NULL, - REG_OPTION_NON_VOLATILE, sam, NULL, phKey, NULL) - == ERROR_SUCCESS; -} - -/****************************************************************************** - * open_container_key [Internal] - * - * Opens a key container's persistent storage for reading. - * - * PARAMS - * pszContainerName [I] Name of the container to be opened. May be the empty - * string if the parent key of all containers is to be - * opened. - * dwFlags [I] Flags indicating which keyset to be opened. - * phKey [O] Returned key - */ -static BOOL open_container_key(LPCSTR pszContainerName, DWORD dwFlags, REGSAM access, HKEY *phKey) -{ - CHAR szRSABase[sizeof(RSAENH_REGKEY) + MAX_PATH]; - HKEY hRootKey; - - sprintf(szRSABase, RSAENH_REGKEY, pszContainerName); - - if (dwFlags & CRYPT_MACHINE_KEYSET) - hRootKey = HKEY_LOCAL_MACHINE; - else - hRootKey = HKEY_CURRENT_USER; - - /* @@ Wine registry key: HKLM\Software\Wine\Crypto\RSA */ - /* @@ Wine registry key: HKCU\Software\Wine\Crypto\RSA */ - return RegOpenKeyExA(hRootKey, szRSABase, 0, access, phKey) == - ERROR_SUCCESS; -} - -/****************************************************************************** - * delete_container_key [Internal] - * - * Deletes a key container's persistent storage. - * - * PARAMS - * pszContainerName [I] Name of the container to be opened. - * dwFlags [I] Flags indicating which keyset to be opened. - */ -static BOOL delete_container_key(LPCSTR pszContainerName, DWORD dwFlags) -{ - CHAR szRegKey[sizeof(RSAENH_REGKEY) + MAX_PATH]; - HKEY hRootKey; - - sprintf(szRegKey, RSAENH_REGKEY, pszContainerName); - - if (dwFlags & CRYPT_MACHINE_KEYSET) - hRootKey = HKEY_LOCAL_MACHINE; - else - hRootKey = HKEY_CURRENT_USER; - if (!RegDeleteKeyA(hRootKey, szRegKey)) { - SetLastError(ERROR_SUCCESS); - return TRUE; - } else { - SetLastError(NTE_BAD_KEYSET); - return FALSE; - } -} - /****************************************************************************** * store_key_container_keys [Internal] * -- 2.21.0

2 1

[PATCH 02/10] dssenh: refactor rsaenh - table driven new_key_container.
by shuai zhang Nov. 17, 2019

Nov. 17, 2019

Signed-off-by: Zhang Shuai <wxsxsdz(a)gmail.com> --- dlls/rsaenh/cryptoprovconfig.h | 32 ++++++++++++++++++++++++++++++++ dlls/rsaenh/rsaenh.c | 27 ++++++++++----------------- 2 files changed, 42 insertions(+), 17 deletions(-) diff --git a/dlls/rsaenh/cryptoprovconfig.h b/dlls/rsaenh/cryptoprovconfig.h index 79a93a85f4..da6d526be2 100644 --- a/dlls/rsaenh/cryptoprovconfig.h +++ b/dlls/rsaenh/cryptoprovconfig.h @@ -28,4 +28,36 @@ #ifndef __WINE_CRYPTOPROVCONFIG_H #define __WINE_CRYPTOPROVCONFIG_H +#include "wincrypt.h" + +/****************************************************************************** + * KEYCONTAINER - key containers + */ +#define RSAENH_PERSONALITY_BASE 0u +#define RSAENH_PERSONALITY_STRONG 1u +#define RSAENH_PERSONALITY_ENHANCED 2u +#define RSAENH_PERSONALITY_SCHANNEL 3u +#define RSAENH_PERSONALITY_AES 4u + +/****************************************************************************** + * Used by new_key_container to determine the personality via provider name. + * The first entry in aProvNamePersonalityPairs should be the default personality. + */ +typedef struct tagPROVNAMEPERSONALITYPAIR +{ + LPCSTR pszProvName; + DWORD dwPersonality; +} PROVNAMEPERSONALITYPAIR; + +static const DWORD dwNProvNamePersonalityPairs = 6; +static const PROVNAMEPERSONALITYPAIR aProvNamePersonalityPairs[6] = +{ + {"", RSAENH_PERSONALITY_STRONG}, + {MS_DEF_PROV_A, RSAENH_PERSONALITY_BASE}, + {MS_ENHANCED_PROV_A, RSAENH_PERSONALITY_ENHANCED}, + {MS_DEF_RSA_SCHANNEL_PROV_A, RSAENH_PERSONALITY_SCHANNEL}, + {MS_ENH_RSA_AES_PROV_A, RSAENH_PERSONALITY_AES}, + {MS_ENH_RSA_AES_PROV_XP_A, RSAENH_PERSONALITY_AES} +}; + #endif /* __WINE_CRYPTOPROVCONFIG_H */ diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index f8fbd8071a..e05785e142 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -108,12 +108,6 @@ typedef struct tagCRYPTKEY /****************************************************************************** * KEYCONTAINER - key containers */ -#define RSAENH_PERSONALITY_BASE 0u -#define RSAENH_PERSONALITY_STRONG 1u -#define RSAENH_PERSONALITY_ENHANCED 2u -#define RSAENH_PERSONALITY_SCHANNEL 3u -#define RSAENH_PERSONALITY_AES 4u - #define RSAENH_MAGIC_CONTAINER 0x26384993u typedef struct tagKEYCONTAINER { @@ -1270,6 +1264,7 @@ static HCRYPTPROV new_key_container(PCCH pszContainerName, DWORD dwFlags, const { KEYCONTAINER *pKeyContainer; HCRYPTPROV hKeyContainer; + DWORD i; hKeyContainer = new_object(&handle_table, sizeof(KEYCONTAINER), RSAENH_MAGIC_CONTAINER, destroy_key_container, (OBJECTHDR**)&pKeyContainer); @@ -1282,17 +1277,15 @@ static HCRYPTPROV new_key_container(PCCH pszContainerName, DWORD dwFlags, const pKeyContainer->hSignatureKeyPair = (HCRYPTKEY)INVALID_HANDLE_VALUE; if (pVTable && pVTable->pszProvName) { lstrcpynA(pKeyContainer->szProvName, pVTable->pszProvName, MAX_PATH); - if (!strcmp(pVTable->pszProvName, MS_DEF_PROV_A)) { - pKeyContainer->dwPersonality = RSAENH_PERSONALITY_BASE; - } else if (!strcmp(pVTable->pszProvName, MS_ENHANCED_PROV_A)) { - pKeyContainer->dwPersonality = RSAENH_PERSONALITY_ENHANCED; - } else if (!strcmp(pVTable->pszProvName, MS_DEF_RSA_SCHANNEL_PROV_A)) { - pKeyContainer->dwPersonality = RSAENH_PERSONALITY_SCHANNEL; - } else if (!strcmp(pVTable->pszProvName, MS_ENH_RSA_AES_PROV_A) || - !strcmp(pVTable->pszProvName, MS_ENH_RSA_AES_PROV_XP_A)) { - pKeyContainer->dwPersonality = RSAENH_PERSONALITY_AES; - } else { - pKeyContainer->dwPersonality = RSAENH_PERSONALITY_STRONG; + pKeyContainer->dwPersonality + = aProvNamePersonalityPairs[0].dwPersonality; + for (i = 1; i < dwNProvNamePersonalityPairs; i++) { + if (!strcmp(pVTable->pszProvName, + aProvNamePersonalityPairs[i].pszProvName)) { + pKeyContainer->dwPersonality + = aProvNamePersonalityPairs[i].dwPersonality; + break; + } } } -- 2.21.0

2 1

[PATCH 01/10] dssenh: refactor rsaenh - create new files.
by shuai zhang Nov. 17, 2019

Nov. 17, 2019

Hello everyone, I'm implementing dssenh. I think the behaviour of dssenh is already well-understood (at least for CPAcquireContext and CPReleaseContext) through dssenh/tests. And I guess more than 65% of rsaenh's code can be reused so I am trying to refactor rsaenh so that those codes can be used by dssenh. Details are in the patch series (they are mostly trivial copy/pastes). Currently implemented CPAcquireContext and CPReleaseContext for dssenh. Signed-off-by: Zhang Shuai <wxsxsdz(a)gmail.com> --- dlls/rsaenh/Makefile.in | 3 ++- dlls/rsaenh/cryptoprovconfig.h | 31 +++++++++++++++++++++++++++++++ dlls/rsaenh/cryptoprovutils.c | 34 ++++++++++++++++++++++++++++++++++ dlls/rsaenh/cryptoprovutils.h | 29 +++++++++++++++++++++++++++++ dlls/rsaenh/rsaenh.c | 1 + 5 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 dlls/rsaenh/cryptoprovconfig.h create mode 100644 dlls/rsaenh/cryptoprovutils.c create mode 100644 dlls/rsaenh/cryptoprovutils.h diff --git a/dlls/rsaenh/Makefile.in b/dlls/rsaenh/Makefile.in index 80680d6622..dd8574fcaf 100644 --- a/dlls/rsaenh/Makefile.in +++ b/dlls/rsaenh/Makefile.in @@ -13,6 +13,7 @@ C_SRCS = \ rc2.c \ rc4.c \ rsa.c \ - rsaenh.c + rsaenh.c \ + cryptoprovutils.c RC_SRCS = rsrc.rc diff --git a/dlls/rsaenh/cryptoprovconfig.h b/dlls/rsaenh/cryptoprovconfig.h new file mode 100644 index 0000000000..79a93a85f4 --- /dev/null +++ b/dlls/rsaenh/cryptoprovconfig.h @@ -0,0 +1,31 @@ +/* + * dlls/rsaenh/cryptoprovconfig.h + * Definitions of some constants used by crypto provider. + * It is copied to build dir then included by cryptoprovutils.h, + * the build dir comes first in include search paths. + * So a new provider implementation only needs to provide its own + * cryptoprovconfig.h. + * + * Copyright 2002 TransGaming Technologies (David Hammerton) + * Copyright 2004 Mike McCormack for CodeWeavers + * Copyright 2004, 2005 Michael Jung + * Copyright 2007 Vijay Kiran Kamuju + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_CRYPTOPROVCONFIG_H +#define __WINE_CRYPTOPROVCONFIG_H +#endif /* __WINE_CRYPTOPROVCONFIG_H */ diff --git a/dlls/rsaenh/cryptoprovutils.c b/dlls/rsaenh/cryptoprovutils.c new file mode 100644 index 0000000000..76ee7bbe86 --- /dev/null +++ b/dlls/rsaenh/cryptoprovutils.c @@ -0,0 +1,34 @@ +/* + * dlls/rsaenh/cryptoprovutils.c + * Utility functions to implement crypto privider. + * + * Copyright 2002 TransGaming Technologies (David Hammerton) + * Copyright 2004 Mike McCormack for CodeWeavers + * Copyright 2004, 2005 Michael Jung + * Copyright 2007 Vijay Kiran Kamuju + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "wincrypt.h" +#include "handle.h" +#include "cryptoprovutils.h" +#include "wine/debug.h" diff --git a/dlls/rsaenh/cryptoprovutils.h b/dlls/rsaenh/cryptoprovutils.h new file mode 100644 index 0000000000..832b09e4ce --- /dev/null +++ b/dlls/rsaenh/cryptoprovutils.h @@ -0,0 +1,29 @@ +/* + * dlls/rsaenh/cryptoprovutils.h + * Header of utility functions to implement crypto privider. + * + * Copyright 2002 TransGaming Technologies (David Hammerton) + * Copyright 2004 Mike McCormack for CodeWeavers + * Copyright 2004, 2005 Michael Jung + * Copyright 2007 Vijay Kiran Kamuju + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_CRYPTOPROVUTILS_H +#define __WINE_CRYPTOPROVUTILS_H +#include <cryptoprovconfig.h> +#include "implglue.h" +#endif /* __WINE_CRYPTOPROVUTILS_H */ diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 9119d4be2d..f8fbd8071a 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -34,6 +34,7 @@ #include "objbase.h" #include "rpcproxy.h" #include "aclapi.h" +#include "cryptoprovutils.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); -- 2.21.0

2 1

[PATCH v3] wintab32: Use 64-bit math in ScaleForContext.
by John Chadwick Nov. 17, 2019

Nov. 17, 2019

With some tablet configurations, the InExt value passed to ScaleForContext can be very large, leading to an integer overflow. Using MulDiv prevents this problem by internally using 64-bit math. --- dlls/wintab32/context.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 0514dd78b4..ff9a4ca677 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -178,9 +178,9 @@ int TABLET_PostTabletMessage(LPOPENCONTEXT newcontext, UINT msg, WPARAM wParam, static inline DWORD ScaleForContext(DWORD In, LONG InOrg, LONG InExt, LONG OutOrg, LONG OutExt) { if (((InExt > 0 )&&(OutExt > 0)) || ((InExt<0) && (OutExt < 0))) - return ((In - InOrg) * abs(OutExt) / abs(InExt)) + OutOrg; + return MulDiv(In - InOrg, abs(OutExt), abs(InExt)) + OutOrg; else - return ((abs(InExt) - (In - InOrg))*abs(OutExt) / abs(InExt)) + OutOrg; + return MulDiv(abs(InExt) - (In - InOrg), abs(OutExt), abs(InExt)) + OutOrg; } LPOPENCONTEXT AddPacketToContextQueue(LPWTPACKET packet, HWND hwnd) -- 2.23.0

1 0

Visual Studio 2015 compiled Versus MinGW cross-compiled code?
by Thales Nov. 16, 2019

Nov. 16, 2019

Hello, I've been stuck on this issue, where code compiled in Visual Studio (C++) and code compiled via the cross-compiler, MinGW, in a Wine test are behaving differently (I'm using Ubuntu 16.04). It is surprising me, because these are a few virtually identical API level calls and I assumed that would result in the same behavior. This is code from dlls/comctl32/tests/combo.c, compiled in the mirrored 64-bit build folder . I wrote a small test function in Wine, compiled and ran it. I wrote the same test in Visual Studio. These are all API level calls. It is with Visual Studio that I boiled the bug I'm working on to a few sequential API calls, but, strangely, the cross-compiled code doesn't give the same results. I ran them both on Windows 10 and Windows 7. I can provide details, but I wonder if anyone has any insights concern these differences? Thanks!...John Alway

2 7

[PATCH v5] tapi/tests: add initial tests for lineInitialize
by Vijay Kiran Kamuju Nov. 16, 2019

Nov. 16, 2019

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- configure | 1 + configure.ac | 1 + dlls/tapi32/tests/Makefile.in | 5 +++ dlls/tapi32/tests/tapi.c | 62 +++++++++++++++++++++++++++++++++++ include/tapi.h | 2 +- 5 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 dlls/tapi32/tests/Makefile.in create mode 100644 dlls/tapi32/tests/tapi.c diff --git a/configure b/configure index 483efc02d3a9..bcc08e4412de 100755 --- a/configure +++ b/configure @@ -20844,6 +20844,7 @@ wine_fn_config_makefile dlls/system.drv16 enable_win16 wine_fn_config_makefile dlls/t2embed enable_t2embed wine_fn_config_makefile dlls/t2embed/tests enable_tests wine_fn_config_makefile dlls/tapi32 enable_tapi32 +wine_fn_config_makefile dlls/tapi32/tests enable_tests wine_fn_config_makefile dlls/taskschd enable_taskschd wine_fn_config_makefile dlls/taskschd/tests enable_tests wine_fn_config_makefile dlls/tdh enable_tdh diff --git a/configure.ac b/configure.ac index 64721e96449f..52e211c97983 100644 --- a/configure.ac +++ b/configure.ac @@ -3694,6 +3694,7 @@ WINE_CONFIG_MAKEFILE(dlls/system.drv16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/t2embed) WINE_CONFIG_MAKEFILE(dlls/t2embed/tests) WINE_CONFIG_MAKEFILE(dlls/tapi32) +WINE_CONFIG_MAKEFILE(dlls/tapi32/tests) WINE_CONFIG_MAKEFILE(dlls/taskschd) WINE_CONFIG_MAKEFILE(dlls/taskschd/tests) WINE_CONFIG_MAKEFILE(dlls/tdh) diff --git a/dlls/tapi32/tests/Makefile.in b/dlls/tapi32/tests/Makefile.in new file mode 100644 index 000000000000..126eed1c85ce --- /dev/null +++ b/dlls/tapi32/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = tapi32.dll +IMPORTS = tapi32 + +C_SRCS = \ + tapi.c diff --git a/dlls/tapi32/tests/tapi.c b/dlls/tapi32/tests/tapi.c new file mode 100644 index 000000000000..13772c8c7d49 --- /dev/null +++ b/dlls/tapi32/tests/tapi.c @@ -0,0 +1,62 @@ +/* + * TAPI32 API tests + * + * Copyright 2019 Vijay Kiran Kamuju + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "tapi.h" + +#include "wine/test.h" + +static void CALLBACK line_callback(DWORD hDev, DWORD dwMsg, DWORD_PTR dwInst, DWORD_PTR param1, DWORD_PTR param2, DWORD_PTR param3) +{ +} + +static void test_lineInitialize(void) +{ + ULONG ret; + DWORD dev; + HLINEAPP lnApp; + + ret = lineInitialize(NULL, NULL, NULL, NULL, NULL); + todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + + ret = lineInitialize(&lnApp, NULL, NULL, NULL, NULL); + todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + + ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), NULL, NULL, NULL); + todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + + ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), line_callback, NULL, NULL); + todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + + ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), line_callback, NULL, &dev); + ok(!ret, "unexpected return value, got %u.\n", ret); + + ret = lineShutdown(NULL); + todo_wine ok(ret == LINEERR_INVALAPPHANDLE, "Expected return value LINEERR_INVALAPPHANDLE, got %x.\n", ret); + + ret = lineShutdown(lnApp); + ok(!ret, "unexpected return value, got %u.\n", ret); +} + +START_TEST(tapi) +{ + test_lineInitialize(); +} diff --git a/include/tapi.h b/include/tapi.h index 52ec619aef31..535ca67a4295 100644 --- a/include/tapi.h +++ b/include/tapi.h @@ -761,7 +761,7 @@ typedef struct linemessage_tag { DWORD_PTR dwParam3; } LINEMESSAGE, *LPLINEMESSAGE; -typedef void (CALLBACK *LINECALLBACK)(DWORD, DWORD, DWORD, DWORD, DWORD, DWORD); +typedef void (CALLBACK *LINECALLBACK)(DWORD, DWORD, DWORD_PTR, DWORD_PTR, DWORD_PTR, DWORD_PTR); typedef struct _PHONEAPP { int dummy; -- 2.21.0

1 0

wine-4.0.3-rc1 Available
by Michael Stefaniuc Nov. 16, 2019

Nov. 16, 2019

Hello guys, I have pushed wine-4.0.3-rc1 (with tag) to https://github.com/mstefani/wine-stable/tree/stable https://people.redhat.com/mstefani/wine/stable/ Nothing really crazy this time. One regression pulled together with the fix: 65956ae50a ==> bug 47546 ==> fixed by 378204527e Oh, there are now 2 test failures for me in wininet/http.c due to the winehq.org server update. I've pulled in 5b406e1446a7 that supposedly dealt with those but it doesn't for me. So if somebody has an idea please let me know. If not I'll ignore them as they show now also in 4.0.2. The important stuff from the ANNOUNCE file: What's new in this release (see below for details): - Various bug fixes - Updates to the National Language Support files ---------------------------------------------------------------- Bugs fixed in 4.0.3 (total 54): 8848 SWAT4 Areas that should be in shadow and people are rendered solid black 12332 Microsoft Windows Server 2003 DDK SP1 installer crashes ('setupapi.SetupCloseFil 14695 Lifeforce demo misses codecs (msvideo1 needs to support 24 bpp output) 25180 Clonk Endeavour's intro video is not rendered correctly (iccvid does not support non-multiple of 4 video width) 27185 Futuremark PC Mark 7 (.NET 4.0 app) fails to run with Wine-Mono (mscoree:get_runtime Unrecognized version L"v4.0.20926") 28196 Test Drive Unlimited: Water is always rendered on top of everything. 31350 Multiple .NET 3.x WPF applications crash in Vista/Win7 mode due to dwmapi.DwmGetTransportAttributes stub returning E_NOTIMPL (T-Online Mediencenter Assistent, Valil.Chess, Zwift 1.0) 38182 King of Dragon Pass: can't change audio volume level 38421 Windows Media Player 9 & 10: mp3 sound plays too fast 38423 Python 3.5.x exe installer fails with Access denied error 39129 Cygwin's dash.exe crashes during installation 39614 Wine initialises a Critical Section for Mutexes by NULL instead of (void*)-1 41657 CoolQ 5.x reports network error on startup due to msscript:ScriptControl_Eval stub 42078 Dungeons & Dragons: Chronicles of Mystara needs d3dx11_43.dll.D3DX11CreateShaderResourceViewFromMemory 42374 Hardwood Solitaire can not connect to his server 43286 WSARecvMsg wrongly forbids NULL control buffers (Qt 5.7.0 based: Cannot read UDP packets: "errno 90, (Message too long)") 45218 Fallout 4 Script Extender fails to allocate trampoline buffers 45449 Add diagnostic 'mscoree.dll.CorGetSvc' stub (NGEN client) to hint at broken Microsoft .NET Frameworks installation (Wine-Mono not uninstalled and/or 'mscoree.dll' placeholders not removed prior install) 45757 Visual Studio 2017 Installer - "The installer manifest failed signature validation" 45947 Native Access crashes on unimplemented function virtdisk.dll.OpenVirtualDisk 46450 Volume Control doesn't work in Firefox videos (and browsers based on it) with PulseAudio driver 46453 The Testament of Sherlock Holmes crashes while loading level with builtin d3dx9_43 46473 Settlers IV History Edition crashes on startup 46558 win64 dotnet Space Engineers fractal noise generation broken 46655 Adobe Photoshop CC 2015.5: Tabs show completely black 46905 Multiple eventlog monitor applications go haywire (endless console spam, live-loop CPU) due to advapi32.ReadEventLogA/W returning lasterror ERROR_CALL_NOT_IMPLEMENTED 47013 winebus.sys: hidraw_set_feature_report buffer too small for some devices in SteelSeries Engine 47023 Warframe in-game screenshot fails if screenshot directory already exists 47069 Final Fantasy XIV Launcher renders black (needs better get_Busy implementation) 47082 NI System Web Server crashes on unimplemented function authz.dll.AuthzFreeResourceManager 47129 Rendering glitch in Caste Siege/Ballerburg (invalid vertex count in IDirect3DDevice3::DrawIndexedPrimitiveVB) 47137 Multiple applications from Line 6 (Yamaha Guitar Group) crash on startup (HX Edit v2.71, POD Farm 2.5)(Wine builtin 'gdiplus.dll' missing version resource) 47143 Trackbar thumb is too small in Metatrader 4 expert advisor 47178 Grand Prix Legends: Service papycpu2 doesn't load 47190 Custom protocol handler CF doesn't support aggregation 47214 Oracle Java runtime 8.211 online installer crashes in WoW64 47234 Wine fails to properly parse and import some of the standard root certificates 47236 Adobe InDesign CC 2017: crashes at startup: unimplemented function msvcp140.dll._Strxfrm 47249 CM_Set_Class_Registry_Property should use PCVOID for buffer parameter 47285 widl generates incorrect format strings when using -Oicf flag 47327 Japanese texts are overlapped in notepad when using bitmap font. 47352 Levelhead: Can't connect to game's network 47367 Some WPF 4.x apps from Windows 10 SDK (10.0.17763.x) spam console with fixme:d3d:wined3d_driver_info_init Unhandled OS version 6.3, reporting Win 8. (WinVer set to 'Windows 8.1') 47399 Mozart 11-13 crashes on startup 47418 Quickbooks 2018 installer crashes on Validating Install 47424 DataTransferLength in SCSI_PASS_THROUGH and SCSI_PASS_THROUGH_DIRECT *must* have return value 47432 bcrypt always chooses ECB mode when using AES, even if a program indicates otherwise. 47437 Final Fantasy XIV 5.0 crashes on startup when using xaudio2_8.dll 47514 AviUtl: Can't add a file to the ExEdit dialog after the first drop. 47546 Touhou 14-17 experience Spell Name and Music Room text issues starting in Wine 4.1 47564 Database mistmatch on brazillian timezone (America/Sao_Paulo) 47578 Omni-NFS 4.13's XLPD Server crashes on unimplemented function ntoskrnl.exe.MmIsThisAnNtAsSystem 47586 The Sims 1 visually freezes after alt-tabbing when in fullscreen mode 47706 ntdll: Compiler warnings regression on x86_64 [stable] ---------------------------------------------------------------- Changes since 4.0.2: Akihiro Sagawa (4): usp10/tests: Add advance width tests with CJK bitmap font. usp10: Fix advance width when glyph is missing. shell32/tests: Add DragQueryPoint tests. shell32: Fix return value for DragQueryPoint. Alex Henrie (2): ntoskrnl: Add MmIsThisAnNtAsSystem(). server: Fix use after free in add_committed_range (scan-build). Alexandre Julliard (5): ntdll: Use the correct type for %llu scanf format. server: Fix the returned error code for an invalid NT header offset. widl: Use %define parse.error verbose instead of %error-verbose. d3dcompiler: Use %define parse.error verbose instead of %error-verbose. wbemprox: Use %define parse.error verbose instead of %error-verbose. Alistair Leslie-Hughes (5): authz: Add AuthzFreeResourceManager stub. winebus.sys: Increase buffer size to match max length available. wininet: Always set last error in InternetReadFile. dinput: Ensure buffer doesn't overflow (Coverity). advapi32: Don't read a value that might be uninitialized (Coverity). Andrew Eikum (1): ntdll: Fix memory region check in NtQueryVirtualMemory. Andrey Gusev (1): d3dx11: Fix D3DX11CreateShaderResourceViewFromMemory spec entry. Aric Stewart (1): dinput: Handle case where IOHIDDeviceGetValue fails. Austin English (1): advapi32: In ReadEventLogA/W, return ERROR_HANDLE_EOF instead of ERROR_CALL_NOT_IMPLEMENTED. Bryon Roche (1): windowscodecs: Byte swap png read/write for 16-bpp data. Damjan Jovanovic (1): ws2_32: WSARecvMsg allows a NULL control buffer when no control messages arrive. Dmitry Timoshkov (6): crypt32: CryptMsgUpdate should skip broken certificates. urlmon/tests: Add a test for ProtocolCF_CreateInstance not supporting aggregation. urlmon: If ProtocolCF_CreateInstance doesn't support aggregation retry without it. windowscodecs/tests: Add a bunch of new tests for indexed format conversions. windowscodecs: Add support for 32bppRGB, 32bppRGBA and 32bppPRGBA to format converter. msvcrt: Fix handling of dst == src in wcscpy_s. Enol Puente (3): wrc: Add Asturian locale. wmc: Support Asturian. kernel32: Add Asturian locale. Erich Hoover (2): advapi32: Move the DACL combining code into a separate routine. advapi32: Fix the initialization of combined DACLs when the new DACL is empty. Ethan Lee (1): xaudio2: Export functions by ordinal. Fabian Maurer (2): gdi32: CreatePolyPolygonRgn() returns an empty region when the area is empty. setupapi: Correct function parameter for CM_Set_Class_Registry_PropertyA/W. Gabriel Ivăncescu (4): winealsa.drv: Adjust the buffer volume before sending it to ALSA. winepulse.drv: Adjust the buffer volume before sending it to PulseAudio. comctl32/listbox: Fix mouse wheel scrolling for multi-column listboxes. user32/listbox: Fix mouse wheel scrolling for multi-column listboxes. Gijs Vermeulen (1): wine.inf: Update E. South America Standard Time. Hans Leidekker (5): bcrypt: Implement BCryptGenerate/FinalizeKeyPair for ECDH P256. bcrypt: Ignore the size parameter in BCRYPT_CHAINING_MODE setters. winhttp/tests: Fix some test failures. winhttp: Propagate request errors in request_wait. wininet/tests: Fix FTP test failures. Henri Verbeet (2): wined3d: Handle Windows 8.1 in wined3d_driver_info_init(). wined3d: Add GPU information for AMD VEGA12. Jacek Caban (2): ieframe: Keep Busy property in sync with download state. msxml3: Fix string length handling in I[VB]SAXContentHandler::characters. Jactry Zeng (1): msscript: Partially implement IScriptControl::Eval(). Jeff Smith (1): d3drm: Fix reference leak in d3drm_viewport2_Clear(). John Thomson (1): shell32: Do not fail in SHCreateDirectoryExW for ERROR_ALREADY_EXISTS. Kai Krakow (1): wined3d: Add GPU information for NVIDIA GTX 1660 Ti. Ken Thomases (1): winemac: Fix failure to render OpenGL on macOS 10.14 (Mojave). Kristján Gerhardsson (3): wined3d: Add GPU information for various Mac GPUs. wined3d: Add GPU information for AMD VEGA20. wined3d: Add GPU information for a few more Intel KBL GPUs. Louis Lenders (2): dwmapi: Return DWM_E_COMPOSITIONDISABLED instead of E_NOTIMPL in DwmGetTransportAttributes. gdiplus: Add version resource. Martin Liska (1): include: Avoid compound literals for WCHAR strings. Michael Müller (5): avifil32: Correctly handle compressed frames when desired format is specified. wininet: Allow to set INTERNET_OPTION_HTTP_DECODING on sessions and connections. iccvid: Fix calculation of stride and size. msvidc32: Add support for converting 16 bit depth to 24 bit. msvidc32: Fix calculation of stride and size. Nikolay Sivov (7): kernel32/tests: Add a test for critical section DebugInfo initial value. ntdll: Initialize critical section debug info with correct pointer value. comctl32/trackbar: Do not consider window size when initializing fixed length thumb. kernel32/nls: Add LOCALE_SPERCENT locale data. kernel32/nls: Add LOCALE_SPERMILLE data. kernel32/nls: Add percent formatting values. kernel32/nls: Add locale data for positive and negative infinity. Owen Rudge (1): wininet/tests: Fix http tests to reflect current state of winehq test server. Paul Gofman (14): d3dx9: Factor out {lock|unlock}_surface() functions. d3dx9: Use temporary surface in D3DXFillTexture() for unmappable textures. d3dx9: Do not ignore surface map failure in D3DXSaveSurfaceToFileInMemory(). d3dx9: Use temporary surface in D3DXSaveSurfaceToFileInMemory() for unmappable textures. d3dx9: Use {lock|unlock}_surface() in D3DXLoadSurfaceFromMemory(). d3dx9: Pass rectangle to {lock|unlock}_surface(). wined3d: Apply stencil mask to stencil reference value. ddraw: Fix vertex count in d3d_device3_DrawIndexedPrimitiveVB(). wined3d: Use 3 component norm for 'nrm' opcode in GLSL backend. ddraw: Return DDERR_SURFACELOST from _GetAttachedSurface() if surface is lost. ddraw: Restore complex attached surfaces when restoring surface. ddraw/tests: Test restoring attached surface for ddraw4. ddraw/tests: Test restoring attached surface for ddraw2. ddraw/tests: Test restoring attached surface for ddraw1. Piotr Caban (2): msvcp: Add _Strxfrm implementation. services: Don't double release process in service_start. Qian Hong (1): advapi32: Initialize the LsaLookupSids() LSA_TRANSLATED_NAME.Name string properly. Rémi Bernon (1): wined3d: Add GPU information for Intel UHD Graphics 620. Stefan Dösinger (1): include: Remove backslashes from D3D12_COLOR_WRITE_ENABLE_ALL. Sven Baars (8): wmp: Fix a crash in put_volume when basic_audio is NULL. shell32: Fix an item identifier list leak (Valgrind). user32: Fix some leaks on error path (Coverity). msrle32: Fix a memory leak (Valgrind). comctl32: Always free the tooltip text before setting it (Valgrind). d3dx9: Release the full parameter name when a parameter is released (Valgrind). d3dx9: Always free samplers (Valgrind). shell32: Fix a use after free (Coverity). Tim Schumacher (1): services: Allow reading binary registry values as DWORDs. Vijay Kiran Kamuju (12): virtdisk: Add stub and tests for OpenVirtualDisk. kernel/nls: Fix country name in Tatar locale. kernel/nls: Fix LOCALE_SNAME for Azeri (Cyrillic). kernel/nls: Fix LOCALE_SNAME for Uzbek (Cyrillic). kernel/nls: Fix LOCALE_SNAME for Serbian (Cyrillic). kernel/nls: Fix country name and sname in English-Caribbean locale. kernel/nls: Fix country name in Manx Gaelic locale. kernel/nls: Add LOCALE_SMONTHDAY to all supported languages. kernel/nls: Fix LOCALE_SLONGDATE and LOCALE_SYEARMONTH for some chinese locales. kernel32: Add implementation of CAL_SSHORTESTDAYNAME*. kernel32: Add implementation for CAL_SMONTHDAY. kernel/nls: Fix LOCALE_SABBREVCTRYNAME for Serbian. Vincent Povirk (3): mscoree: Accept old framework build in exe metadata. windowscodecs: Treat 16-bit channels as little endian. mscoree: Add diagnostic CorGetSvc stub. Zebediah Figura (14): setupapi: Add magic bytes to struct file_queue and validate them in SetupCloseFileQueue(). msxml3: Load the version 1 typelib before trying to access it. widl: Use IsSimpleRef only for explicitly declared arrays. widl: Also allocate top-level pointers to arrays as on-stack in -Oicf mode. widl: Mark unions, user types, and ranges as IsSimpleRef. quartz/tests: Clean up CommitDecommitTest(). quartz/tests: Add more tests for standard media samples. quartz/memallocator: Clear some sample properties when freeing the sample. msi: Close all handles opened by a custom action thread. ntdll: Correctly fill DataTransferLength in SCSI_PASS_THROUGH and SCSI_PASS_THROUGH_DIRECT. ucrtbase/tests: Add some tests for __stdio_common_vsscanf(). ucrtbase: Write the %hh prefix as a single char. d3d8/tests: Flush events after sending SC_MAXIMIZE. d3d9/tests: Add another flush to work around an intermittent test failure on fvwm2. Zhiyi Zhang (3): d3d9/tests: Add a test for stencil reference value truncation. wined3d: Truncate stencil reference values to the stencil component size. msctf: Add ITfContextOwnerCompositionServices stub. -- Michael Stefaniuc mstefani(a)winehq.org

1 0

[PATCH v4] tapi/tests: add initial tests for lineInitialize
by Vijay Kiran Kamuju Nov. 16, 2019

Nov. 16, 2019

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- configure | 1 + configure.ac | 1 + dlls/tapi32/tests/Makefile.in | 5 +++ dlls/tapi32/tests/tapi.c | 62 +++++++++++++++++++++++++++++++++++ 4 files changed, 69 insertions(+) create mode 100644 dlls/tapi32/tests/Makefile.in create mode 100644 dlls/tapi32/tests/tapi.c diff --git a/configure b/configure index 483efc02d3a9..bcc08e4412de 100755 --- a/configure +++ b/configure @@ -20844,6 +20844,7 @@ wine_fn_config_makefile dlls/system.drv16 enable_win16 wine_fn_config_makefile dlls/t2embed enable_t2embed wine_fn_config_makefile dlls/t2embed/tests enable_tests wine_fn_config_makefile dlls/tapi32 enable_tapi32 +wine_fn_config_makefile dlls/tapi32/tests enable_tests wine_fn_config_makefile dlls/taskschd enable_taskschd wine_fn_config_makefile dlls/taskschd/tests enable_tests wine_fn_config_makefile dlls/tdh enable_tdh diff --git a/configure.ac b/configure.ac index 64721e96449f..52e211c97983 100644 --- a/configure.ac +++ b/configure.ac @@ -3694,6 +3694,7 @@ WINE_CONFIG_MAKEFILE(dlls/system.drv16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/t2embed) WINE_CONFIG_MAKEFILE(dlls/t2embed/tests) WINE_CONFIG_MAKEFILE(dlls/tapi32) +WINE_CONFIG_MAKEFILE(dlls/tapi32/tests) WINE_CONFIG_MAKEFILE(dlls/taskschd) WINE_CONFIG_MAKEFILE(dlls/taskschd/tests) WINE_CONFIG_MAKEFILE(dlls/tdh) diff --git a/dlls/tapi32/tests/Makefile.in b/dlls/tapi32/tests/Makefile.in new file mode 100644 index 000000000000..126eed1c85ce --- /dev/null +++ b/dlls/tapi32/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = tapi32.dll +IMPORTS = tapi32 + +C_SRCS = \ + tapi.c diff --git a/dlls/tapi32/tests/tapi.c b/dlls/tapi32/tests/tapi.c new file mode 100644 index 000000000000..13772c8c7d49 --- /dev/null +++ b/dlls/tapi32/tests/tapi.c @@ -0,0 +1,62 @@ +/* + * TAPI32 API tests + * + * Copyright 2019 Vijay Kiran Kamuju + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "tapi.h" + +#include "wine/test.h" + +static void CALLBACK line_callback(DWORD hDev, DWORD dwMsg, DWORD_PTR dwInst, DWORD_PTR param1, DWORD_PTR param2, DWORD_PTR param3) +{ +} + +static void test_lineInitialize(void) +{ + ULONG ret; + DWORD dev; + HLINEAPP lnApp; + + ret = lineInitialize(NULL, NULL, NULL, NULL, NULL); + todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + + ret = lineInitialize(&lnApp, NULL, NULL, NULL, NULL); + todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + + ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), NULL, NULL, NULL); + todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + + ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), line_callback, NULL, NULL); + todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + + ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), line_callback, NULL, &dev); + ok(!ret, "unexpected return value, got %u.\n", ret); + + ret = lineShutdown(NULL); + todo_wine ok(ret == LINEERR_INVALAPPHANDLE, "Expected return value LINEERR_INVALAPPHANDLE, got %x.\n", ret); + + ret = lineShutdown(lnApp); + ok(!ret, "unexpected return value, got %u.\n", ret); +} + +START_TEST(tapi) +{ + test_lineInitialize(); +} -- 2.21.0

1 0