[akhaldi] 61776: [MAPI32] * Improve header inclusions. CORE-7716

Author: akhaldi
Date: Thu Jan 23 17:52:54 2014
New Revision: 61776

URL: http://svn.reactos.org/svn/reactos?rev=61776&view=rev
Log:
[MAPI32]
* Improve header inclusions.
CORE-7716

Modified:
    trunk/reactos/dll/win32/mapi32/mapi32_main.c
    trunk/reactos/dll/win32/mapi32/precomp.h
    trunk/reactos/dll/win32/mapi32/prop.c
    trunk/reactos/dll/win32/mapi32/stubs.c
    trunk/reactos/dll/win32/mapi32/util.c
    trunk/reactos/dll/win32/mapi32/util.h

Modified: trunk/reactos/dll/win32/mapi32/mapi32_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32_ma…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/mapi32_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/mapi32_main.c	[iso-8859-1] Thu Jan 23 17:52:54 2014
@@ -19,8 +19,6 @@
  */
 
 #include "precomp.h"
-
-#include <mapix.h>
 
 DECLSPEC_HIDDEN LONG MAPI_ObjectCount = 0;
 DECLSPEC_HIDDEN HINSTANCE hInstMAPI32;

Modified: trunk/reactos/dll/win32/mapi32/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/precomp.h…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/precomp.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/precomp.h	[iso-8859-1] Thu Jan 23 17:52:54 2014
@@ -1,7 +1,7 @@
 #ifndef _MAPI32_PCH_
 #define _MAPI32_PCH_
 
-#include <config.h>
+#include <wine/config.h>
 
 #include <stdarg.h>
 
@@ -16,14 +16,15 @@
 #include <windef.h>
 #include <winbase.h>
 #include <winreg.h>
+#include <mapi.h>
 #include <mapival.h>
-#include <mapiutil.h>
-
-#include <wine/unicode.h>
+#include <shlwapi.h>
 
 #include <wine/debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(mapi);
+#include <wine/unicode.h>
 
 #include "util.h"
 
+WINE_DEFAULT_DEBUG_CHANNEL(mapi);
+
 #endif /* _MAPI32_PCH_ */

Modified: trunk/reactos/dll/win32/mapi32/prop.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/prop.c?re…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/prop.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/prop.c	[iso-8859-1] Thu Jan 23 17:52:54 2014
@@ -20,7 +20,6 @@
 
 #include "precomp.h"
 
-#include <shlwapi.h>
 #include <wine/list.h>
 
 BOOL WINAPI FBadRglpszA(LPSTR*,ULONG);

Modified: trunk/reactos/dll/win32/mapi32/stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/stubs.c?r…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/stubs.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/stubs.c	[iso-8859-1] Thu Jan 23 17:52:54 2014
@@ -1,13 +1,4 @@
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <mapix.h>
-
-#include <reactos/debug.h>
+#include "precomp.h"
 
 typedef PVOID LPMAPIFORMMGR, LPADDRESSBOOK;
 
@@ -109,4 +100,3 @@
     UNIMPLEMENTED;
     return E_NOTIMPL;
 }
-

Modified: trunk/reactos/dll/win32/mapi32/util.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/util.c?re…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/util.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/util.c	[iso-8859-1] Thu Jan 23 17:52:54 2014
@@ -22,9 +22,7 @@
 #include "precomp.h"
 
 #include <stdio.h>
-
 #include <winternl.h>
-#include <shlwapi.h>
 #include <xcmc.h>
 #include <msi.h>
 

Modified: trunk/reactos/dll/win32/mapi32/util.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/util.h?re…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/util.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/util.h	[iso-8859-1] Thu Jan 23 17:52:54 2014
@@ -19,11 +19,7 @@
  */
 
 #ifndef _MAPI_UTIL_H
-
 #define _MAPI_UTIL_H
-
-#include <mapi.h>
-//#include <mapix.h>
 
 extern void load_mapi_providers(void) DECLSPEC_HIDDEN;
 extern void unload_mapi_providers(void) DECLSPEC_HIDDEN;
@@ -65,4 +61,4 @@
 extern MAPI_FUNCTIONS mapiFunctions DECLSPEC_HIDDEN;
 extern HINSTANCE hInstMAPI32 DECLSPEC_HIDDEN;
 
-#endif
+#endif /* _MAPI_UTIL_H */