Dmitry Timoshkov : crypt32: Implement CryptRegisterOIDInfo.
Alexandre Julliard
julliard at winehq.org
Mon Oct 8 15:44:07 CDT 2018
Module: wine
Branch: master
Commit: 061033ed02b7f010ebe50b066d56c22cbe34b157
URL: https://source.winehq.org/git/wine.git/?a=commit;h=061033ed02b7f010ebe50b066d56c22cbe34b157
Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date: Fri Oct 5 16:41:36 2018 +0800
crypt32: Implement CryptRegisterOIDInfo.
Signed-off-by: Dmitry Timoshkov <dmitry at baikal.ru>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/crypt32/oid.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++---
include/wincrypt.h | 1 +
2 files changed, 82 insertions(+), 4 deletions(-)
diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c
index e9ccab7..6a6df95 100644
--- a/dlls/crypt32/oid.c
+++ b/dlls/crypt32/oid.c
@@ -698,11 +698,88 @@ BOOL WINAPI CryptUnregisterOIDInfo(PCCRYPT_OID_INFO info)
/***********************************************************************
* CryptRegisterOIDInfo (CRYPT32.@)
*/
-BOOL WINAPI CryptRegisterOIDInfo(PCCRYPT_OID_INFO pInfo, DWORD dwFlags)
+BOOL WINAPI CryptRegisterOIDInfo(PCCRYPT_OID_INFO info, DWORD flags)
{
- FIXME("(%p, %x): stub\n", pInfo, dwFlags );
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return FALSE;
+ static const WCHAR nameW[] = { 'N','a','m','e',0 };
+ static const WCHAR algidW[] = { 'A','l','g','i','d',0 };
+ static const WCHAR extraW[] = { 'E','x','t','r','a','I','n','f','o',0 };
+ static const WCHAR cngalgidW[] = { 'C','N','G','A','l','g','i','d',0 };
+ static const WCHAR cngextraalgidW[] = { 'C','N','G','E','x','t','r','a','A','l','g','i','d',0 };
+ static const WCHAR flagsW[] = { 'F','l','a','g','s',0 };
+ char *key_name;
+ HKEY root = 0, key = 0;
+ DWORD err;
+
+ TRACE("(%p, %x)\n", info, flags );
+
+ if (!info || info->cbSize != sizeof(*info) || !info->pszOID)
+ {
+ SetLastError(E_INVALIDARG);
+ return FALSE;
+ }
+
+ if (!info->dwGroupId) return TRUE;
+
+ key_name = CryptMemAlloc(strlen(info->pszOID) + 16);
+ if (!key_name)
+ {
+ err = ERROR_OUTOFMEMORY;
+ goto done;
+ }
+
+ err = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Cryptography\\OID\\EncodingType 0\\CryptDllFindOIDInfo",
+ 0, NULL, 0, KEY_ALL_ACCESS, NULL, &root, NULL);
+ if (err != ERROR_SUCCESS) goto done;
+
+ sprintf(key_name, "%s!%u", info->pszOID, info->dwGroupId);
+ err = RegCreateKeyA(root, key_name, &key);
+ if (err != ERROR_SUCCESS) goto done;
+
+ if (flags)
+ {
+ err = RegSetValueExW(key, flagsW, 0, REG_DWORD, (const BYTE *)&flags, sizeof(flags));
+ if (err != ERROR_SUCCESS) goto done;
+ }
+
+ if (info->pwszName)
+ {
+ err = RegSetValueExW(key, nameW, 0, REG_SZ, (const BYTE *)info->pwszName, (lstrlenW(info->pwszName) + 1) * sizeof(WCHAR));
+ if (err != ERROR_SUCCESS) goto done;
+ }
+
+ if (info->u.Algid)
+ {
+ err = RegSetValueExW(key, algidW, 0, REG_DWORD, (const BYTE *)&info->u.Algid, sizeof(info->u.Algid));
+ if (err != ERROR_SUCCESS) goto done;
+ }
+
+ if (info->ExtraInfo.cbData && info->ExtraInfo.pbData)
+ {
+ err = RegSetValueExW(key, extraW, 0, REG_BINARY, info->ExtraInfo.pbData, info->ExtraInfo.cbData);
+ if (err != ERROR_SUCCESS) goto done;
+ }
+
+ if (info->pwszCNGAlgid)
+ {
+ err = RegSetValueExW(key, cngalgidW, 0, REG_SZ, (const BYTE *)info->pwszCNGAlgid, (lstrlenW(info->pwszCNGAlgid) + 1) * sizeof(WCHAR));
+ if (err != ERROR_SUCCESS) goto done;
+ }
+
+ if (info->pwszCNGExtraAlgid)
+ {
+ err = RegSetValueExW(key, cngextraalgidW, 0, REG_SZ, (const BYTE *)info->pwszCNGExtraAlgid, (lstrlenW(info->pwszCNGExtraAlgid) + 1) * sizeof(WCHAR));
+ if (err != ERROR_SUCCESS) goto done;
+ }
+
+done:
+ CryptMemFree(key_name);
+ if (key) RegCloseKey(key);
+ if (root) RegCloseKey(root);
+
+ if (err)
+ SetLastError(err);
+
+ return !err;
}
/***********************************************************************
diff --git a/include/wincrypt.h b/include/wincrypt.h
index 8e8c258..0ba3b5e 100644
--- a/include/wincrypt.h
+++ b/include/wincrypt.h
@@ -2374,6 +2374,7 @@ static const WCHAR CRYPT_OID_REG_FLAGS_VALUE_NAME[] =
#define CRYPT_DEFAULT_OID "DEFAULT"
#define CRYPT_INSTALL_OID_FUNC_BEFORE_FLAG 1
+#define CRYPT_INSTALL_OID_INFO_BEFORE_FLAG 1
#define CRYPT_GET_INSTALLED_OID_FUNC_FLAG 0x1
More information about the wine-cvs
mailing list