ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reference counting for CRYPTPROV objects. 

Implemented CryptContextAddRef.
This commit is contained in:
Michael Jung 2004-07-13 23:34:13 +00:00 committed by Alexandre Julliard
parent 932533ca09
commit 81e6f0c15c
2 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
dlls/advapi32/crypt.c
View File

@ -183,6 +183,7 @@ PCRYPTPROV CRYPT_LoadProvider(PSTR pImage)
FIXME("Failed to load dll %s\n", debugstr_a(pImage)); FIXME("Failed to load dll %s\n", debugstr_a(pImage));
goto error; goto error;
} }
provider->refcount = 1;
errorcode = NTE_PROVIDER_DLL_FAIL; errorcode = NTE_PROVIDER_DLL_FAIL;
CRYPT_GetProvFunc(CPAcquireContext); CRYPT_GetProvFunc(CPAcquireContext);
@ -525,9 +526,18 @@ BOOL WINAPI CryptAcquireContextW (HCRYPTPROV *phProv, LPCWSTR pszContainer,
*/ */
BOOL WINAPI CryptContextAddRef (HCRYPTPROV hProv, DWORD *pdwReserved, DWORD dwFlags) BOOL WINAPI CryptContextAddRef (HCRYPTPROV hProv, DWORD *pdwReserved, DWORD dwFlags)
{ {
FIXME("(0x%lx, %p, %08lx): stub!\n", hProv, pdwReserved, dwFlags); PCRYPTPROV pProv = (PCRYPTPROV)hProv;
return FALSE;
/* InterlockIncrement?? */ TRACE("(0x%lx, %p, %08lx)\n", hProv, pdwReserved, dwFlags);
if (!pProv)
{
SetLastError(NTE_BAD_UID);
return FALSE;
}
pProv->refcount++;
return TRUE;
} }
/****************************************************************************** /******************************************************************************
@ -546,7 +556,7 @@ BOOL WINAPI CryptContextAddRef (HCRYPTPROV hProv, DWORD *pdwReserved, DWORD dwFl
BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags)
{ {
PCRYPTPROV pProv = (PCRYPTPROV)hProv; PCRYPTPROV pProv = (PCRYPTPROV)hProv;
BOOL ret; BOOL ret = TRUE;
TRACE("(0x%lx, %08ld)\n", hProv, dwFlags); TRACE("(0x%lx, %08ld)\n", hProv, dwFlags);
@ -555,16 +565,20 @@ BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags)
SetLastError(NTE_BAD_UID); SetLastError(NTE_BAD_UID);
return FALSE; return FALSE;
} }
/* FIXME: Decrement the counter here first if possible */
ret = pProv->pFuncs->pCPReleaseContext(pProv->hPrivate, dwFlags); pProv->refcount--;
FreeLibrary(pProv->hModule); if (pProv->refcount <= 0)
{
ret = pProv->pFuncs->pCPReleaseContext(pProv->hPrivate, dwFlags);
FreeLibrary(pProv->hModule);
#if 0 #if 0
CRYPT_Free(pProv->pVTable->pContextInfo); CRYPT_Free(pProv->pVTable->pContextInfo);
#endif #endif
CRYPT_Free(pProv->pVTable->pszProvName); CRYPT_Free(pProv->pVTable->pszProvName);
CRYPT_Free(pProv->pVTable); CRYPT_Free(pProv->pVTable);
CRYPT_Free(pProv->pFuncs); CRYPT_Free(pProv->pFuncs);
CRYPT_Free(pProv); CRYPT_Free(pProv);
}
return ret; return ret;
} }

1
dlls/advapi32/crypt.h
View File

@ -58,6 +58,7 @@ typedef struct tagPROVFUNCS
typedef struct tagCRYPTPROV typedef struct tagCRYPTPROV
{ {
UINT refcount;
HMODULE hModule; HMODULE hModule;
PPROVFUNCS pFuncs; PPROVFUNCS pFuncs;
HCRYPTPROV hPrivate; /*CSP's handle - Should not be given to application under any circumstances!*/ HCRYPTPROV hPrivate; /*CSP's handle - Should not be given to application under any circumstances!*/