* Move some inclusions to the main header.
* Remove inclusions and definitions that already exist in the main header.
CORE-7716
svn path=/trunk/; revision=61481
-#include <config.h>
-//#include "wine/port.h"
+#include "wintrust_priv.h"
-//#include <stdarg.h>
-#include <stdio.h>
-#define NONAMELESSUNION
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"
-//#include "wincrypt.h"
-#include <wintrust.h>
-#include <winternl.h>
-#include <wine/debug.h>
#include <wine/exception.h>
WINE_DEFAULT_DEBUG_CHANNEL(cryptasn);
#include <wine/exception.h>
WINE_DEFAULT_DEBUG_CHANNEL(cryptasn);
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
* 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 <wintrust.h>
-#include <mscat.h>
-//#include "mssip.h"
-#include <imagehlp.h>
-#include <winternl.h>
+#include "wintrust_priv.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
WINE_DEFAULT_DEBUG_CHANNEL(wintrust);
WINE_DEFAULT_DEBUG_CHANNEL(wintrust);
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"
-#include <winuser.h>
-#include <winreg.h>
-#include <winnls.h>
-//#include "objbase.h"
-
-//#include "guiddef.h"
-//#include "wintrust.h"
-#include <softpub.h>
-#include <mssip.h>
#include "wintrust_priv.h"
#include "wintrust_priv.h"
WINE_DEFAULT_DEBUG_CHANNEL(wintrust);
WINE_DEFAULT_DEBUG_CHANNEL(wintrust);
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
* 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 NONAMELESSUNION
-
-#include <windef.h>
-#include <winbase.h>
-#include <wintrust.h>
-#include <mssip.h>
-#include <softpub.h>
-#include <winnls.h>
-#include <wine/debug.h>
+#include "wintrust_priv.h"
WINE_DEFAULT_DEBUG_CHANNEL(wintrust);
WINE_DEFAULT_DEBUG_CHANNEL(wintrust);
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-
-#include <stdarg.h>
-
-#define NONAMELESSUNION
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"
-#include <winreg.h>
-//#include "guiddef.h"
-//#include "wintrust.h"
-#include <softpub.h>
-#include <mscat.h>
-#include <objbase.h>
-#include <winuser.h>
+#include "wintrust_priv.h"
+
#include <cryptdlg.h>
#include <cryptuiapi.h>
#include <cryptdlg.h>
#include <cryptuiapi.h>
-//#include "wintrust_priv.h"
-#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(wintrust);
WINE_DEFAULT_DEBUG_CHANNEL(wintrust);
#ifndef __WINTRUST_PRIV_H__
#define __WINTRUST_PRIV_H__
#ifndef __WINTRUST_PRIV_H__
#define __WINTRUST_PRIV_H__
+#include <config.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 <winternl.h>
+#include <wintrust.h>
+#include <softpub.h>
+#include <mscat.h>
+#include <mssip.h>
+
+#include <wine/debug.h>
+#include <wine/unicode.h>
+
void * WINAPI WINTRUST_Alloc(DWORD cb) __WINE_ALLOC_SIZE(1) DECLSPEC_HIDDEN;
void WINAPI WINTRUST_Free(void *p) DECLSPEC_HIDDEN;
BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store) DECLSPEC_HIDDEN;
void * WINAPI WINTRUST_Alloc(DWORD cb) __WINE_ALLOC_SIZE(1) DECLSPEC_HIDDEN;
void WINAPI WINTRUST_Free(void *p) DECLSPEC_HIDDEN;
BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store) DECLSPEC_HIDDEN;