[akhaldi] 61481: [WINTRUST] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716
Author: akhaldi Date: Wed Jan 1 22:11:43 2014 New Revision: 61481
URL: http://svn.reactos.org/svn/reactos?rev=61481&view=rev Log: [WINTRUST] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716
Modified: trunk/reactos/dll/win32/wintrust/asn.c trunk/reactos/dll/win32/wintrust/crypt.c trunk/reactos/dll/win32/wintrust/register.c trunk/reactos/dll/win32/wintrust/softpub.c trunk/reactos/dll/win32/wintrust/wintrust_main.c trunk/reactos/dll/win32/wintrust/wintrust_priv.h
Modified: trunk/reactos/dll/win32/wintrust/asn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/asn.c?re... ============================================================================== --- trunk/reactos/dll/win32/wintrust/asn.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/asn.c [iso-8859-1] Wed Jan 1 22:11:43 2014 @@ -18,21 +18,10 @@ * */
-#include <config.h> -//#include "wine/port.h" - -//#include <stdarg.h> -#include <stdio.h> +#include "wintrust_priv.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 <winternl.h> -#include <wine/debug.h> #include <wine/exception.h>
WINE_DEFAULT_DEBUG_CHANNEL(cryptasn);
Modified: trunk/reactos/dll/win32/wintrust/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/crypt.c?... ============================================================================== --- trunk/reactos/dll/win32/wintrust/crypt.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/crypt.c [iso-8859-1] Wed Jan 1 22:11:43 2014 @@ -22,18 +22,9 @@ * 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 "wintrust_priv.h" + #include <imagehlp.h> -#include <winternl.h> - -#include <wine/debug.h> -#include <wine/unicode.h>
WINE_DEFAULT_DEBUG_CHANNEL(wintrust);
Modified: trunk/reactos/dll/win32/wintrust/register.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/register... ============================================================================== --- trunk/reactos/dll/win32/wintrust/register.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/register.c [iso-8859-1] Wed Jan 1 22:11:43 2014 @@ -18,22 +18,7 @@ * 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 <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(wintrust);
Modified: trunk/reactos/dll/win32/wintrust/softpub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/softpub.... ============================================================================== --- trunk/reactos/dll/win32/wintrust/softpub.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/softpub.c [iso-8859-1] Wed Jan 1 22:11:43 2014 @@ -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 <wintrust.h> -#include <mssip.h> -#include <softpub.h> -#include <winnls.h> -#include <wine/debug.h> + +#include "wintrust_priv.h"
WINE_DEFAULT_DEBUG_CHANNEL(wintrust);
Modified: trunk/reactos/dll/win32/wintrust/wintrust_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrust... ============================================================================== --- trunk/reactos/dll/win32/wintrust/wintrust_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/wintrust_main.c [iso-8859-1] Wed Jan 1 22:11:43 2014 @@ -17,30 +17,10 @@ * 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 "wintrust_priv.h" -#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(wintrust);
Modified: trunk/reactos/dll/win32/wintrust/wintrust_priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrust... ============================================================================== --- trunk/reactos/dll/win32/wintrust/wintrust_priv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/wintrust_priv.h [iso-8859-1] Wed Jan 1 22:11:43 2014 @@ -18,6 +18,29 @@ #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;
-
akhaldi＠svn.reactos.org