[akhaldi] 61391: [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 ...

Author: akhaldi
Date: Tue Dec 24 22:50:09 2013
New Revision: 61391

URL: http://svn.reactos.org/svn/reactos?rev=61391&view=rev
Log:
[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

Added:
    trunk/reactos/dll/win32/mapi32/precomp.h   (with props)
Modified:
    trunk/reactos/dll/win32/mapi32/imalloc.c
    trunk/reactos/dll/win32/mapi32/lang/Cy.rc
    trunk/reactos/dll/win32/mapi32/lang/Da.rc
    trunk/reactos/dll/win32/mapi32/lang/De.rc
    trunk/reactos/dll/win32/mapi32/lang/En.rc
    trunk/reactos/dll/win32/mapi32/lang/Es.rc
    trunk/reactos/dll/win32/mapi32/lang/Fr.rc
    trunk/reactos/dll/win32/mapi32/lang/Ga.rc
    trunk/reactos/dll/win32/mapi32/lang/He.rc
    trunk/reactos/dll/win32/mapi32/lang/Hu.rc
    trunk/reactos/dll/win32/mapi32/lang/It.rc
    trunk/reactos/dll/win32/mapi32/lang/Ja.rc
    trunk/reactos/dll/win32/mapi32/lang/Ko.rc
    trunk/reactos/dll/win32/mapi32/lang/Lt.rc
    trunk/reactos/dll/win32/mapi32/lang/Nl.rc
    trunk/reactos/dll/win32/mapi32/lang/No.rc
    trunk/reactos/dll/win32/mapi32/lang/Pl.rc
    trunk/reactos/dll/win32/mapi32/lang/Pt.rc
    trunk/reactos/dll/win32/mapi32/lang/Ro.rc
    trunk/reactos/dll/win32/mapi32/lang/Ru.rc
    trunk/reactos/dll/win32/mapi32/lang/Si.rc
    trunk/reactos/dll/win32/mapi32/lang/Uk.rc
    trunk/reactos/dll/win32/mapi32/mapi32_main.c
    trunk/reactos/dll/win32/mapi32/prop.c
    trunk/reactos/dll/win32/mapi32/res.h
    trunk/reactos/dll/win32/mapi32/sendmail.c
    trunk/reactos/dll/win32/mapi32/stubs.c
    trunk/reactos/dll/win32/mapi32/util.c
    trunk/reactos/dll/win32/mapi32/version.rc

Modified: trunk/reactos/dll/win32/mapi32/imalloc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/imalloc.c…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/imalloc.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/imalloc.c	[iso-8859-1] Tue Dec 24 22:50:09 2013
@@ -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;
 

Modified: trunk/reactos/dll/win32/mapi32/lang/Cy.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Cy.r…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/lang/Cy.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/lang/Cy.rc	[iso-8859-1] Tue Dec 24 22:50:09 2013
@@ -20,8 +20,6 @@
 *
 */
 
-#include "res.h"
-
 LANGUAGE LANG_WELSH, SUBLANG_DEFAULT
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/mapi32/lang/Da.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Da.r…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/lang/Da.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/lang/Da.rc	[iso-8859-1] Tue Dec 24 22:50:09 2013
@@ -20,8 +20,6 @@
  *
  */
 
-#include "res.h"
-
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/mapi32/lang/De.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/De.r…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/lang/De.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/lang/De.rc	[iso-8859-1] Tue Dec 24 22:50:09 2013
@@ -19,8 +19,6 @@
 *
 */
 
-#include "res.h"
-
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/mapi32/lang/En.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/En.r…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/lang/En.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/lang/En.rc	[iso-8859-1] Tue Dec 24 22:50:09 2013
@@ -19,8 +19,6 @@
 *
 */
 
-#include "res.h"
-
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/mapi32/lang/Es.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Es.r…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/lang/Es.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/lang/Es.rc	[iso-8859-1] Tue Dec 24 22:50:09 2013
@@ -19,8 +19,6 @@
 *
 */
 
-#include "res.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/mapi32/lang/Fr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Fr.r…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/lang/Fr.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/lang/Fr.rc	[iso-8859-1] Tue Dec 24 22:50:09 2013
@@ -19,8 +19,6 @@
 *
 */
 
-#include "res.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/mapi32/lang/Ga.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Ga.r…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/lang/Ga.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/lang/Ga.rc	[iso-8859-1] Tue Dec 24 22:50:09 2013
@@ -20,8 +20,6 @@
  *
 */
 
-#include "res.h"
-
 LANGUAGE LANG_GAELIC, SUBLANG_GAELIC
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/mapi32/lang/He.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/He.r…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/lang/He.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/lang/He.rc	[iso-8859-1] Tue Dec 24 22:50:09 2013
@@ -21,8 +21,6 @@
 *
 */
 
-#include "res.h"
-
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/mapi32/lang/Hu.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Hu.r…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/lang/Hu.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/lang/Hu.rc	[iso-8859-1] Tue Dec 24 22:50:09 2013
@@ -19,8 +19,6 @@
 *
 */
 
-#include "res.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/mapi32/lang/It.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/It.r…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/lang/It.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/lang/It.rc	[iso-8859-1] Tue Dec 24 22:50:09 2013
@@ -20,8 +20,6 @@
 *
 */
 
-#include "res.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/mapi32/lang/Ja.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Ja.r…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/lang/Ja.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/lang/Ja.rc	[iso-8859-1] Tue Dec 24 22:50:09 2013
@@ -20,8 +20,6 @@
 *
 */
 
-#include "res.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/mapi32/lang/Ko.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Ko.r…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/lang/Ko.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/lang/Ko.rc	[iso-8859-1] Tue Dec 24 22:50:09 2013
@@ -20,8 +20,6 @@
 *
 */
 
-#include "res.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/mapi32/lang/Lt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Lt.r…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/lang/Lt.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/lang/Lt.rc	[iso-8859-1] Tue Dec 24 22:50:09 2013
@@ -19,8 +19,6 @@
 *
 */
 
-#include "res.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/mapi32/lang/Nl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Nl.r…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/lang/Nl.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/lang/Nl.rc	[iso-8859-1] Tue Dec 24 22:50:09 2013
@@ -19,8 +19,6 @@
 *
 */
 
-#include "res.h"
-
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/mapi32/lang/No.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/No.r…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/lang/No.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/lang/No.rc	[iso-8859-1] Tue Dec 24 22:50:09 2013
@@ -19,8 +19,6 @@
 *
 */
 
-#include "res.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL

Modified: trunk/reactos/dll/win32/mapi32/lang/Pl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Pl.r…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/lang/Pl.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/lang/Pl.rc	[iso-8859-1] Tue Dec 24 22:50:09 2013
@@ -19,8 +19,6 @@
 *
 */
 
-#include "res.h"
-
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/mapi32/lang/Pt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Pt.r…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/lang/Pt.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/lang/Pt.rc	[iso-8859-1] Tue Dec 24 22:50:09 2013
@@ -20,8 +20,6 @@
 *
 */
 
-#include "res.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN

Modified: trunk/reactos/dll/win32/mapi32/lang/Ro.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Ro.r…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/lang/Ro.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/lang/Ro.rc	[iso-8859-1] Tue Dec 24 22:50:09 2013
@@ -18,8 +18,6 @@
 *
 */
 
-#include "res.h"
-
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/mapi32/lang/Ru.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Ru.r…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/lang/Ru.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/lang/Ru.rc	[iso-8859-1] Tue Dec 24 22:50:09 2013
@@ -19,8 +19,6 @@
 *
 */
 
-#include "res.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/mapi32/lang/Si.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Si.r…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/lang/Si.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/lang/Si.rc	[iso-8859-1] Tue Dec 24 22:50:09 2013
@@ -19,8 +19,6 @@
 *
 */
 
-#include "res.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT

Modified: trunk/reactos/dll/win32/mapi32/lang/Uk.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Uk.r…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/lang/Uk.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/lang/Uk.rc	[iso-8859-1] Tue Dec 24 22:50:09 2013
@@ -20,8 +20,6 @@
 *
 */
 
-#include "res.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

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] Tue Dec 24 22:50:09 2013
@@ -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 <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"
-//#include "objbase.h"
-#include <initguid.h>
+#include "precomp.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;

Added: 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	(added)
+++ trunk/reactos/dll/win32/mapi32/precomp.h	[iso-8859-1] Tue Dec 24 22:50:09 2013
@@ -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_ */

Propchange: trunk/reactos/dll/win32/mapi32/precomp.h
------------------------------------------------------------------------------
    svn:eol-style = native

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] Tue Dec 24 22:50:09 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/mapi32/res.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/res.h?rev…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/res.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/res.h	[iso-8859-1] Tue Dec 24 22:50:09 2013
@@ -19,7 +19,7 @@
 *
 */
 
-//#include <windef.h>
+#pragma once
 
 /* Strings */
 #define IDS_NO_MAPI_CLIENT   1

Modified: trunk/reactos/dll/win32/mapi32/sendmail.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/sendmail.…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/sendmail.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/sendmail.c	[iso-8859-1] Tue Dec 24 22:50:09 2013
@@ -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 <config.h>
-//#include "wine/port.h"
-
-//#include <stdio.h>
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"
+#include "precomp.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);
 
 #define READ_BUF_SIZE    4096
 

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] Tue Dec 24 22:50:09 2013
@@ -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;

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] Tue Dec 24 22:50:09 2013
@@ -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 <stdarg.h>
+#include "precomp.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,

Modified: trunk/reactos/dll/win32/mapi32/version.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/version.r…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/version.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mapi32/version.rc	[iso-8859-1] Tue Dec 24 22:50:09 2013
@@ -15,6 +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 "res.h"
 
 #define WINE_FILEDESCRIPTION_STR "Wine Messaging API"
 #define WINE_FILENAME_STR "mapi32.dll"