November 2007 - Wine-Commits

Juan Lang : rsaenh: Use helper function to delete a key container' s registry key.
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: 9260fcf7acafc15364340b457e7f01bb1216b564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9260fcf7acafc15364340b457… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 6 11:53:14 2007 -0800 rsaenh: Use helper function to delete a key container's registry key. --- dlls/rsaenh/rsaenh.c | 52 +++++++++++++++++++++++++++++++------------------ 1 files changed, 33 insertions(+), 19 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index fbb0238..4c154c1 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -965,6 +965,38 @@ static BOOL open_container_key(LPCSTR pszContainerName, DWORD dwFlags, HKEY *phK } /****************************************************************************** + * 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[MAX_PATH]; + + if (snprintf(szRegKey, MAX_PATH, RSAENH_REGKEY, pszContainerName) >= MAX_PATH) { + SetLastError(NTE_BAD_KEYSET_PARAM); + return FALSE; + } else { + HKEY hRootKey; + 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] * * Stores key container's keys in a persistent location. @@ -1479,7 +1511,6 @@ BOOL WINAPI RSAENH_CPAcquireContext(HCRYPTPROV *phProv, LPSTR pszContainer, DWORD dwFlags, PVTableProvStruc pVTable) { CHAR szKeyContainerName[MAX_PATH]; - CHAR szRegKey[MAX_PATH]; TRACE("(phProv=%p, pszContainer=%s, dwFlags=%08x, pVTable=%p)\n", phProv, debugstr_a(pszContainer), dwFlags, pVTable); @@ -1501,24 +1532,7 @@ BOOL WINAPI RSAENH_CPAcquireContext(HCRYPTPROV *phProv, LPSTR pszContainer, break; case CRYPT_DELETEKEYSET: - if (snprintf(szRegKey, MAX_PATH, RSAENH_REGKEY, szKeyContainerName) >= MAX_PATH) { - SetLastError(NTE_BAD_KEYSET_PARAM); - return FALSE; - } else { - HKEY hRootKey; - 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; - } - } - break; + return delete_container_key(szKeyContainerName, dwFlags); case CRYPT_NEWKEYSET: *phProv = read_key_container(szKeyContainerName, dwFlags, pVTable);

1 0

Juan Lang : rsaenh: Use LocalFree to free memory return by Crypt(Un) ProtectData.
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: 8788cca0eff2e64e541123c6f3869543dfe462b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8788cca0eff2e64e541123c6f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 6 13:58:55 2007 -0800 rsaenh: Use LocalFree to free memory return by Crypt(Un)ProtectData. --- dlls/rsaenh/rsaenh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 2d89751..776c6e7 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -895,7 +895,7 @@ static void store_key_pair(HCRYPTKEY hCryptKey, HKEY hKey, LPCSTR szValueName, D { RegSetValueExA(hKey, szValueName, 0, REG_BINARY, blobOut.pbData, blobOut.cbData); - HeapFree(GetProcessHeap(), 0, blobOut.pbData); + LocalFree(blobOut.pbData); } } HeapFree(GetProcessHeap(), 0, pbKey); @@ -1135,7 +1135,7 @@ static BOOL read_key_value(HCRYPTPROV hKeyContainer, HKEY hKey, LPCSTR szValueNa { ret = RSAENH_CPImportKey(hKeyContainer, blobOut.pbData, blobOut.cbData, 0, 0, phCryptKey); - HeapFree(GetProcessHeap(), 0, blobOut.pbData); + LocalFree(blobOut.pbData); } } HeapFree(GetProcessHeap(), 0, pbKey);

1 0

Juan Lang : rsaenh: Use helper function to open a key container' s registry key.
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: 88405a68e7121a82cb326fe85e3cb68af1de36d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88405a68e7121a82cb326fe85… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 6 11:48:29 2007 -0800 rsaenh: Use helper function to open a key container's registry key. --- dlls/rsaenh/rsaenh.c | 58 +++++++++++++++++++++++++++++-------------------- 1 files changed, 34 insertions(+), 24 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 2e9ebfd..fbb0238 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -935,6 +935,36 @@ static BOOL create_container_key(KEYCONTAINER *pKeyContainer, REGSAM sam, HKEY * } /****************************************************************************** + * 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, HKEY *phKey) +{ + CHAR szRSABase[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, KEY_READ, phKey) == + ERROR_SUCCESS; +} + +/****************************************************************************** * store_key_container_keys [Internal] * * Stores key container's keys in a persistent location. @@ -1053,26 +1083,15 @@ static HCRYPTPROV new_key_container(PCCH pszContainerName, DWORD dwFlags, const */ static HCRYPTPROV read_key_container(PCHAR pszContainerName, DWORD dwFlags, const VTableProvStruc *pVTable) { - CHAR szRSABase[MAX_PATH]; BYTE *pbKey; - HKEY hKey, hRootKey; + HKEY hKey; DWORD dwValueType, dwLen; KEYCONTAINER *pKeyContainer; HCRYPTPROV hKeyContainer; DATA_BLOB blobIn, blobOut; HCRYPTKEY hCryptKey; - 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 */ - if (RegOpenKeyExA(hRootKey, szRSABase, 0, KEY_READ, &hKey) != ERROR_SUCCESS) + if (!open_container_key(pszContainerName, dwFlags, &hKey)) { SetLastError(NTE_BAD_KEYSET); return (HCRYPTPROV)INVALID_HANDLE_VALUE; @@ -2913,8 +2932,7 @@ BOOL WINAPI RSAENH_CPGetProvParam(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, KEYCONTAINER *pKeyContainer; PROV_ENUMALGS provEnumalgs; DWORD dwTemp; - CHAR szRSABase[MAX_PATH]; - HKEY hKey, hRootKey; + HKEY hKey; /* This is for dwParam 41, which does not seem to be documented * on MSDN. IE6 SP1 asks for it in the 'About' dialog, however. @@ -3000,15 +3018,7 @@ BOOL WINAPI RSAENH_CPGetProvParam(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, return TRUE; } - sprintf(szRSABase, RSAENH_REGKEY, ""); - - if (dwFlags & CRYPT_MACHINE_KEYSET) { - hRootKey = HKEY_LOCAL_MACHINE; - } else { - hRootKey = HKEY_CURRENT_USER; - } - - if (RegOpenKeyExA(hRootKey, szRSABase, 0, KEY_READ, &hKey) != ERROR_SUCCESS) + if (!open_container_key("", dwFlags, &hKey)) { SetLastError(ERROR_NO_MORE_ITEMS); return FALSE;

1 0

Juan Lang : rsaenh: Use helper function to read key pairs from registry.
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: 5408471b23e903c308c256284cf16c367c75b9f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5408471b23e903c308c256284… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 6 13:05:23 2007 -0800 rsaenh: Use helper function to read key pairs from registry. --- dlls/rsaenh/rsaenh.c | 106 +++++++++++++++++++++++++------------------------ 1 files changed, 54 insertions(+), 52 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 4c154c1..2d89751 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -1100,6 +1100,51 @@ static HCRYPTPROV new_key_container(PCCH pszContainerName, DWORD dwFlags, const } /****************************************************************************** + * read_key_value [Internal] + * + * Reads a key pair value from the registry + * + * PARAMS + * hKeyContainer [I] Crypt provider to use to import the key + * hKey [I] Registry key from which to read the key pair + * szValueName [I] Registry value from which to read the key pair's value + * dwFlags [I] Flags for unprotecting the key + * phCryptKey [O] Returned key + */ +static BOOL read_key_value(HCRYPTPROV hKeyContainer, HKEY hKey, LPCSTR szValueName, DWORD dwFlags, HCRYPTKEY *phCryptKey) +{ + DWORD dwValueType, dwLen; + BYTE *pbKey; + DATA_BLOB blobIn, blobOut; + BOOL ret = FALSE; + + if (RegQueryValueExA(hKey, szValueName, 0, &dwValueType, NULL, &dwLen) == + ERROR_SUCCESS) + { + pbKey = HeapAlloc(GetProcessHeap(), 0, dwLen); + if (pbKey) + { + if (RegQueryValueExA(hKey, szValueName, 0, &dwValueType, pbKey, &dwLen) == + ERROR_SUCCESS) + { + blobIn.pbData = pbKey; + blobIn.cbData = dwLen; + + if (CryptUnprotectData(&blobIn, NULL, NULL, NULL, NULL, + dwFlags, &blobOut)) + { + ret = RSAENH_CPImportKey(hKeyContainer, blobOut.pbData, blobOut.cbData, 0, 0, + phCryptKey); + HeapFree(GetProcessHeap(), 0, blobOut.pbData); + } + } + HeapFree(GetProcessHeap(), 0, pbKey); + } + } + return ret; +} + +/****************************************************************************** * read_key_container [Internal] * * Tries to read the persistent state of the key container (mainly the signature @@ -1115,12 +1160,9 @@ static HCRYPTPROV new_key_container(PCCH pszContainerName, DWORD dwFlags, const */ static HCRYPTPROV read_key_container(PCHAR pszContainerName, DWORD dwFlags, const VTableProvStruc *pVTable) { - BYTE *pbKey; HKEY hKey; - DWORD dwValueType, dwLen; KEYCONTAINER *pKeyContainer; HCRYPTPROV hKeyContainer; - DATA_BLOB blobIn, blobOut; HCRYPTKEY hCryptKey; if (!open_container_key(pszContainerName, dwFlags, &hKey)) @@ -1132,59 +1174,19 @@ static HCRYPTPROV read_key_container(PCHAR pszContainerName, DWORD dwFlags, cons hKeyContainer = new_key_container(pszContainerName, dwFlags, pVTable); if (hKeyContainer != (HCRYPTPROV)INVALID_HANDLE_VALUE) { + DWORD dwProtectFlags = (dwFlags & CRYPT_MACHINE_KEYSET) ? + CRYPTPROTECT_LOCAL_MACHINE : 0; + if (!lookup_handle(&handle_table, hKeyContainer, RSAENH_MAGIC_CONTAINER, (OBJECTHDR**)&pKeyContainer)) return (HCRYPTPROV)INVALID_HANDLE_VALUE; - if (RegQueryValueExA(hKey, "KeyExchangeKeyPair", 0, &dwValueType, NULL, &dwLen) == - ERROR_SUCCESS) - { - pbKey = HeapAlloc(GetProcessHeap(), 0, dwLen); - if (pbKey) - { - if (RegQueryValueExA(hKey, "KeyExchangeKeyPair", 0, &dwValueType, pbKey, &dwLen) == - ERROR_SUCCESS) - { - blobIn.pbData = pbKey; - blobIn.cbData = dwLen; - - if (CryptUnprotectData(&blobIn, NULL, NULL, NULL, NULL, - (dwFlags & CRYPT_MACHINE_KEYSET) ? CRYPTPROTECT_LOCAL_MACHINE : 0, &blobOut)) - { - if(RSAENH_CPImportKey(hKeyContainer, blobOut.pbData, blobOut.cbData, 0, 0, - &hCryptKey)) - pKeyContainer->hKeyExchangeKeyPair = hCryptKey; - HeapFree(GetProcessHeap(), 0, blobOut.pbData); - } - } - HeapFree(GetProcessHeap(), 0, pbKey); - } - } - - if (RegQueryValueExA(hKey, "SignatureKeyPair", 0, &dwValueType, NULL, &dwLen) == - ERROR_SUCCESS) - { - pbKey = HeapAlloc(GetProcessHeap(), 0, dwLen); - if (pbKey) - { - if (RegQueryValueExA(hKey, "SignatureKeyPair", 0, &dwValueType, pbKey, &dwLen) == - ERROR_SUCCESS) - { - blobIn.pbData = pbKey; - blobIn.cbData = dwLen; - - if (CryptUnprotectData(&blobIn, NULL, NULL, NULL, NULL, - (dwFlags & CRYPT_MACHINE_KEYSET) ? CRYPTPROTECT_LOCAL_MACHINE : 0, &blobOut)) - { - if(RSAENH_CPImportKey(hKeyContainer, blobOut.pbData, blobOut.cbData, 0, 0, - &hCryptKey)) - pKeyContainer->hSignatureKeyPair = hCryptKey; - HeapFree(GetProcessHeap(), 0, blobOut.pbData); - } - } - HeapFree(GetProcessHeap(), 0, pbKey); - } - } + if (read_key_value(hKeyContainer, hKey, "KeyExchangeKeyPair", + dwProtectFlags, &hCryptKey)) + pKeyContainer->hKeyExchangeKeyPair = hCryptKey; + if (read_key_value(hKeyContainer, hKey, "SignatureKeyPair", + dwProtectFlags, &hCryptKey)) + pKeyContainer->hSignatureKeyPair = hCryptKey; } return hKeyContainer;

1 0

Alistair Leslie-Hughes : msxml3: Fix memory leak.
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: 2ad4f102f7b72046233c4de28c49dd1504af7890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ad4f102f7b72046233c4de28… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 7 12:39:11 2007 +1100 msxml3: Fix memory leak. --- dlls/msxml3/xmlelem.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c index 787b13f..5af43a7 100644 --- a/dlls/msxml3/xmlelem.c +++ b/dlls/msxml3/xmlelem.c @@ -340,6 +340,8 @@ static HRESULT WINAPI xmlelem_get_text(IXMLElement *iface, BSTR *p) content = xmlNodeGetContent(This->node); *p = bstr_from_xmlChar(content); TRACE("returning %s\n", debugstr_w(*p)); + + xmlFree(content); return S_OK; }

1 0

Alexandre Julliard : include: Mark imported functions with hidden visibility.
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: 95c728551d5ee9b71d2a6328d0220a8b678c5225 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95c728551d5ee9b71d2a6328d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 12:31:16 2007 +0100 include: Mark imported functions with hidden visibility. --- include/winnt.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index f068b53..78fa1f7 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -43,13 +43,13 @@ extern "C" { #define NTAPI __stdcall -#if (defined(_M_IX86) || defined(_M_IA64) || defined(_M_AMD64) || defined(__MINGW32__)) && !defined(MIDL_PASS) +#ifndef MIDL_PASS # if defined(_MSC_VER) # define DECLSPEC_IMPORT __declspec(dllimport) # elif defined(__MINGW32__) # define DECLSPEC_IMPORT __attribute__((dllimport)) # else -# define DECLSPEC_IMPORT +# define DECLSPEC_IMPORT DECLSPEC_HIDDEN # endif #else # define DECLSPEC_IMPORT

1 0

Alexandre Julliard : include: Only use DECLSPEC_IMPORT for Windows compilers in unicode.h.
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: 6678c07f5784365fee9dc3c43f71f9712897cfde URL: http://source.winehq.org/git/wine.git/?a=commit;h=6678c07f5784365fee9dc3c43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 12:30:51 2007 +0100 include: Only use DECLSPEC_IMPORT for Windows compilers in unicode.h. --- include/wine/unicode.h | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/include/wine/unicode.h b/include/wine/unicode.h index 27d7cee..49f9062 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -32,7 +32,11 @@ #endif #ifndef WINE_UNICODE_API -#define WINE_UNICODE_API DECLSPEC_IMPORT +# if defined(_MSC_VER) || defined(__MINGW32__) +# define WINE_UNICODE_API DECLSPEC_IMPORT +# else +# define WINE_UNICODE_API +# endif #endif #ifndef WINE_UNICODE_INLINE

1 0

Alexandre Julliard : include: Add NTSYSAPI to the exported ntdll functions.
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: 6cf2df5a0c38472faa1081e477fb626079174e4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cf2df5a0c38472faa1081e47… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 12:28:59 2007 +0100 include: Add NTSYSAPI to the exported ntdll functions. --- include/winnt.h | 20 +- include/winternl.h | 1185 +++++++++++++++++++++++++--------------------------- 2 files changed, 592 insertions(+), 613 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6cf2df5a0c38472faa108…

1 0

Alexandre Julliard : include: Add WINBASEAPI to the exported kernel32 functions.
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: 16d85e2d303e5612c575ab0fd1fd51542d670506 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16d85e2d303e5612c575ab0fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 12:27:51 2007 +0100 include: Add WINBASEAPI to the exported kernel32 functions. --- include/winbase.h | 1817 ++++++++++++++++++++++++++--------------------------- include/wincon.h | 149 ++--- include/winnls.h | 196 +++--- 3 files changed, 1073 insertions(+), 1089 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=16d85e2d303e5612c575a…

1 0

Alexandre Julliard : include: Add WINADVAPI to the exported advapi32 functions.
by Alexandre Julliard Nov. 7, 2007

Nov. 7, 2007

Module: wine Branch: master Commit: 2d1da3430c2481e61f030475c24894a4df97b2bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d1da3430c2481e61f030475c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 12:27:27 2007 +0100 include: Add WINADVAPI to the exported advapi32 functions. --- include/aclapi.h | 126 +++++++++++++--------------------- include/wincred.h | 38 ++++++---- include/wincrypt.h | 123 ++++++++++++++------------------- include/winreg.h | 196 ++++++++++++++++++++++++--------------------------- include/winsvc.h | 130 +++++++++++++++++----------------- 5 files changed, 279 insertions(+), 334 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d1da3430c2481e61f030…

1 0