[akhaldi] 58721: [CRYPTDLG] [CRYPTDLL] [CRYPTUI] * Sync with Wine 1.5.26.

Author: akhaldi
Date: Mon Apr  8 16:31:05 2013
New Revision: 58721

URL: http://svn.reactos.org/svn/reactos?rev=58721&view=rev
Log:
[CRYPTDLG] [CRYPTDLL] [CRYPTUI]
* Sync with Wine 1.5.26.

Modified:
    trunk/reactos/dll/win32/cryptdlg/main.c
    trunk/reactos/dll/win32/cryptdll/cryptdll.c
    trunk/reactos/dll/win32/cryptui/main.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/cryptdlg/main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/main.c?r...
==============================================================================
--- trunk/reactos/dll/win32/cryptdlg/main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cryptdlg/main.c [iso-8859-1] Mon Apr  8 16:31:05 2013
@@ -278,7 +278,7 @@
     {
         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);

Modified: trunk/reactos/dll/win32/cryptdll/cryptdll.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdll/cryptdll...
==============================================================================
--- trunk/reactos/dll/win32/cryptdll/cryptdll.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cryptdll/cryptdll.c [iso-8859-1] Mon Apr  8 16:31:05 2013
@@ -27,8 +27,6 @@

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);
@@ -39,7 +37,6 @@
         case DLL_PROCESS_ATTACH:
         {
             DisableThreadLibraryCalls(hinstDLL);
-            CRYPTDLL_hModule = hinstDLL;
             break;
         }
         case DLL_PROCESS_DETACH:

Modified: trunk/reactos/dll/win32/cryptui/main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/main.c?re...
==============================================================================
--- trunk/reactos/dll/win32/cryptui/main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cryptui/main.c [iso-8859-1] Mon Apr  8 16:31:05 2013
@@ -299,7 +299,7 @@
         {
             if (comma)
                 *comma = 0;
-            add_oid_to_usage(usage, ptr);
+            usage = add_oid_to_usage(usage, ptr);
         }
     }
     return usage;
@@ -327,7 +327,7 @@
                 {
                     PCCRYPT_OID_INFO *ptr;

-                    for (ptr = usages; *ptr; ptr++)
+                    for (ptr = usages; advancedUsage && *ptr; ptr++)
                     {
                         DWORD i;
                         BOOL disabled = FALSE;
@@ -338,7 +338,7 @@
                              (*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,
@@ -1808,7 +1808,6 @@
     DWORD conn;
     LPDATAOBJECT dataObject = NULL;
     HBITMAP bitmap = NULL;
-    RECT rect;
     STGMEDIUM stgm;
     LPOLECLIENTSITE clientSite = NULL;
     REOBJECT reObject;
@@ -1847,9 +1846,6 @@
      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;
@@ -2844,7 +2840,7 @@

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
@@ -3776,7 +3772,7 @@

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);

Modified: trunk/reactos/media/doc/README.WINE
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=5...
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Apr  8 16:31:05 2013
@@ -53,10 +53,10 @@
 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