October 2018 - Wine-devel - list.winehq.org

[PATCH 2/3 v2] winhttp: Make cookie access thread safe.
by Jacek Caban 05 Oct '18

05 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winhttp/cookie.c | 32 ++++++++++++++++++++++---------- dlls/winhttp/session.c | 4 ++++ dlls/winhttp/winhttp_private.h | 1 + 3 files changed, 27 insertions(+), 10 deletions(-)

2 1

[PATCH 1/3] winhttp: Move cookie_t declaration to cookie.c.
by Jacek Caban 05 Oct '18

05 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winhttp/cookie.c | 8 ++++++++ dlls/winhttp/winhttp_private.h | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-)

2 1

[PATCH] include: Add check macros needed for VS2017.
by Stefan Dösinger 05 Oct '18

05 Oct '18

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- These are necessary to use Visual Studio 2017 / Windows SDK 10.0.17134.0 CRT headers on top of Wine's Win32 headers. I am not sure if this patch is exhaustive for all possible headers in this SDK version, but it is enough to compile wined3d, the d3d client libs and tests. --- include/sal.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/include/sal.h b/include/sal.h index 6eb0a6c02d..c8b4491fbc 100644 --- a/include/sal.h +++ b/include/sal.h @@ -19,6 +19,11 @@ #ifndef __WINE_SAL_H__ #define __WINE_SAL_H__ + +#define _Always_(exp) + +#define _At_buffer_(a, b, c, d) + #define _Check_return_ #define _Deref_out_ @@ -26,6 +31,11 @@ #define _Deref_out_opt_z_ #define _Deref_post_opt_cap_(count) #define _Deref_post_opt_valid_ +#define _Deref_post_valid_ +#define _Deref_post_z_ +#define _Deref_prepost_opt_z_ + +#define _Field_range_(min, max) #define _In_ #define _In_bytecount_(count) @@ -33,15 +43,23 @@ #define _In_opt_ #define _In_opt_count_(count) #define _In_opt_z_ +#define _In_range_(min, max) #define _In_reads_(count) #define _In_reads_bytes_(count) +#define _In_reads_bytes_opt_(count) #define _In_reads_opt_z_(count) +#define _In_reads_or_z_(count) +#define _In_reads_or_z_opt_(count) #define _In_reads_z_(count) #define _In_z_ #define _Inout_ #define _Inout_cap_(count) #define _Inout_opt_ +#define _Inout_opt_z_ +#define _Inout_updates_(count) +#define _Inout_updates_bytes_(count) +#define _Inout_updates_opt_(count) #define _Inout_updates_z_(count) #define _Inout_z_ #define _Inout_z_bytecap_(count) @@ -60,35 +78,61 @@ #define _Out_opt_z_cap_(count) #define _Out_opt_z_cap_post_count_(count1, count2) #define _Out_writes_(count) +#define _Out_writes_bytes_(count) +#define _Out_writes_bytes_all_(count) +#define _Out_writes_bytes_all_opt_(count) +#define _Out_writes_bytes_opt_(count) #define _Out_writes_bytes_to_(count1, count2) +#define _Out_writes_bytes_to_opt_(count1, count2) #define _Out_writes_opt_(count) #define _Out_writes_opt_z_(count) #define _Out_writes_to_(count1, count2) +#define _Out_writes_to_opt_(count1, count2) #define _Out_writes_z_(count) #define _Out_z_cap_(count) #define _Out_z_cap_c_(count) #define _Out_z_cap_post_count_(count1, count2) #define _Outptr_result_buffer_(count) +#define _Outptr_result_buffer_maybenull_(count) +#define _Outptr_result_maybenull_ #define _Outptr_result_maybenull_z_ +#define _Outptr_result_z_ +#define _Param_(p) + +#define _Post_equal_to_(exp) #define _Post_invalid_ +#define _Post_maybez_ +#define _Post_readable_size_(count) +#define _Post_satisfies_(exp) #define _Post_writable_byte_size_(count) #define _Post_z_ #define _Pre_maybenull_ #define _Pre_notnull_ +#define _Pre_opt_z_ #define _Pre_writable_size_(count) +#define _Pre_z_ #define _Printf_format_string_ +#define _Printf_format_string_params_(count) #define _Ret_maybenull_ #define _Ret_maybenull_z_ +#define _Ret_notnull_ #define _Ret_opt_ #define _Ret_opt_z_cap_(count) #define _Ret_writes_bytes_maybenull_(count) #define _Ret_z_ +#define _Scanf_format_string_ +#define _Scanf_format_string_params_(count) +#define _Scanf_s_format_string_ +#define _Scanf_s_format_string_params_(count) + #define _Success_(exp) +#define _When_(exp1, exp2) + #endif -- 2.17.1 (Apple Git-112)

1 0

[PATCH 4/4] crypt32: Read OID information from the registry.
by Dmitry Timoshkov 05 Oct '18

05 Oct '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/oid.c | 133 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 127 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 6a6df95132..1eb82829d2 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -73,6 +73,13 @@ static const WCHAR DISALLOWED[] = {'D','i','s','a','l','l','o','w','e','d',0}; static const LPCWSTR LocalizedKeys[] = {ROOT,MY,CA,ADDRESSBOOK,TRUSTEDPUBLISHER,DISALLOWED}; static WCHAR LocalizedNames[ARRAY_SIZE(LocalizedKeys)][256]; +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 }; + static void free_function_sets(void) { struct OIDFunctionSet *setCursor, *setNext; @@ -700,12 +707,6 @@ BOOL WINAPI CryptUnregisterOIDInfo(PCCRYPT_OID_INFO info) */ BOOL WINAPI CryptRegisterOIDInfo(PCCRYPT_OID_INFO info, DWORD flags) { - 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; @@ -1525,6 +1526,125 @@ struct OIDInfo { struct list entry; }; +static struct OIDInfo *read_oid_info(HKEY root, char *key_name, DWORD *flags) +{ + HKEY key; + DWORD len, oid_len, name_len = 0, extra_len = 0, cngalgid_len = 0, cngextra_len = 0, group_id = 0; + struct OIDInfo *info; + char *p; + + if (RegOpenKeyExA(root, key_name, 0, KEY_READ, &key)) + return NULL; + + p = strchr(key_name, '!'); + if (p) + { + group_id = strtol(p + 1, NULL, 10); + *p = 0; + } + + oid_len = strlen(key_name) + 1; + + RegQueryValueExW(key, nameW, NULL, NULL, NULL, &name_len); + RegQueryValueExW(key, extraW, NULL, NULL, NULL, &extra_len); + RegQueryValueExW(key, cngalgidW, NULL, NULL, NULL, &cngalgid_len); + RegQueryValueExW(key, cngextraalgidW, NULL, NULL, NULL, &cngextra_len); + + info = CryptMemAlloc(sizeof(*info) + oid_len + name_len + extra_len + cngalgid_len + cngextra_len); + if (info) + { + *flags = 0; + len = sizeof(*flags); + RegQueryValueExW(key, flagsW, NULL, NULL, (BYTE *)flags, &len); + + memset(info, 0, sizeof(*info)); + info->info.cbSize = sizeof(info->info); + + p = (char *)(info + 1); + + info->info.pszOID = p; + strcpy((char *)info->info.pszOID, key_name); + p += oid_len; + + if (name_len) + { + info->info.pwszName = (WCHAR *)p; + RegQueryValueExW(key, nameW, NULL, NULL, (BYTE *)info->info.pwszName, &name_len); + p += name_len; + } + + info->info.dwGroupId = group_id; + + len = sizeof(info->info.u.Algid); + RegQueryValueExW(key, algidW, NULL, NULL, (BYTE *)&info->info.u.Algid, &len); + + if (extra_len) + { + info->info.ExtraInfo.cbData = extra_len; + info->info.ExtraInfo.pbData = (BYTE *)p; + RegQueryValueExW(key, extraW, NULL, NULL, info->info.ExtraInfo.pbData, &extra_len); + p += extra_len; + } + + if (cngalgid_len) + { + info->info.pwszCNGAlgid = (WCHAR *)p; + RegQueryValueExW(key, cngalgidW, NULL, NULL, (BYTE *)info->info.pwszCNGAlgid, &cngalgid_len); + p += cngalgid_len; + } + + if (cngextra_len) + { + info->info.pwszCNGExtraAlgid = (WCHAR *)p; + RegQueryValueExW(key, cngextraalgidW, NULL, NULL, (BYTE *)info->info.pwszCNGExtraAlgid, &cngalgid_len); + } + } + + RegCloseKey(key); + + return info; +} + +static void init_registered_oid_info(void) +{ + DWORD err, idx; + HKEY root; + + err = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Cryptography\\OID\\EncodingType 0\\CryptDllFindOIDInfo", + 0, KEY_ALL_ACCESS, &root); + if (err != ERROR_SUCCESS) return; + + idx = 0; + for (;;) + { + char key_name[MAX_PATH]; + struct OIDInfo *info; + DWORD flags; + + err = RegEnumKeyA(root, idx++, key_name, MAX_PATH); + if (err == ERROR_NO_MORE_ITEMS) + break; + + if (err == ERROR_SUCCESS) + { + if ((info = read_oid_info(root, key_name, &flags))) + { + TRACE("adding oid %s, name %s, groupid %u, algid %u, extra %u, CNG algid %s, CNG extra %s\n", + debugstr_a(info->info.pszOID), debugstr_w(info->info.pwszName), + info->info.dwGroupId, info->info.u.Algid, info->info.ExtraInfo.cbData, + debugstr_w(info->info.pwszCNGAlgid), debugstr_w(info->info.pwszCNGExtraAlgid)); + + if (flags & CRYPT_INSTALL_OID_INFO_BEFORE_FLAG) + list_add_head(&oidInfo, &info->entry); + else + list_add_tail(&oidInfo, &info->entry); + } + } + } + + RegCloseKey(root); +} + static void init_oid_info(void) { DWORD i; @@ -1752,6 +1872,7 @@ DWORD WINAPI CertOIDToAlgId(LPCSTR pszObjId) void crypt_oid_init(void) { init_oid_info(); + init_registered_oid_info(); } void crypt_oid_free(void) -- 2.17.1

1 0

[PATCH 3/4] crypt32/tests: Add some tests for registering OID info.
by Dmitry Timoshkov 05 Oct '18

05 Oct '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/tests/oid.c | 93 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index d6a03c5d1d..5247a4aad5 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -2,6 +2,7 @@ * Unit test suite for crypt32.dll's OID support functions. * * Copyright 2005 Juan Lang + * Copyright 2018 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -614,6 +615,97 @@ static void test_findOIDInfo(void) win_skip("Host does not support ECDSA_SHA256, skipping test\n"); } +static void test_registerOIDInfo(void) +{ + static const WCHAR winetestW[] = { 'w','i','n','e','t','e','s','t',0 }; + static char test_oid[] = "1.2.3.4.5.6.7.8.9.10"; + CRYPT_OID_INFO info1; + const CRYPT_OID_INFO *info2; + HKEY key; + DWORD ret, size, type, value; + char buf[256]; + + SetLastError(0xdeadbeef); + ret = CryptUnregisterOIDInfo(NULL); + ok(!ret, "should fail\n"); + ok(GetLastError() == E_INVALIDARG, "got %#x\n", GetLastError()); + + memset(&info1, 0, sizeof(info1)); + SetLastError(0xdeadbeef); + ret = CryptUnregisterOIDInfo(&info1); + ok(!ret, "should fail\n"); + ok(GetLastError() == E_INVALIDARG, "got %#x\n", GetLastError()); + + info1.cbSize = sizeof(info1); + SetLastError(0xdeadbeef); + ret = CryptUnregisterOIDInfo(&info1); + ok(!ret, "should fail\n"); + ok(GetLastError() == E_INVALIDARG, "got %#x\n", GetLastError()); + + info1.pszOID = test_oid; + SetLastError(0xdeadbeef); + ret = CryptUnregisterOIDInfo(&info1); + ok(!ret, "should fail\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got %u\n", GetLastError()); + + info2 = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, (void *)test_oid, 0); + ok(!info2, "should fail\n"); + + SetLastError(0xdeadbeef); + /* while succeeds next call does't write anything to registry under Windows + * because of dwGroupId == 0. + */ + ret = CryptRegisterOIDInfo(&info1, 0); + ok(ret, "got %u\n", GetLastError()); + + ret = RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Cryptography\\OID\\EncodingType 0\\CryptDllFindOIDInfo\\1.2.3.4.5.6.7.8.9.10!1", &key); + ok(ret == ERROR_FILE_NOT_FOUND, "got %u\n", ret); + + info2 = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, (void *)test_oid, 0); + ok(!info2, "should fail\n"); + + info1.pwszName = winetestW; + info1.dwGroupId = CRYPT_HASH_ALG_OID_GROUP_ID; + SetLastError(0xdeadbeef); + ret = CryptRegisterOIDInfo(&info1, CRYPT_INSTALL_OID_INFO_BEFORE_FLAG); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + skip("Need admin rights\n"); + return; + } + ok(ret, "got %u\n", GetLastError()); + + /* It looks like crypt32 reads the OID info from registry only on load, + * and CryptFindOIDInfo will find the registered OID on next run + */ + info2 = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, (void *)test_oid, 0); + ok(!info2, "should fail\n"); + + ret = RegCreateKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Cryptography\\OID\\EncodingType 0\\CryptDllFindOIDInfo\\1.2.3.4.5.6.7.8.9.10!1", &key); + ok(!ret, "got %u\n", ret); + + memset(buf, 0, sizeof(buf)); + size = sizeof(buf); + ret = RegQueryValueExA(key, "Name", NULL, &type, (BYTE *)buf, &size); + ok(!ret, "got %u\n", ret); + ok(type == REG_SZ, "got %u\n", type); + ok(!strcmp(buf, "winetest"), "got %s\n", buf); + + value = 0xdeadbeef; + size = sizeof(value); + ret = RegQueryValueExA(key, "Flags", NULL, &type, (BYTE *)&value, &size); + ok(!ret, "got %u\n", ret); + ok(type == REG_DWORD, "got %u\n", type); + ok(value == 1, "got %u\n", value); + + RegCloseKey(key); + + CryptUnregisterOIDInfo(&info1); + + ret = RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Cryptography\\OID\\EncodingType 0\\CryptDllFindOIDInfo\\1.2.3.4.5.6.7.8.9.10!1", &key); + ok(ret == ERROR_FILE_NOT_FOUND, "got %u\n", ret); +} + START_TEST(oid) { HMODULE hCrypt32 = GetModuleHandleA("crypt32.dll"); @@ -623,6 +715,7 @@ START_TEST(oid) testAlgIDToOID(); test_enumOIDInfo(); test_findOIDInfo(); + test_registerOIDInfo(); test_oidFunctionSet(); test_installOIDFunctionAddress(); test_registerOIDFunction(); -- 2.17.1

1 0

[PATCH 2/4] crypt32: Implement CryptRegisterOIDInfo.
by Dmitry Timoshkov 05 Oct '18

05 Oct '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- 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 e9ccab7494..6a6df95132 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 8e8c258157..0ba3b5ef79 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 -- 2.17.1

1 0

[PATCH 1/4] crypt32: Implement CryptUnregisterOIDInfo.
by Dmitry Timoshkov 05 Oct '18

05 Oct '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/crypt32.spec | 2 +- dlls/crypt32/oid.c | 43 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 0bc78a158d..64d5aa93fd 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -194,7 +194,7 @@ @ stdcall CryptUnprotectMemory(ptr long long) @ stdcall CryptUnregisterDefaultOIDFunction(long str wstr) @ stdcall CryptUnregisterOIDFunction(long str str) -@ stub CryptUnregisterOIDInfo +@ stdcall CryptUnregisterOIDInfo(ptr) @ stdcall CryptVerifyCertificateSignature(long long ptr long ptr) @ stdcall CryptVerifyCertificateSignatureEx(long long long ptr long ptr long ptr) @ stdcall CryptVerifyDetachedMessageHash(ptr ptr long long ptr ptr ptr ptr) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index c9b0b412cf..e9ccab7494 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -1,6 +1,7 @@ /* * Copyright 2002 Mike McCormack for CodeWeavers * Copyright 2005-2006 Juan Lang + * Copyright 2018 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -652,6 +653,48 @@ error_close_key: return TRUE; } +/*********************************************************************** + * CryptUnregisterOIDInfo (CRYPT32.@) + */ +BOOL WINAPI CryptUnregisterOIDInfo(PCCRYPT_OID_INFO info) +{ + char *key_name; + HKEY root; + DWORD err; + + TRACE("(%p)\n", info); + + if (!info || info->cbSize != sizeof(*info) || !info->pszOID) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + + err = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Cryptography\\OID\\EncodingType 0\\CryptDllFindOIDInfo", 0, KEY_ALL_ACCESS, &root); + if (err != ERROR_SUCCESS) + { + SetLastError(err); + return FALSE; + } + + key_name = CryptMemAlloc(strlen(info->pszOID) + 16); + if (key_name) + { + sprintf(key_name, "%s!%u", info->pszOID, info->dwGroupId); + err = RegDeleteKeyA(root, key_name); + } + else + err = ERROR_OUTOFMEMORY; + + CryptMemFree(key_name); + RegCloseKey(root); + + if (err) + SetLastError(err); + + return !err; +} + /*********************************************************************** * CryptRegisterOIDInfo (CRYPT32.@) */ -- 2.17.1

1 0

[PATCH 3/3] winhttp: Make accessing session credential handle thread safe.
by Jacek Caban 05 Oct '18

05 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winhttp/request.c | 24 ++++++++++++++++-------- dlls/winhttp/session.c | 2 ++ 2 files changed, 18 insertions(+), 8 deletions(-)

2 1

[PATCH 2/3] winhttp: Make cookie access thread safe.
by Jacek Caban 05 Oct '18

05 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winhttp/cookie.c | 7 +++++++ dlls/winhttp/session.c | 4 ++++ dlls/winhttp/winhttp_private.h | 1 + 3 files changed, 12 insertions(+)

2 1

[PATCH 1/3] winhttp: Move cookie_t declaration to cookie.c.
by Jacek Caban 05 Oct '18

05 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winhttp/cookie.c | 8 ++++++++ dlls/winhttp/winhttp_private.h | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-)

2 1