[CRYPT32]
authorAmine Khaldi <amine.khaldi@reactos.org>
Mon, 23 Dec 2013 17:56:35 +0000 (17:56 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Mon, 23 Dec 2013 17:56:35 +0000 (17:56 +0000)
* Move some inclusions to the main header.
* Remove inclusions and definitions that already exist in the main header/resource file.
CORE-7716

svn path=/trunk/; revision=61353

42 files changed:
reactos/dll/win32/crypt32/base64.c
reactos/dll/win32/crypt32/cert.c
reactos/dll/win32/crypt32/chain.c
reactos/dll/win32/crypt32/collectionstore.c
reactos/dll/win32/crypt32/context.c
reactos/dll/win32/crypt32/crl.c
reactos/dll/win32/crypt32/crypt32.rc
reactos/dll/win32/crypt32/crypt32_private.h
reactos/dll/win32/crypt32/cryptres.h
reactos/dll/win32/crypt32/ctl.c
reactos/dll/win32/crypt32/decode.c
reactos/dll/win32/crypt32/encode.c
reactos/dll/win32/crypt32/filestore.c
reactos/dll/win32/crypt32/lang/crypt32_De.rc
reactos/dll/win32/crypt32/lang/crypt32_En.rc
reactos/dll/win32/crypt32/lang/crypt32_Fr.rc
reactos/dll/win32/crypt32/lang/crypt32_He.rc
reactos/dll/win32/crypt32/lang/crypt32_Hu.rc
reactos/dll/win32/crypt32/lang/crypt32_It.rc
reactos/dll/win32/crypt32/lang/crypt32_Ko.rc
reactos/dll/win32/crypt32/lang/crypt32_Lt.rc
reactos/dll/win32/crypt32/lang/crypt32_Nl.rc
reactos/dll/win32/crypt32/lang/crypt32_No.rc
reactos/dll/win32/crypt32/lang/crypt32_Pl.rc
reactos/dll/win32/crypt32/lang/crypt32_Pt.rc
reactos/dll/win32/crypt32/lang/crypt32_Ro.rc
reactos/dll/win32/crypt32/lang/crypt32_Sv.rc
reactos/dll/win32/crypt32/lang/crypt32_Uk.rc
reactos/dll/win32/crypt32/main.c
reactos/dll/win32/crypt32/message.c
reactos/dll/win32/crypt32/msg.c
reactos/dll/win32/crypt32/object.c
reactos/dll/win32/crypt32/oid.c
reactos/dll/win32/crypt32/proplist.c
reactos/dll/win32/crypt32/protectdata.c
reactos/dll/win32/crypt32/provstore.c
reactos/dll/win32/crypt32/regstore.c
reactos/dll/win32/crypt32/rootstore.c
reactos/dll/win32/crypt32/serialize.c
reactos/dll/win32/crypt32/sip.c
reactos/dll/win32/crypt32/store.c
reactos/dll/win32/crypt32/str.c

index 6499901..1edd13b 100644 (file)
  * 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);
 
index 695b792..052a024 100644 (file)
  *
  */
 
-#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 <rpc.h>
-#include <wine/debug.h>
-#include <wine/unicode.h>
 #include "crypt32_private.h"
 
+#include <rpc.h>
+
 WINE_DEFAULT_DEBUG_CHANNEL(crypt);
 
 /* Internal version of CertGetCertificateContextProperty that gets properties
index d112673..0222b34 100644 (file)
  * 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);
 
index 6fe380c..192cab6 100644 (file)
  * 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);
index bf4ccf3..2fe8642 100644 (file)
  * 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);
index 5b5a455..6432672 100644 (file)
  *
  */
 
-#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);
index 6aa792a..692226b 100644 (file)
  * 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"
index ea85cbc..998cc6c 100644 (file)
 #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)
 #define ASN_BITSTRING       (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x03)
index 06a655c..4ef86aa 100644 (file)
@@ -18,8 +18,6 @@
 #ifndef __WINE_CRYPTRES_H__
 #define __WINE_CRYPTRES_H__
 
-//#include <windef.h>
-
 #define IDS_AUTHORITY_KEY_ID 1000
 #define IDS_KEY_ATTRIBUTES 1001
 #define IDS_KEY_USAGE_RESTRICTION 1002
index 9a8f176..cff0c4b 100644 (file)
  *
  */
 
-#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);
index e5f8baf..9659a78 100644 (file)
  * 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: */
index 7590012..16ff330 100644 (file)
  * 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);
index 52e5752..b05751b 100644 (file)
  * 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);
index c896404..60b9c33 100644 (file)
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "cryptres.h"
-
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)
index d5f5b63..178261e 100644 (file)
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "cryptres.h"
-
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
index 38ba7d5..bc54725 100644 (file)
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "cryptres.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
index f29a215..d9ab383 100644 (file)
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "cryptres.h"
-
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 
 STRINGTABLE
index 44bd36e..b7f9a9f 100644 (file)
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "cryptres.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 
index 92295ca..2780e18 100644 (file)
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "cryptres.h"
-
 /*UTF-8*/
 #pragma code_page(65001)
 
index c83fd8e..fa84954 100644 (file)
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "cryptres.h"
-
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 STRINGTABLE
index 4eecf3c..bf464d3 100644 (file)
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "cryptres.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 
index 49f296a..ac3e9a4 100644 (file)
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "cryptres.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
index 988dbe8..2e72f0a 100644 (file)
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "cryptres.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
index 2f52520..af1b637 100644 (file)
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "cryptres.h"
-
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
index 3e29352..1a2b1e9 100644 (file)
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "cryptres.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
index d75d753..ba9c6c1 100644 (file)
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "cryptres.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 
index f7d5f1d..e1d7242 100644 (file)
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "cryptres.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
index d47bb4b..07cdf62 100644 (file)
@@ -21,8 +21,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "cryptres.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 
index 78f14f9..f164aeb 100644 (file)
  * 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 "i_cryptasn1tls.h"
 #include "crypt32_private.h"
-#include "wine/debug.h"
+
+#include "i_cryptasn1tls.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(crypt);
 
index 5b77c87..e740235 100644 (file)
  * 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);
 
index 25204ea..2b6e938 100644 (file)
  * 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);
index 5f45d81..157ac6b 100644 (file)
  * 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);
 
index 4c3f95f..df1f90a 100644 (file)
  * 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);
index 31cd53b..2d021b2 100644 (file)
  * 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);
index 20e11f4..6ef8b63 100644 (file)
  *
  */
 
-#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);
 
index 795c8e1..5968ac1 100644 (file)
  * 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);
index f4b4295..e5d352e 100644 (file)
  * 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);
index 7957516..6f82832 100644 (file)
@@ -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>
 #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);
 
index 7ca881c..23b0172 100644 (file)
  * 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);
index 4a32cad..f13daa1 100644 (file)
  * 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);
 
index 6d27fc1..1d6ccb8 100644 (file)
  * - 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);
index 6d406d2..5974d4c 100644 (file)
  * 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);