[akhaldi] 61353: [CRYPT32] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header/resource file. CORE-7716
Author: akhaldi Date: Mon Dec 23 17:56:35 2013 New Revision: 61353
URL: http://svn.reactos.org/svn/reactos?rev=61353&view=rev Log: [CRYPT32] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header/resource file. CORE-7716
Modified: trunk/reactos/dll/win32/crypt32/base64.c trunk/reactos/dll/win32/crypt32/cert.c trunk/reactos/dll/win32/crypt32/chain.c trunk/reactos/dll/win32/crypt32/collectionstore.c trunk/reactos/dll/win32/crypt32/context.c trunk/reactos/dll/win32/crypt32/crl.c trunk/reactos/dll/win32/crypt32/crypt32.rc trunk/reactos/dll/win32/crypt32/crypt32_private.h trunk/reactos/dll/win32/crypt32/cryptres.h trunk/reactos/dll/win32/crypt32/ctl.c trunk/reactos/dll/win32/crypt32/decode.c trunk/reactos/dll/win32/crypt32/encode.c trunk/reactos/dll/win32/crypt32/filestore.c 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/message.c trunk/reactos/dll/win32/crypt32/msg.c trunk/reactos/dll/win32/crypt32/object.c trunk/reactos/dll/win32/crypt32/oid.c trunk/reactos/dll/win32/crypt32/proplist.c trunk/reactos/dll/win32/crypt32/protectdata.c trunk/reactos/dll/win32/crypt32/provstore.c trunk/reactos/dll/win32/crypt32/regstore.c trunk/reactos/dll/win32/crypt32/rootstore.c trunk/reactos/dll/win32/crypt32/serialize.c trunk/reactos/dll/win32/crypt32/sip.c trunk/reactos/dll/win32/crypt32/store.c trunk/reactos/dll/win32/crypt32/str.c
Modified: trunk/reactos/dll/win32/crypt32/base64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/base64.c?... ============================================================================== --- trunk/reactos/dll/win32/crypt32/base64.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/base64.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -19,14 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" -#include <wincrypt.h> -#include <wine/debug.h> -#include <wine/unicode.h> +#include "crypt32_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(crypt);
Modified: trunk/reactos/dll/win32/crypt32/cert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/cert.c?re... ============================================================================== --- trunk/reactos/dll/win32/crypt32/cert.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/cert.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -17,22 +17,9 @@ * */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <assert.h> -#include <stdarg.h> - -#define NONAMELESSUNION -#include <windef.h> -#include <winbase.h> -#include <wincrypt.h> -//#include "winnls.h" +#include "crypt32_private.h" + #include <rpc.h> -#include <wine/debug.h> -#include <wine/unicode.h> -#include "crypt32_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(crypt);
Modified: trunk/reactos/dll/win32/crypt32/chain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/chain.c?r... ============================================================================== --- trunk/reactos/dll/win32/crypt32/chain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/chain.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -16,17 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ -#include <stdarg.h> -#define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#define CERT_CHAIN_PARA_HAS_EXTRA_FIELDS -#define CERT_REVOCATION_PARA_HAS_EXTRA_FIELDS -#include "wincrypt.h" -#include "wininet.h" -#include "wine/debug.h" -#include "wine/unicode.h" + #include "crypt32_private.h" + +#include <wininet.h>
WINE_DEFAULT_DEBUG_CHANNEL(crypt); WINE_DECLARE_DEBUG_CHANNEL(chain);
Modified: trunk/reactos/dll/win32/crypt32/collectionstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/collectio... ============================================================================== --- trunk/reactos/dll/win32/crypt32/collectionstore.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/collectionstore.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -15,12 +15,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "wine/debug.h" -#include "wine/list.h" + #include "crypt32_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(crypt);
Modified: trunk/reactos/dll/win32/crypt32/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/context.c... ============================================================================== --- trunk/reactos/dll/win32/crypt32/context.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/context.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -15,13 +15,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "wine/debug.h" -#include "wine/list.h" + #include "crypt32_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(context);
Modified: trunk/reactos/dll/win32/crypt32/crl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crl.c?rev... ============================================================================== --- trunk/reactos/dll/win32/crypt32/crl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crl.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -17,14 +17,6 @@ * */
-#include <assert.h> -#include <stdarg.h> -#define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "wine/debug.h" -#include "wine/unicode.h" #include "crypt32_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(crypt);
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] Mon Dec 23 17:56:35 2013 @@ -17,10 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" -//#include "cryptres.h" + +#include "cryptres.h"
#define WINE_FILEDESCRIPTION_STR "Wine CryptoAPI Library" #define WINE_FILENAME_STR "crypt32.dll"
Modified: trunk/reactos/dll/win32/crypt32/crypt32_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_p... ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32_private.h [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -18,6 +18,35 @@
#ifndef __CRYPT32_PRIVATE_H__ #define __CRYPT32_PRIVATE_H__ + +#include <config.h> +#include <wine/port.h> + +#include <assert.h> +#include <stdarg.h> +#include <stdio.h> + +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define NONAMELESSUNION + +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <winreg.h> +#include <snmp.h> + +#define CERT_CHAIN_PARA_HAS_EXTRA_FIELDS +#define CERT_REVOCATION_PARA_HAS_EXTRA_FIELDS +#include <wincrypt.h> + +#include <mssip.h> + +#include <wine/unicode.h> +#include <wine/list.h> +#include <wine/exception.h> +#include <wine/debug.h>
/* a few asn.1 tags we need */ #define ASN_BOOL (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x01)
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] Mon Dec 23 17:56:35 2013 @@ -17,8 +17,6 @@ */ #ifndef __WINE_CRYPTRES_H__ #define __WINE_CRYPTRES_H__ - -//#include <windef.h>
#define IDS_AUTHORITY_KEY_ID 1000 #define IDS_KEY_ATTRIBUTES 1001
Modified: trunk/reactos/dll/win32/crypt32/ctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/ctl.c?rev... ============================================================================== --- trunk/reactos/dll/win32/crypt32/ctl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/ctl.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -17,14 +17,6 @@ * */
-#include <assert.h> -#include <stdarg.h> - -#define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "wine/debug.h" #include "crypt32_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(crypt);
Modified: trunk/reactos/dll/win32/crypt32/decode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/decode.c?... ============================================================================== --- trunk/reactos/dll/win32/crypt32/decode.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/decode.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -30,23 +30,6 @@ * MSDN, especially "Constants for CryptEncodeObject and CryptDecodeObject" */
-#include "config.h" -#include "wine/port.h" - -#include <assert.h> -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> - -#define NONAMELESSUNION - -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "winnls.h" -#include "snmp.h" -#include "wine/debug.h" -#include "wine/exception.h" #include "crypt32_private.h"
/* This is a bit arbitrary, but to set some limit: */
Modified: trunk/reactos/dll/win32/crypt32/encode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/encode.c?... ============================================================================== --- trunk/reactos/dll/win32/crypt32/encode.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/encode.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -30,23 +30,6 @@ * MSDN, especially "Constants for CryptEncodeObject and CryptDecodeObject" */
-#include "config.h" -#include "wine/port.h" - -#include <assert.h> -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> - -#define NONAMELESSUNION - -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "snmp.h" -#include "wine/debug.h" -#include "wine/exception.h" -#include "wine/unicode.h" #include "crypt32_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(cryptasn);
Modified: trunk/reactos/dll/win32/crypt32/filestore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/filestore... ============================================================================== --- trunk/reactos/dll/win32/crypt32/filestore.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/filestore.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -15,13 +15,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "winnls.h" -#include "wine/debug.h" -#include "wine/unicode.h" + #include "crypt32_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(crypt);
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] Mon Dec 23 17:56:35 2013 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "cryptres.h"
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
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] Mon Dec 23 17:56:35 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "cryptres.h"
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
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] Mon Dec 23 17:56:35 2013 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "cryptres.h"
#pragma code_page(65001)
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] Mon Dec 23 17:56:35 2013 @@ -19,8 +19,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "cryptres.h"
LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
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] Mon Dec 23 17:56:35 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "cryptres.h"
/* UTF-8 */ #pragma code_page(65001)
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] Mon Dec 23 17:56:35 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "cryptres.h"
/*UTF-8*/ #pragma code_page(65001)
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] Mon Dec 23 17:56:35 2013 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "cryptres.h"
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
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] Mon Dec 23 17:56:35 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "cryptres.h"
/* UTF-8 */ #pragma code_page(65001)
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] Mon Dec 23 17:56:35 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "cryptres.h"
#pragma code_page(65001)
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] Mon Dec 23 17:56:35 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "cryptres.h"
#pragma code_page(65001)
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] Mon Dec 23 17:56:35 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "cryptres.h"
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
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] Mon Dec 23 17:56:35 2013 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "cryptres.h"
#pragma code_page(65001)
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] Mon Dec 23 17:56:35 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "cryptres.h"
/* UTF-8 */ #pragma code_page(65001)
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] Mon Dec 23 17:56:35 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "cryptres.h"
#pragma code_page(65001)
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] Mon Dec 23 17:56:35 2013 @@ -20,8 +20,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "cryptres.h"
/* UTF-8 */ #pragma code_page(65001)
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] Mon Dec 23 17:56:35 2013 @@ -17,18 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include <stdarg.h> -#include <stdio.h> - -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "winreg.h" -#include "winuser.h" +#include "crypt32_private.h" + #include "i_cryptasn1tls.h" -#include "crypt32_private.h" -#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(crypt);
Modified: trunk/reactos/dll/win32/crypt32/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/message.c... ============================================================================== --- trunk/reactos/dll/win32/crypt32/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/message.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -16,12 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" - -#include "wine/debug.h" +#include "crypt32_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(crypt);
Modified: trunk/reactos/dll/win32/crypt32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/msg.c?rev... ============================================================================== --- trunk/reactos/dll/win32/crypt32/msg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/msg.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -16,18 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" - -#include <stdarg.h> -#define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "snmp.h" - -#include "wine/debug.h" -#include "wine/exception.h" #include "crypt32_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(crypt);
Modified: trunk/reactos/dll/win32/crypt32/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/object.c?... ============================================================================== --- trunk/reactos/dll/win32/crypt32/object.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/object.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -17,18 +17,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "mssip.h" -#include "winuser.h" -#include "wintrust.h" + #include "crypt32_private.h" + +#include <wintrust.h> + #include "cryptres.h" -#include "wine/unicode.h" -#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(crypt);
Modified: trunk/reactos/dll/win32/crypt32/oid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/oid.c?rev... ============================================================================== --- trunk/reactos/dll/win32/crypt32/oid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/oid.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -17,20 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" - -#include <stdio.h> -#include <stdarg.h> -#define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "winreg.h" -#include "winuser.h" -#include "wine/debug.h" -#include "wine/list.h" #include "crypt32_private.h" + #include "cryptres.h"
WINE_DEFAULT_DEBUG_CHANNEL(crypt);
Modified: trunk/reactos/dll/win32/crypt32/proplist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/proplist.... ============================================================================== --- trunk/reactos/dll/win32/crypt32/proplist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/proplist.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -15,13 +15,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "wine/debug.h" -#include "wine/list.h" + #include "crypt32_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(crypt);
Modified: trunk/reactos/dll/win32/crypt32/protectdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/protectda... ============================================================================== --- trunk/reactos/dll/win32/crypt32/protectdata.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/protectdata.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -34,15 +34,7 @@ * */
-#include <stdarg.h> -#include <stdio.h> -#include <string.h> -#include <stdlib.h> - -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "wine/debug.h" +#include "crypt32_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(crypt);
Modified: trunk/reactos/dll/win32/crypt32/provstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/provstore... ============================================================================== --- trunk/reactos/dll/win32/crypt32/provstore.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/provstore.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -15,12 +15,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "wine/debug.h" -#include "wine/list.h" + #include "crypt32_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(crypt);
Modified: trunk/reactos/dll/win32/crypt32/regstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/regstore.... ============================================================================== --- trunk/reactos/dll/win32/crypt32/regstore.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/regstore.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -15,15 +15,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "winreg.h" -#include "winuser.h" -#include "wine/debug.h" -#include "wine/list.h" + #include "crypt32_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(crypt);
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] Mon Dec 23 17:56:35 2013 @@ -15,9 +15,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include <stdarg.h> -#include <stdio.h> + +#include "crypt32_private.h" + #include <sys/types.h> #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -34,15 +34,6 @@ #ifdef HAVE_SECURITY_SECURITY_H #include <Security/Security.h> #endif -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "wincrypt.h" -#include "winternl.h" -#include "wine/debug.h" -#include "crypt32_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(crypt);
Modified: trunk/reactos/dll/win32/crypt32/serialize.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/serialize... ============================================================================== --- trunk/reactos/dll/win32/crypt32/serialize.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/serialize.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -16,15 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" - -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "wine/debug.h" -#include "wine/exception.h" #include "crypt32_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(crypt);
Modified: trunk/reactos/dll/win32/crypt32/sip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/sip.c?rev... ============================================================================== --- trunk/reactos/dll/win32/crypt32/sip.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/sip.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -18,19 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <stdarg.h> -#include <stdio.h> - -#include "windef.h" -#include "winbase.h" -#include "wincrypt.h" -#include "winreg.h" -#include "winnls.h" -#include "mssip.h" -#include "winuser.h" - -#include "wine/debug.h" -#include "wine/list.h" +#include "crypt32_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(crypt);
Modified: trunk/reactos/dll/win32/crypt32/store.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/store.c?r... ============================================================================== --- trunk/reactos/dll/win32/crypt32/store.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/store.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -23,20 +23,6 @@ * - Many flags, options and whatnot are unimplemented. */
-#include "config.h" -#include "wine/port.h" - -#include <assert.h> -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "winreg.h" -#include "winuser.h" -#include "wincrypt.h" -#include "wine/debug.h" -#include "wine/list.h" -#include "wine/exception.h" #include "crypt32_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(crypt);
Modified: trunk/reactos/dll/win32/crypt32/str.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/str.c?rev... ============================================================================== --- trunk/reactos/dll/win32/crypt32/str.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/str.c [iso-8859-1] Mon Dec 23 17:56:35 2013 @@ -15,17 +15,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define NONAMELESSUNION - -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "winuser.h" -#include "wincrypt.h" -#include "wine/debug.h" -#include "wine/unicode.h" + +#include "crypt32_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(crypt);
-
akhaldi＠svn.reactos.org