* Sync with Wine 1.5.26.
svn path=/trunk/; revision=58721
{
trust = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0,
CERT_STORE_CREATE_NEW_FLAG, NULL);
- if (root)
+ if (trust)
{
for (i = 0; i < cert->cTrustStores; i++)
CertAddStoreToCollection(trust, cert->rghstoreTrust[i], 0, 0);
WINE_DEFAULT_DEBUG_CHANNEL(cryptdll);
-static HMODULE CRYPTDLL_hModule;
-
BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved);
case DLL_PROCESS_ATTACH:
{
DisableThreadLibraryCalls(hinstDLL);
- CRYPTDLL_hModule = hinstDLL;
break;
}
case DLL_PROCESS_DETACH:
{
if (comma)
*comma = 0;
- add_oid_to_usage(usage, ptr);
+ usage = add_oid_to_usage(usage, ptr);
}
}
return usage;
{
PCCRYPT_OID_INFO *ptr;
- for (ptr = usages; *ptr; ptr++)
+ for (ptr = usages; advancedUsage && *ptr; ptr++)
{
DWORD i;
BOOL disabled = FALSE;
(*ptr)->pszOID))
disabled = TRUE;
if (!disabled)
- add_oid_to_usage(advancedUsage,
+ advancedUsage = add_oid_to_usage(advancedUsage,
(LPSTR)(*ptr)->pszOID);
}
/* The individual strings are pointers to disabledUsagesStr,
DWORD conn;
LPDATAOBJECT dataObject = NULL;
HBITMAP bitmap = NULL;
- RECT rect;
STGMEDIUM stgm;
LPOLECLIENTSITE clientSite = NULL;
REOBJECT reObject;
LR_DEFAULTSIZE | LR_LOADTRANSPARENT);
if (!bitmap)
goto end;
- rect.left = rect.top = 0;
- rect.right = GetSystemMetrics(SM_CXICON);
- rect.bottom = GetSystemMetrics(SM_CYICON);
stgm.tymed = TYMED_GDI;
stgm.u.hBitmap = bitmap;
stgm.pUnkForRelease = NULL;
static void add_v1_fields(HWND hwnd, struct detail_data *data)
{
- int i;
+ unsigned int i;
PCCERT_CONTEXT cert = data->pCertViewInfo->pCertContext;
/* The last item in v1_fields is the public key, which is not in the loop
static void free_detail_fields(struct detail_data *data)
{
- DWORD i;
+ int i;
for (i = 0; i < data->cFields; i++)
HeapFree(GetProcessHeap(), 0, data->fields[i].detailed_value);
reactos/dll/win32/compstui # Synced to Wine-1.5.19
reactos/dll/win32/credui # Synced to Wine-1.5.4
reactos/dll/win32/crypt32 # Synced to Wine-1.5.26
-reactos/dll/win32/cryptdlg # Synced to Wine-1.5.4
-reactos/dll/win32/cryptdll # Synced to Wine-1.5.4
+reactos/dll/win32/cryptdlg # Synced to Wine-1.5.26
+reactos/dll/win32/cryptdll # Synced to Wine-1.5.26
reactos/dll/win32/cryptnet # Synced to Wine-1.5.26
-reactos/dll/win32/cryptui # Synced to Wine-1.5.4
+reactos/dll/win32/cryptui # Synced to Wine-1.5.26
reactos/dll/win32/dbghelp # Synced to Wine-1.3.37
reactos/dll/win32/dciman32 # Synced to Wine-1.5.19
reactos/dll/win32/dwmapi # Synced to Wine-1.5.19