Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-12 08:18:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINTRUST]

Browse source 
* 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
This commit is contained in:
Amine Khaldi 2014-01-01 22:11:43 +00:00
parent 1276658964
commit e58adb9843
6 changed files with 28 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

13
reactos/dll/win32/wintrust/asn.c
View file

@ -18,21 +18,10 @@
* *
*/ */
#include <config.h> #include "wintrust_priv.h"
//#include "wine/port.h"
//#include <stdarg.h>
#include <stdio.h>
#include <assert.h> #include <assert.h>
#define NONAMELESSUNION
#include <windef.h>
#include <winbase.h>
//#include "winerror.h"
//#include "wincrypt.h"
#include <wintrust.h>
#include <snmp.h> #include <snmp.h>
#include <winternl.h>
#include <wine/debug.h>
#include <wine/exception.h> #include <wine/exception.h>
WINE_DEFAULT_DEBUG_CHANNEL(cryptasn); WINE_DEFAULT_DEBUG_CHANNEL(cryptasn);

13
reactos/dll/win32/wintrust/crypt.c
View file

@ -22,18 +22,9 @@
* 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 "wintrust_priv.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 <wine/debug.h> #include <imagehlp.h>
#include <wine/unicode.h>
WINE_DEFAULT_DEBUG_CHANNEL(wintrust); WINE_DEFAULT_DEBUG_CHANNEL(wintrust);

15
reactos/dll/win32/wintrust/register.c
View file

@ -18,22 +18,7 @@
* 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"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(wintrust); WINE_DEFAULT_DEBUG_CHANNEL(wintrust);

11
reactos/dll/win32/wintrust/softpub.c
View file

@ -15,17 +15,8 @@
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* 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>
#define NONAMELESSUNION #include "wintrust_priv.h"
#include <windef.h>
#include <winbase.h>
#include <wintrust.h>
#include <mssip.h>
#include <softpub.h>
#include <winnls.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(wintrust); WINE_DEFAULT_DEBUG_CHANNEL(wintrust);

22
reactos/dll/win32/wintrust/wintrust_main.c
View file

@ -17,30 +17,10 @@
* 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 #include "wintrust_priv.h"
#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 <cryptdlg.h> #include <cryptdlg.h>
#include <cryptuiapi.h> #include <cryptuiapi.h>
//#include "wintrust_priv.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(wintrust); WINE_DEFAULT_DEBUG_CHANNEL(wintrust);

23
reactos/dll/win32/wintrust/wintrust_priv.h
View file

@ -18,6 +18,29 @@
#ifndef __WINTRUST_PRIV_H__ #ifndef __WINTRUST_PRIV_H__
#define __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_Alloc(DWORD cb) __WINE_ALLOC_SIZE(1) DECLSPEC_HIDDEN;
void WINAPI WINTRUST_Free(void *p) DECLSPEC_HIDDEN; void WINAPI WINTRUST_Free(void *p) DECLSPEC_HIDDEN;
BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store) DECLSPEC_HIDDEN; BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store) DECLSPEC_HIDDEN;