Author: akhaldi Date: Sun Sep 15 13:58:50 2013 New Revision: 60131
URL: http://svn.reactos.org/svn/reactos?rev=60131&view=rev Log: [CRYPT32] * Sync with Wine 1.7.1.
Removed: trunk/reactos/dll/win32/crypt32/version.rc Modified: trunk/reactos/dll/win32/crypt32/CMakeLists.txt trunk/reactos/dll/win32/crypt32/crypt32.rc trunk/reactos/dll/win32/crypt32/cryptres.h trunk/reactos/dll/win32/crypt32/lang/crypt32_De.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_En.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Fr.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_He.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Hu.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_It.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Ko.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Lt.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Nl.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_No.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Pl.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Pt.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Ro.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Sv.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Uk.rc trunk/reactos/dll/win32/crypt32/main.c trunk/reactos/dll/win32/crypt32/rootstore.c trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/crypt32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/CMakeList... ============================================================================== --- trunk/reactos/dll/win32/crypt32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/CMakeLists.txt [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -39,13 +39,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/crypt32.def)
add_library(crypt32 SHARED ${SOURCE} crypt32.rc) - -if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #allow_warnings(crypt32) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") -endif() - set_module_type(crypt32 win32dll) target_link_libraries(crypt32 wine ${PSEH_LIB} oldnames) add_importlibs(crypt32 user32 advapi32 msvcrt kernel32 ntdll)
Modified: trunk/reactos/dll/win32/crypt32/crypt32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.r... ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32.rc [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -22,7 +22,14 @@ //#include "winuser.h" //#include "cryptres.h"
-#include "version.rc" +#define WINE_FILEDESCRIPTION_STR "Wine CryptoAPI Library" +#define WINE_FILENAME_STR "crypt32.dll" +#define WINE_FILEVERSION 5,131,2600,1243 +#define WINE_FILEVERSION_STR "5.131.2600.1243" +#define WINE_PRODUCTVERSION 5,131,2600,1243 +#define WINE_PRODUCTVERSION_STR "5.131.2600.1243" + +#include <wine/wine_common_ver.rc>
#ifdef LANGUAGE_EN_US #include "lang/crypt32_En.rc"
Modified: trunk/reactos/dll/win32/crypt32/cryptres.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/cryptres.... ============================================================================== --- trunk/reactos/dll/win32/crypt32/cryptres.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/cryptres.h [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -61,9 +61,6 @@ #define IDS_NETSCAPE_CA_POLICY_URL 1038 #define IDS_NETSCAPE_SSL_SERVER_NAME 1039 #define IDS_NETSCAPE_COMMENT 1040 -#define IDS_SPC_SP_AGENCY_INFO 1041 -#define IDS_SPC_FINANCIAL_CRITERIA 1042 -#define IDS_SPC_MINIMAL_CRITERIA 1043 #define IDS_COUNTRY 1044 #define IDS_ORGANIZATION 1045 #define IDS_ORGANIZATIONAL_UNIT 1046
Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cryp... ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_De.rc [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -68,9 +68,6 @@ IDS_NETSCAPE_CA_POLICY_URL "Netscape CA Richtlinien-URL" IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL Servername" IDS_NETSCAPE_COMMENT "Netscape Kommentar" - IDS_SPC_SP_AGENCY_INFO "SpcSp Agentur-Information" - IDS_SPC_FINANCIAL_CRITERIA "Spc Finanzielle Kriterien" - IDS_SPC_MINIMAL_CRITERIA "Spc Minimale Kriterien" IDS_COUNTRY "Land/Region" IDS_ORGANIZATION "Organisation" IDS_ORGANIZATIONAL_UNIT "Organisationseinheit"
Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cryp... ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_En.rc [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -48,7 +48,7 @@ IDS_COUNTER_SIGN "Counter Sign" IDS_CHALLENGE_PASSWORD "Challenge Password" IDS_UNSTRUCTURED_ADDRESS "Unstructured Address" - IDS_SMIME_CAPABILITIES "SMIME Capabilities" + IDS_SMIME_CAPABILITIES "S/MIME Capabilities" IDS_PREFER_SIGNED_DATA "Prefer Signed Data" IDS_CPS "CPS" IDS_USER_NOTICE "User Notice" @@ -65,9 +65,6 @@ IDS_NETSCAPE_CA_POLICY_URL "Netscape CA Policy URL" IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL ServerName" IDS_NETSCAPE_COMMENT "Netscape Comment" - IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" - IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" - IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" IDS_COUNTRY "Country/Region" IDS_ORGANIZATION "Organization" IDS_ORGANIZATIONAL_UNIT "Organizational Unit" @@ -77,7 +74,7 @@ IDS_TITLE "Title" IDS_GIVEN_NAME "Given Name" IDS_INITIALS "Initials" - IDS_SUR_NAME "Sur Name" + IDS_SUR_NAME "Surname" IDS_DOMAIN_COMPONENT "Domain Component" IDS_STREET_ADDRESS "Street Address" IDS_SERIAL_NUMBER "Serial Number"
Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cryp... ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Fr.rc [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -68,9 +68,6 @@ IDS_NETSCAPE_CA_POLICY_URL "URL Netscape des stratégies d'ACL" IDS_NETSCAPE_SSL_SERVER_NAME "Nom du serveur SSL de Netscape" IDS_NETSCAPE_COMMENT "Commentaire Netscape" - IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" - IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" - IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" IDS_COUNTRY "Pays/Région" IDS_ORGANIZATION "Organisation" IDS_ORGANIZATIONAL_UNIT "Unité d'organisation"
Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cryp... ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_He.rc [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -67,9 +67,6 @@ IDS_NETSCAPE_CA_POLICY_URL "Netscape CA Policy URL" IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL ServerName" IDS_NETSCAPE_COMMENT "Netscape Comment" - IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" - IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" - IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" IDS_COUNTRY "Country/Region" IDS_ORGANIZATION "Organization" IDS_ORGANIZATIONAL_UNIT "Organizational Unit"
Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cryp... ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Hu.rc [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -68,9 +68,6 @@ IDS_NETSCAPE_CA_POLICY_URL "Netscape CA szabályzat URL" IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL KiszolgálóNév (ServerName)" IDS_NETSCAPE_COMMENT "Netscape megjgyzés" - IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" - IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" - IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" IDS_COUNTRY "Ország/Régió" IDS_ORGANIZATION "Szervezet" IDS_ORGANIZATIONAL_UNIT "Szervezeti egység"
Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cryp... ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_It.rc [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -68,9 +68,6 @@ IDS_NETSCAPE_CA_POLICY_URL "URL Policy CA Netscape" IDS_NETSCAPE_SSL_SERVER_NAME "NomeServer SSL Netscape" IDS_NETSCAPE_COMMENT "Commento Netscape" - IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" - IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" - IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" IDS_COUNTRY "Paese/Regione" IDS_ORGANIZATION "Organizzazione" IDS_ORGANIZATIONAL_UNIT "Unità Organizzativa"
Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cryp... ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Ko.rc [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -66,9 +66,6 @@ IDS_NETSCAPE_CA_POLICY_URL "³Ý½ºÄÉÀÌÇÁ CA ¹æħ URL" IDS_NETSCAPE_SSL_SERVER_NAME "³Ý½ºÄÉÀÌÇÁ SSL ¼¹öÀ̸§" IDS_NETSCAPE_COMMENT "³Ý½ºÄÉÀÌÇÁ ¼³¸í" - IDS_SPC_SP_AGENCY_INFO "SpcSp°ü¸®ÀÚ Á¤º¸" - IDS_SPC_FINANCIAL_CRITERIA "SpcÀçÁ¤»ó ¿øÄ¢" - IDS_SPC_MINIMAL_CRITERIA "SpcÃÖ¼Ò ¿øÄ¢" IDS_COUNTRY "³ª¶ó/Áö¿ª" IDS_ORGANIZATION "´Üü" IDS_ORGANIZATIONAL_UNIT "´Üü(Organizational Unit)"
Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cryp... ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Lt.rc [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -68,9 +68,6 @@ IDS_NETSCAPE_CA_POLICY_URL "Netscape LÄ® politikos URL" IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL serverio vardas" IDS_NETSCAPE_COMMENT "Netscape komentaras" - IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" - IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" - IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" IDS_COUNTRY "ValstybÄ/regionas" IDS_ORGANIZATION "Ä®staiga" IDS_ORGANIZATIONAL_UNIT "Ä®staigos padalinys"
Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cryp... ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Nl.rc [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -67,9 +67,6 @@ IDS_NETSCAPE_CA_POLICY_URL "Netscape CA Beleids URL" IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL Server Naam" IDS_NETSCAPE_COMMENT "Netscape Commentaar" - IDS_SPC_SP_AGENCY_INFO "SPC SP Agency Informatie" - IDS_SPC_FINANCIAL_CRITERIA "SPC Financiele Criteria" - IDS_SPC_MINIMAL_CRITERIA "SPC Minimale Criteria" IDS_COUNTRY "Land/Regio" IDS_ORGANIZATION "Organisatie" IDS_ORGANIZATIONAL_UNIT "Organisatie Onderdeel"
Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cryp... ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_No.rc [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -67,9 +67,6 @@ IDS_NETSCAPE_CA_POLICY_URL "Netscape-CA-politikk-URL" IDS_NETSCAPE_SSL_SERVER_NAME "Netscape-SSL-tjenernavn" IDS_NETSCAPE_COMMENT "Netscape-kommentar" - IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" - IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" - IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" IDS_COUNTRY "Land/Region" IDS_ORGANIZATION "Organisasjon" IDS_ORGANIZATIONAL_UNIT "Organisasjonsell enhet"
Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cryp... ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Pl.rc [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -65,9 +65,6 @@ IDS_NETSCAPE_CA_POLICY_URL "Adres URL zasad CA Netscape" IDS_NETSCAPE_SSL_SERVER_NAME "Nazwa serwera SSL Netscape" IDS_NETSCAPE_COMMENT "Komentarz Netscape" - IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" - IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" - IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" IDS_COUNTRY "Kraj/Region" IDS_ORGANIZATION "Organizacja" IDS_ORGANIZATIONAL_UNIT "Jednostka organizacyjna"
Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cryp... ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Pt.rc [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -68,9 +68,6 @@ IDS_NETSCAPE_CA_POLICY_URL "URL PolÃtica CA Netscape" IDS_NETSCAPE_SSL_SERVER_NAME "Nome de Servidor SSL Netscape" IDS_NETSCAPE_COMMENT "Comentário Netscape" - IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" - IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" - IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" IDS_COUNTRY "PaÃs/Região" IDS_ORGANIZATION "Organização" IDS_ORGANIZATIONAL_UNIT "Unidade Organizacional" @@ -221,9 +218,6 @@ IDS_NETSCAPE_CA_POLICY_URL "URL PolÃtica CA Netscape" IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL ServerName" IDS_NETSCAPE_COMMENT "Comentário Netscape" - IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" - IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" - IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" IDS_COUNTRY "PaÃs/Região" IDS_ORGANIZATION "Organização" IDS_ORGANIZATIONAL_UNIT "Unidade Organizacional"
Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cryp... ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Ro.rc [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -68,9 +68,6 @@ IDS_NETSCAPE_CA_POLICY_URL "URL-ul politicii CA Netscape" IDS_NETSCAPE_SSL_SERVER_NAME "Nume server SSL Netscape" IDS_NETSCAPE_COMMENT "Comentariul Netscape" - IDS_SPC_SP_AGENCY_INFO "InformaÈiiAgenÈieSpcSp" - IDS_SPC_FINANCIAL_CRITERIA "CriteriiFinanciareSpc" - IDS_SPC_MINIMAL_CRITERIA "CriteriiMinimaleSpc" IDS_COUNTRY "Èara/regiunea" IDS_ORGANIZATION "OrganizaÈia" IDS_ORGANIZATIONAL_UNIT "Unitatea organizaÈionalÄ"
Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cryp... ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Sv.rc [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -67,9 +67,6 @@ IDS_NETSCAPE_CA_POLICY_URL "Netscape CA Policy URL" IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL ServerName" IDS_NETSCAPE_COMMENT "Netscape Comment" - IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" - IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" - IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" IDS_COUNTRY "Land/Region" IDS_ORGANIZATION "Organisation" IDS_ORGANIZATIONAL_UNIT "Organizational Unit"
Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cryp... ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Uk.rc [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -71,9 +71,6 @@ IDS_NETSCAPE_CA_POLICY_URL "Netscape CA Policy URL" IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL ServerName" IDS_NETSCAPE_COMMENT "Netscape ÐоменÑаÑ" - IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" - IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" - IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" IDS_COUNTRY "ÐÑаÑна/РегÑон" IDS_ORGANIZATION "ÐÑганÑзаÑÑÑ" IDS_ORGANIZATIONAL_UNIT "Organizational Unit"
Modified: trunk/reactos/dll/win32/crypt32/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/main.c?re... ============================================================================== --- trunk/reactos/dll/win32/crypt32/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/main.c [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -45,14 +45,12 @@ crypt_oid_init(); break; case DLL_PROCESS_DETACH: + if (pvReserved) break; crypt_oid_free(); crypt_sip_free(); root_store_free(); default_chain_engine_free(); - /* Don't release the default provider on process shutdown, there's - * no guarantee the provider dll hasn't already been unloaded. - */ - if (hDefProv && !pvReserved) CryptReleaseContext(hDefProv, 0); + if (hDefProv) CryptReleaseContext(hDefProv, 0); break; } return TRUE;
Modified: trunk/reactos/dll/win32/crypt32/rootstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/rootstore... ============================================================================== --- trunk/reactos/dll/win32/crypt32/rootstore.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/rootstore.c [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -326,6 +326,7 @@ static BOOL import_certs_from_path(LPCSTR path, HCERTSTORE store, BOOL allow_dir);
+#ifdef HAVE_READDIR static BOOL check_buffer_resize(char **ptr_buf, size_t *buf_size, size_t check_size) { if (check_size > *buf_size) @@ -351,6 +352,7 @@
return TRUE; } +#endif
/* Opens path, which must be a directory, and imports certificates from every * file in the directory into store.
Removed: trunk/reactos/dll/win32/crypt32/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/version.r... ============================================================================== --- trunk/reactos/dll/win32/crypt32/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/version.rc (removed) @@ -1,28 +0,0 @@ -/* - * crypt32 dll version resources - * - * Copyright (C) 2006 Juan Lang - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#define WINE_FILEDESCRIPTION_STR "Wine CryptoAPI Library" -#define WINE_FILENAME_STR "crypt32.dll" -#define WINE_FILEVERSION 5,131,2600,1243 -#define WINE_FILEVERSION_STR "5.131.2600.1243" -#define WINE_PRODUCTVERSION 5,131,2600,1243 -#define WINE_PRODUCTVERSION_STR "5.131.2600.1243" - -#include "wine/wine_common_ver.rc"
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=6... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 15 13:58:50 2013 @@ -63,7 +63,7 @@ reactos/dll/win32/comdlg32 # Synced to Wine 1.3.37 reactos/dll/win32/compstui # Synced to Wine-1.5.19 reactos/dll/win32/credui # Synced to Wine-1.7.1 -reactos/dll/win32/crypt32 # Synced to Wine-1.5.26 +reactos/dll/win32/crypt32 # Synced to Wine-1.7.1 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
-
akhaldi＠svn.reactos.org