[MAPI32]

* Create a main header and move some inclusions to it.
* Set the default debugging channel globally through the main header.
* Remove inclusions that already exist in the main resource file.
CORE-7716

svn path=/trunk/; revision=61391

diff --git a/reactos/dll/win32/mapi32/imalloc.c b/reactos/dll/win32/mapi32/imalloc.c
index f30b0e4..bd002cf 100644 (file)
--- a/reactos/dll/win32/mapi32/imalloc.c
+++ b/reactos/dll/win32/mapi32/imalloc.c
@@ -18,28 +18,7 @@
  * 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 <stdarg.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-#include <windef.h>
-#include <winbase.h>
-//#include "winreg.h"
-//#include "winuser.h"
-//#include "winerror.h"
-//#include "winternl.h"
-//#include "objbase.h"
-//#include "shlwapi.h"
-#include <mapiutil.h>
-#include "util.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(mapi);
+#include "precomp.h"
 
 static const IMallocVtbl MAPI_IMalloc_vt;
 

diff --git a/reactos/dll/win32/mapi32/lang/Cy.rc b/reactos/dll/win32/mapi32/lang/Cy.rc
index 1003a9e..e4877e3 100644 (file)
--- a/reactos/dll/win32/mapi32/lang/Cy.rc
+++ b/reactos/dll/win32/mapi32/lang/Cy.rc
@@ -20,8 +20,6 @@
 *
 */
 
-#include "res.h"
-
 LANGUAGE LANG_WELSH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/mapi32/lang/Da.rc b/reactos/dll/win32/mapi32/lang/Da.rc
index e22f303..c40e934 100644 (file)
--- a/reactos/dll/win32/mapi32/lang/Da.rc
+++ b/reactos/dll/win32/mapi32/lang/Da.rc
@@ -20,8 +20,6 @@
  *
  */
 
-#include "res.h"
-
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/mapi32/lang/De.rc b/reactos/dll/win32/mapi32/lang/De.rc
index 2c811d1..2bbaee8 100644 (file)
--- a/reactos/dll/win32/mapi32/lang/De.rc
+++ b/reactos/dll/win32/mapi32/lang/De.rc
@@ -19,8 +19,6 @@
 *
 */
 
-#include "res.h"
-
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 STRINGTABLE

diff --git a/reactos/dll/win32/mapi32/lang/En.rc b/reactos/dll/win32/mapi32/lang/En.rc
index 9a6bf77..9cc4530 100644 (file)
--- a/reactos/dll/win32/mapi32/lang/En.rc
+++ b/reactos/dll/win32/mapi32/lang/En.rc
@@ -19,8 +19,6 @@
 *
 */
 
-#include "res.h"
-
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/mapi32/lang/Es.rc b/reactos/dll/win32/mapi32/lang/Es.rc
index 534f4d4..22af69c 100644 (file)
--- a/reactos/dll/win32/mapi32/lang/Es.rc
+++ b/reactos/dll/win32/mapi32/lang/Es.rc
@@ -19,8 +19,6 @@
 *
 */
 
-#include "res.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/mapi32/lang/Fr.rc b/reactos/dll/win32/mapi32/lang/Fr.rc
index ab14e4a..e7a9296 100644 (file)
--- a/reactos/dll/win32/mapi32/lang/Fr.rc
+++ b/reactos/dll/win32/mapi32/lang/Fr.rc
@@ -19,8 +19,6 @@
 *
 */
 
-#include "res.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/mapi32/lang/Ga.rc b/reactos/dll/win32/mapi32/lang/Ga.rc
index e8aa3c0..676aaba 100644 (file)
--- a/reactos/dll/win32/mapi32/lang/Ga.rc
+++ b/reactos/dll/win32/mapi32/lang/Ga.rc
@@ -20,8 +20,6 @@
  *
 */
 
-#include "res.h"
-
 LANGUAGE LANG_GAELIC, SUBLANG_GAELIC
 
 STRINGTABLE

diff --git a/reactos/dll/win32/mapi32/lang/He.rc b/reactos/dll/win32/mapi32/lang/He.rc
index 5fcabcd..82c3bfc 100644 (file)
--- a/reactos/dll/win32/mapi32/lang/He.rc
+++ b/reactos/dll/win32/mapi32/lang/He.rc
@@ -21,8 +21,6 @@
 *
 */
 
-#include "res.h"
-
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/mapi32/lang/Hu.rc b/reactos/dll/win32/mapi32/lang/Hu.rc
index dac2f33..e275b26 100644 (file)
--- a/reactos/dll/win32/mapi32/lang/Hu.rc
+++ b/reactos/dll/win32/mapi32/lang/Hu.rc
@@ -19,8 +19,6 @@
 *
 */
 
-#include "res.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/mapi32/lang/It.rc b/reactos/dll/win32/mapi32/lang/It.rc
index 6e2b5e2..0c74648 100644 (file)
--- a/reactos/dll/win32/mapi32/lang/It.rc
+++ b/reactos/dll/win32/mapi32/lang/It.rc
@@ -20,8 +20,6 @@
 *
 */
 
-#include "res.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/mapi32/lang/Ja.rc b/reactos/dll/win32/mapi32/lang/Ja.rc
index 96dbdb0..cd3fc55 100644 (file)
--- a/reactos/dll/win32/mapi32/lang/Ja.rc
+++ b/reactos/dll/win32/mapi32/lang/Ja.rc
@@ -20,8 +20,6 @@
 *
 */
 
-#include "res.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/mapi32/lang/Ko.rc b/reactos/dll/win32/mapi32/lang/Ko.rc
index 710b0be..e9796bf 100644 (file)
--- a/reactos/dll/win32/mapi32/lang/Ko.rc
+++ b/reactos/dll/win32/mapi32/lang/Ko.rc
@@ -20,8 +20,6 @@
 *
 */
 
-#include "res.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/mapi32/lang/Lt.rc b/reactos/dll/win32/mapi32/lang/Lt.rc
index b66bf3d..63b6e83 100644 (file)
--- a/reactos/dll/win32/mapi32/lang/Lt.rc
+++ b/reactos/dll/win32/mapi32/lang/Lt.rc
@@ -19,8 +19,6 @@
 *
 */
 
-#include "res.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/mapi32/lang/Nl.rc b/reactos/dll/win32/mapi32/lang/Nl.rc
index fa078ad..dda4221 100644 (file)
--- a/reactos/dll/win32/mapi32/lang/Nl.rc
+++ b/reactos/dll/win32/mapi32/lang/Nl.rc
@@ -19,8 +19,6 @@
 *
 */
 
-#include "res.h"
-
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)

diff --git a/reactos/dll/win32/mapi32/lang/No.rc b/reactos/dll/win32/mapi32/lang/No.rc
index 5e4d8c5..63f64bd 100644 (file)
--- a/reactos/dll/win32/mapi32/lang/No.rc
+++ b/reactos/dll/win32/mapi32/lang/No.rc
@@ -19,8 +19,6 @@
 *
 */
 
-#include "res.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL

diff --git a/reactos/dll/win32/mapi32/lang/Pl.rc b/reactos/dll/win32/mapi32/lang/Pl.rc
index 1c9f2e6..51a1e2c 100644 (file)
--- a/reactos/dll/win32/mapi32/lang/Pl.rc
+++ b/reactos/dll/win32/mapi32/lang/Pl.rc
@@ -19,8 +19,6 @@
 *
 */
 
-#include "res.h"
-
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/mapi32/lang/Pt.rc b/reactos/dll/win32/mapi32/lang/Pt.rc
index b12e6c5..bc17797 100644 (file)
--- a/reactos/dll/win32/mapi32/lang/Pt.rc
+++ b/reactos/dll/win32/mapi32/lang/Pt.rc
@@ -20,8 +20,6 @@
 *
 */
 
-#include "res.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN

diff --git a/reactos/dll/win32/mapi32/lang/Ro.rc b/reactos/dll/win32/mapi32/lang/Ro.rc
index 84ad35f..56e81fe 100644 (file)
--- a/reactos/dll/win32/mapi32/lang/Ro.rc
+++ b/reactos/dll/win32/mapi32/lang/Ro.rc
@@ -18,8 +18,6 @@
 *
 */
 
-#include "res.h"
-
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)

diff --git a/reactos/dll/win32/mapi32/lang/Ru.rc b/reactos/dll/win32/mapi32/lang/Ru.rc
index 66626da..b4448fb 100644 (file)
--- a/reactos/dll/win32/mapi32/lang/Ru.rc
+++ b/reactos/dll/win32/mapi32/lang/Ru.rc
@@ -19,8 +19,6 @@
 *
 */
 
-#include "res.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/mapi32/lang/Si.rc b/reactos/dll/win32/mapi32/lang/Si.rc
index 4abdc82..519958f 100644 (file)
--- a/reactos/dll/win32/mapi32/lang/Si.rc
+++ b/reactos/dll/win32/mapi32/lang/Si.rc
@@ -19,8 +19,6 @@
 *
 */
 
-#include "res.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT

diff --git a/reactos/dll/win32/mapi32/lang/Uk.rc b/reactos/dll/win32/mapi32/lang/Uk.rc
index f08b31d..fa1a9ed 100644 (file)
--- a/reactos/dll/win32/mapi32/lang/Uk.rc
+++ b/reactos/dll/win32/mapi32/lang/Uk.rc
@@ -20,8 +20,6 @@
 *
 */
 
-#include "res.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/mapi32/mapi32_main.c b/reactos/dll/win32/mapi32/mapi32_main.c
index 34e81c1..cadbc18 100644 (file)
--- a/reactos/dll/win32/mapi32/mapi32_main.c
+++ b/reactos/dll/win32/mapi32/mapi32_main.c
@@ -18,24 +18,9 @@
  * 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 "precomp.h"
 
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"
-//#include "objbase.h"
-#include <initguid.h>
 #include <mapix.h>
-//#include "mapiform.h"
-//#include "mapi.h"
-#include <wine/debug.h>
-#include "util.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mapi);
 
 DECLSPEC_HIDDEN LONG MAPI_ObjectCount = 0;
 DECLSPEC_HIDDEN HINSTANCE hInstMAPI32;

diff --git a/reactos/dll/win32/mapi32/precomp.h b/reactos/dll/win32/mapi32/precomp.h
new file mode 100644 (file)
index 0000000..5b2dd13
--- /dev/null
+++ b/reactos/dll/win32/mapi32/precomp.h
@@ -0,0 +1,30 @@
+#ifndef _MAPI32_PCH_
+#define _MAPI32_PCH_
+
+#include <config.h>
+
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define COBJMACROS
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
+#include <windef.h>
+#include <winbase.h>
+#include <winreg.h>
+#include <initguid.h>
+#include <mapival.h>
+#include <mapiutil.h>
+
+#include <wine/unicode.h>
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(mapi);
+
+#include "util.h"
+
+#endif /* _MAPI32_PCH_ */

diff --git a/reactos/dll/win32/mapi32/prop.c b/reactos/dll/win32/mapi32/prop.c
index 215c2c4..d396375 100644 (file)
--- a/reactos/dll/win32/mapi32/prop.c
+++ b/reactos/dll/win32/mapi32/prop.c
@@ -18,26 +18,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 <stdarg.h>
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-#include "windef.h"
-#include "winbase.h"
-#include "winreg.h"
-//#include "winerror.h"
-//#include "winternl.h"
-//#include "objbase.h"
+#include "precomp.h"
+
 #include <shlwapi.h>
 #include <wine/list.h>
-#include <wine/debug.h>
-#include <wine/unicode.h>
-#include <mapival.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(mapi);
 
 BOOL WINAPI FBadRglpszA(LPSTR*,ULONG);
 

diff --git a/reactos/dll/win32/mapi32/res.h b/reactos/dll/win32/mapi32/res.h
index 023eea8..28b33d4 100644 (file)
--- a/reactos/dll/win32/mapi32/res.h
+++ b/reactos/dll/win32/mapi32/res.h
@@ -19,7 +19,7 @@
 *
 */
 
-//#include <windef.h>
+#pragma once
 
 /* Strings */
 #define IDS_NO_MAPI_CLIENT   1

diff --git a/reactos/dll/win32/mapi32/sendmail.c b/reactos/dll/win32/mapi32/sendmail.c
index 43d68ce..26883b0 100644 (file)
--- a/reactos/dll/win32/mapi32/sendmail.c
+++ b/reactos/dll/win32/mapi32/sendmail.c
@@ -19,37 +19,11 @@
  * 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 "precomp.h"
 
-#include <config.h>
-//#include "wine/port.h"
-
-//#include <stdio.h>
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"
 #include <winuser.h>
-//#include "objbase.h"
-//#include "objidl.h"
-//#include "mapi.h"
-//#include "mapix.h"
-#include <mapiutil.h>
-//#include "mapidefs.h"
-//#include "winreg.h"
-//#include "shellapi.h"
-//#include "shlwapi.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
-#include "util.h"
-#include "res.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(mapi);
+#include "res.h"
 
 #define READ_BUF_SIZE    4096
 

diff --git a/reactos/dll/win32/mapi32/stubs.c b/reactos/dll/win32/mapi32/stubs.c
index 02c63c1..8cd1231 100644 (file)
--- a/reactos/dll/win32/mapi32/stubs.c
+++ b/reactos/dll/win32/mapi32/stubs.c
@@ -1,10 +1,12 @@
 #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>
 
 typedef PVOID LPMAPIFORMMGR, LPADDRESSBOOK;

diff --git a/reactos/dll/win32/mapi32/util.c b/reactos/dll/win32/mapi32/util.c
index f296184..59363c9 100644 (file)
--- a/reactos/dll/win32/mapi32/util.c
+++ b/reactos/dll/win32/mapi32/util.c
@@ -19,32 +19,14 @@
  * 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 "precomp.h"
 
-//#include <stdarg.h>
 #include <stdio.h>
 
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-//#include "winuser.h"
-//#include "winerror.h"
 #include <winternl.h>
-//#include "objbase.h"
 #include <shlwapi.h>
-#include <wine/debug.h>
-#include <wine/unicode.h>
-#include <mapival.h>
 #include <xcmc.h>
 #include <msi.h>
-#include "util.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mapi);
 
 static const BYTE digitsToHex[] = {
   0,1,2,3,4,5,6,7,8,9,0xff,0xff,0xff,0xff,0xff,0xff,0xff,10,11,12,13,14,15,

diff --git a/reactos/dll/win32/mapi32/version.rc b/reactos/dll/win32/mapi32/version.rc
index 48c9021..555a162 100644 (file)
--- a/reactos/dll/win32/mapi32/version.rc
+++ b/reactos/dll/win32/mapi32/version.rc
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "res.h"
+
 #define WINE_FILEDESCRIPTION_STR "Wine Messaging API"
 #define WINE_FILENAME_STR "mapi32.dll"
 #define WINE_FILEVERSION 1,0,0,0