[ros-diffs] [akhaldi] 60141: [CRYPTNET] * Sync with Wine 1.7.1.

Author: akhaldi
Date: Sun Sep 15 17:20:13 2013
New Revision: 60141

URL: http://svn.reactos.org/svn/reactos?rev=60141&view=rev
Log:
[CRYPTNET]
* Sync with Wine 1.7.1.

Modified:
    trunk/reactos/dll/win32/cryptnet/CMakeLists.txt
    trunk/reactos/dll/win32/cryptnet/cryptnet_main.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/cryptnet/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptnet/CMakeLi…
==============================================================================
--- trunk/reactos/dll/win32/cryptnet/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cryptnet/CMakeLists.txt	[iso-8859-1] Sun Sep 15 17:20:13 2013
@@ -14,5 +14,4 @@
 target_link_libraries(cryptnet wine)
 add_delay_importlibs(cryptnet wininet)
 add_importlibs(cryptnet crypt32 msvcrt kernel32 ntdll)
-
 add_cd_file(TARGET cryptnet DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/dll/win32/cryptnet/cryptnet_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptnet/cryptne…
==============================================================================
--- trunk/reactos/dll/win32/cryptnet/cryptnet_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cryptnet/cryptnet_main.c	[iso-8859-1] Sun Sep 15 17:20:13
2013
@@ -959,18 +959,12 @@
                     if (ret && !(dwRetrievalFlags &
CRYPT_DONT_CACHE_RESULT))
                     {
                         SYSTEMTIME st;
+                        FILETIME ft;
                         DWORD len = sizeof(st);
 
-                        if (HttpQueryInfoW(hHttp,
-                         HTTP_QUERY_EXPIRES | HTTP_QUERY_FLAG_SYSTEMTIME, &st,
-                         &len, NULL))
-                        {
-                            FILETIME ft;
-
-                            SystemTimeToFileTime(&st, &ft);
-                            CRYPT_CacheURL(pszURL, pObject, dwRetrievalFlags,
-                             ft);
-                        }
+                        if (HttpQueryInfoW(hHttp, HTTP_QUERY_EXPIRES |
HTTP_QUERY_FLAG_SYSTEMTIME,
+                                    &st, &len, NULL) &&
SystemTimeToFileTime(&st, &ft))
+                            CRYPT_CacheURL(pszURL, pObject, dwRetrievalFlags, ft);
                     }
                     InternetCloseHandle(hHttp);
                 }

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sun Sep 15 17:20:13 2013
@@ -66,7 +66,7 @@
 reactos/dll/win32/crypt32         # Synced to Wine-1.7.1
 reactos/dll/win32/cryptdlg        # Synced to Wine-1.7.1
 reactos/dll/win32/cryptdll        # Synced to Wine-1.7.1
-reactos/dll/win32/cryptnet        # Synced to Wine-1.5.26
+reactos/dll/win32/cryptnet        # Synced to Wine-1.7.1
 reactos/dll/win32/cryptui         # Synced to Wine-1.5.26
 reactos/dll/win32/dbghelp         # Synced to Wine-1.5.26
 reactos/dll/win32/dciman32        # Synced to Wine-1.5.19