Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-16 01:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CRYPT32] Sync with Wine Staging 3.9. CORE-14656

Browse source
This commit is contained in:
Amine Khaldi 2018-05-27 04:07:57 +01:00
parent 234f89c07b
commit 102f53e05c
4 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
dll/win32/crypt32/crypt32.spec
View file

@ -177,6 +177,7 @@
@ stdcall CryptSIPRemoveProvider(ptr) @ stdcall CryptSIPRemoveProvider(ptr)
@ stdcall CryptSIPRemoveSignedDataMsg(ptr long) @ stdcall CryptSIPRemoveSignedDataMsg(ptr long)
@ stdcall CryptSIPRetrieveSubjectGuid(wstr long ptr) @ stdcall CryptSIPRetrieveSubjectGuid(wstr long ptr)
@ stdcall CryptSIPRetrieveSubjectGuidForCatalogFile(wstr long ptr)
@ stdcall CryptSIPVerifyIndirectData(ptr ptr) @ stdcall CryptSIPVerifyIndirectData(ptr ptr)
@ stub CryptSetAsyncParam @ stub CryptSetAsyncParam
@ stdcall CryptSetOIDFunctionValue(long str str wstr long ptr long) @ stdcall CryptSetOIDFunctionValue(long str str wstr long ptr long)

13
dll/win32/crypt32/regstore.c
View file

@ -309,7 +309,11 @@ static BOOL CRYPT_RegFlushStore(WINE_REGSTOREINFO *store, BOOL force)
TRACE("(%p, %d)\n", store, force); TRACE("(%p, %d)\n", store, force);
if (store->dirty || force) if (store->dirty || force)
{
ret = CRYPT_RegWriteToReg(store); ret = CRYPT_RegWriteToReg(store);
if (ret)
store->dirty = FALSE;
}
else else
ret = TRUE; ret = TRUE;
return ret; return ret;
@ -453,7 +457,7 @@ static BOOL WINAPI CRYPT_RegControl(HCERTSTORE hCertStore, DWORD dwFlags,
DWORD dwCtrlType, void const *pvCtrlPara) DWORD dwCtrlType, void const *pvCtrlPara)
{ {
WINE_REGSTOREINFO *store = hCertStore; WINE_REGSTOREINFO *store = hCertStore;
BOOL ret; BOOL ret = TRUE;
TRACE("(%p, %08x, %d, %p)\n", hCertStore, dwFlags, dwCtrlType, TRACE("(%p, %08x, %d, %p)\n", hCertStore, dwFlags, dwCtrlType,
pvCtrlPara); pvCtrlPara);
@ -469,7 +473,6 @@ static BOOL WINAPI CRYPT_RegControl(HCERTSTORE hCertStore, DWORD dwFlags,
CRYPT_RegReadFromReg(store->key, memStore); CRYPT_RegReadFromReg(store->key, memStore);
I_CertUpdateStore(store->memStore, memStore, 0, 0); I_CertUpdateStore(store->memStore, memStore, 0, 0);
CertCloseStore(memStore, 0); CertCloseStore(memStore, 0);
ret = TRUE;
break; break;
} }
case CERT_STORE_CTRL_COMMIT: case CERT_STORE_CTRL_COMMIT:
@ -478,10 +481,12 @@ static BOOL WINAPI CRYPT_RegControl(HCERTSTORE hCertStore, DWORD dwFlags,
break; break;
case CERT_STORE_CTRL_AUTO_RESYNC: case CERT_STORE_CTRL_AUTO_RESYNC:
FIXME("CERT_STORE_CTRL_AUTO_RESYNC: stub\n"); FIXME("CERT_STORE_CTRL_AUTO_RESYNC: stub\n");
ret = TRUE; break;
case CERT_STORE_CTRL_NOTIFY_CHANGE:
FIXME("CERT_STORE_CTRL_NOTIFY_CHANGE: stub\n");
break; break;
default: default:
FIXME("%d: stub\n", dwCtrlType); FIXME("%u: stub\n", dwCtrlType);
ret = FALSE; ret = FALSE;
} }
return ret; return ret;

10
dll/win32/crypt32/sip.c
View file

@ -801,3 +801,13 @@ BOOL WINAPI CryptSIPVerifyIndirectData(SIP_SUBJECTINFO* pSubjectInfo,
TRACE("returning %d\n", ret); TRACE("returning %d\n", ret);
return ret; return ret;
} }
/***********************************************************************
* CryptSIPRetrieveSubjectGuidForCatalogFile (CRYPT32.@)
*/
BOOL WINAPI CryptSIPRetrieveSubjectGuidForCatalogFile(LPCWSTR filename, HANDLE handle, GUID *subject)
{
FIXME("(%s %p %p)\n", debugstr_w(filename), handle, subject);
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
}

2
media/doc/README.WINE
View file

@ -58,7 +58,7 @@ reactos/dll/win32/comctl32 # Synced to Wine-3.0
reactos/dll/win32/comdlg32 # Synced to WineStaging-3.9 reactos/dll/win32/comdlg32 # Synced to WineStaging-3.9
reactos/dll/win32/compstui # Synced to WineStaging-3.3 reactos/dll/win32/compstui # Synced to WineStaging-3.3
reactos/dll/win32/credui # Synced to WineStaging-3.3 reactos/dll/win32/credui # Synced to WineStaging-3.3
reactos/dll/win32/crypt32 # Synced to WineStaging-3.3 reactos/dll/win32/crypt32 # Synced to WineStaging-3.9
reactos/dll/win32/cryptdlg # Synced to WineStaging-3.3 reactos/dll/win32/cryptdlg # Synced to WineStaging-3.3
reactos/dll/win32/cryptdll # Synced to WineStaging-3.3 reactos/dll/win32/cryptdll # Synced to WineStaging-3.3
reactos/dll/win32/cryptnet # Synced to WineStaging-3.3 reactos/dll/win32/cryptnet # Synced to WineStaging-3.3