[MPR]

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

svn path=/trunk/; revision=61398

diff --git a/reactos/dll/win32/mpr/auth.c b/reactos/dll/win32/mpr/auth.c
index a112e11..bf5c671 100644 (file)
--- a/reactos/dll/win32/mpr/auth.c
+++ b/reactos/dll/win32/mpr/auth.c
@@ -18,17 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <winnetwk.h>
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(mpr);
-
+#include "precomp.h"
 
 /*****************************************************************
  *  WNetLogoffA [MPR.@]

diff --git a/reactos/dll/win32/mpr/lang/mpr_Bg.rc b/reactos/dll/win32/mpr/lang/mpr_Bg.rc
index a3f15a6..72debde 100644 (file)
--- a/reactos/dll/win32/mpr/lang/mpr_Bg.rc
+++ b/reactos/dll/win32/mpr/lang/mpr_Bg.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "mprres.h"
-
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/mpr/lang/mpr_Cs.rc b/reactos/dll/win32/mpr/lang/mpr_Cs.rc
index 2bbdf3b..801fedc 100644 (file)
--- a/reactos/dll/win32/mpr/lang/mpr_Cs.rc
+++ b/reactos/dll/win32/mpr/lang/mpr_Cs.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "mprres.h"
-
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
 /* Czech strings in CP1250 */

diff --git a/reactos/dll/win32/mpr/lang/mpr_Da.rc b/reactos/dll/win32/mpr/lang/mpr_Da.rc
index ae03903..64f67a6 100644 (file)
--- a/reactos/dll/win32/mpr/lang/mpr_Da.rc
+++ b/reactos/dll/win32/mpr/lang/mpr_Da.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "mprres.h"
-
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/mpr/lang/mpr_De.rc b/reactos/dll/win32/mpr/lang/mpr_De.rc
index 566529f..7fa736c 100644 (file)
--- a/reactos/dll/win32/mpr/lang/mpr_De.rc
+++ b/reactos/dll/win32/mpr/lang/mpr_De.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "mprres.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL

diff --git a/reactos/dll/win32/mpr/lang/mpr_En.rc b/reactos/dll/win32/mpr/lang/mpr_En.rc
index cf369c6..360698f 100644 (file)
--- a/reactos/dll/win32/mpr/lang/mpr_En.rc
+++ b/reactos/dll/win32/mpr/lang/mpr_En.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "mprres.h"
-
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/mpr/lang/mpr_Es.rc b/reactos/dll/win32/mpr/lang/mpr_Es.rc
index 7295135..3e261b3 100644 (file)
--- a/reactos/dll/win32/mpr/lang/mpr_Es.rc
+++ b/reactos/dll/win32/mpr/lang/mpr_Es.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "mprres.h"
-
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 STRINGTABLE

diff --git a/reactos/dll/win32/mpr/lang/mpr_Fr.rc b/reactos/dll/win32/mpr/lang/mpr_Fr.rc
index 700afc1..1427bbd 100644 (file)
--- a/reactos/dll/win32/mpr/lang/mpr_Fr.rc
+++ b/reactos/dll/win32/mpr/lang/mpr_Fr.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "mprres.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/mpr/lang/mpr_He.rc b/reactos/dll/win32/mpr/lang/mpr_He.rc
index c464240..aec9ef2 100644 (file)
--- a/reactos/dll/win32/mpr/lang/mpr_He.rc
+++ b/reactos/dll/win32/mpr/lang/mpr_He.rc
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "mprres.h"
-
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/mpr/lang/mpr_Hu.rc b/reactos/dll/win32/mpr/lang/mpr_Hu.rc
index 9870a6d..46fbf7f 100644 (file)
--- a/reactos/dll/win32/mpr/lang/mpr_Hu.rc
+++ b/reactos/dll/win32/mpr/lang/mpr_Hu.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "mprres.h"
-
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/mpr/lang/mpr_It.rc b/reactos/dll/win32/mpr/lang/mpr_It.rc
index 3a6a2f8..5c046cb 100644 (file)
--- a/reactos/dll/win32/mpr/lang/mpr_It.rc
+++ b/reactos/dll/win32/mpr/lang/mpr_It.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "mprres.h"
-
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE

diff --git a/reactos/dll/win32/mpr/lang/mpr_Ja.rc b/reactos/dll/win32/mpr/lang/mpr_Ja.rc
index 0bd8ac5..03158e2 100644 (file)
--- a/reactos/dll/win32/mpr/lang/mpr_Ja.rc
+++ b/reactos/dll/win32/mpr/lang/mpr_Ja.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "mprres.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/mpr/lang/mpr_Ko.rc b/reactos/dll/win32/mpr/lang/mpr_Ko.rc
index 13bc0b8..26425d6 100644 (file)
--- a/reactos/dll/win32/mpr/lang/mpr_Ko.rc
+++ b/reactos/dll/win32/mpr/lang/mpr_Ko.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "mprres.h"
-
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/mpr/lang/mpr_Lt.rc b/reactos/dll/win32/mpr/lang/mpr_Lt.rc
index b72fe1d..2a6727c 100644 (file)
--- a/reactos/dll/win32/mpr/lang/mpr_Lt.rc
+++ b/reactos/dll/win32/mpr/lang/mpr_Lt.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "mprres.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/mpr/lang/mpr_Nl.rc b/reactos/dll/win32/mpr/lang/mpr_Nl.rc
index 611539f..0f218ab 100644 (file)
--- a/reactos/dll/win32/mpr/lang/mpr_Nl.rc
+++ b/reactos/dll/win32/mpr/lang/mpr_Nl.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "mprres.h"
-
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 STRINGTABLE

diff --git a/reactos/dll/win32/mpr/lang/mpr_No.rc b/reactos/dll/win32/mpr/lang/mpr_No.rc
index 3035508..af5758e 100644 (file)
--- a/reactos/dll/win32/mpr/lang/mpr_No.rc
+++ b/reactos/dll/win32/mpr/lang/mpr_No.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "mprres.h"
-
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 STRINGTABLE

diff --git a/reactos/dll/win32/mpr/lang/mpr_Pl.rc b/reactos/dll/win32/mpr/lang/mpr_Pl.rc
index 90a5fa1..13c4dac 100644 (file)
--- a/reactos/dll/win32/mpr/lang/mpr_Pl.rc
+++ b/reactos/dll/win32/mpr/lang/mpr_Pl.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "mprres.h"
-
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/mpr/lang/mpr_Pt.rc b/reactos/dll/win32/mpr/lang/mpr_Pt.rc
index 27527a0..df7e705 100644 (file)
--- a/reactos/dll/win32/mpr/lang/mpr_Pt.rc
+++ b/reactos/dll/win32/mpr/lang/mpr_Pt.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "mprres.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL

diff --git a/reactos/dll/win32/mpr/lang/mpr_Ro.rc b/reactos/dll/win32/mpr/lang/mpr_Ro.rc
index ead1d42..f0dd10b 100644 (file)
--- a/reactos/dll/win32/mpr/lang/mpr_Ro.rc
+++ b/reactos/dll/win32/mpr/lang/mpr_Ro.rc
@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "mprres.h"
-
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)

diff --git a/reactos/dll/win32/mpr/lang/mpr_Ru.rc b/reactos/dll/win32/mpr/lang/mpr_Ru.rc
index 1e1ffe7..94f78b5 100644 (file)
--- a/reactos/dll/win32/mpr/lang/mpr_Ru.rc
+++ b/reactos/dll/win32/mpr/lang/mpr_Ru.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "mprres.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/mpr/lang/mpr_Si.rc b/reactos/dll/win32/mpr/lang/mpr_Si.rc
index c9098f2..cbbf411 100644 (file)
--- a/reactos/dll/win32/mpr/lang/mpr_Si.rc
+++ b/reactos/dll/win32/mpr/lang/mpr_Si.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "mprres.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT

diff --git a/reactos/dll/win32/mpr/lang/mpr_Sv.rc b/reactos/dll/win32/mpr/lang/mpr_Sv.rc
index c1da38c..1f962cb 100644 (file)
--- a/reactos/dll/win32/mpr/lang/mpr_Sv.rc
+++ b/reactos/dll/win32/mpr/lang/mpr_Sv.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "mprres.h"
-
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 STRINGTABLE

diff --git a/reactos/dll/win32/mpr/lang/mpr_Tr.rc b/reactos/dll/win32/mpr/lang/mpr_Tr.rc
index 5890e7b..e0011e5 100644 (file)
--- a/reactos/dll/win32/mpr/lang/mpr_Tr.rc
+++ b/reactos/dll/win32/mpr/lang/mpr_Tr.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "mprres.h"
-
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/mpr/lang/mpr_Uk.rc b/reactos/dll/win32/mpr/lang/mpr_Uk.rc
index 35ddf3c..68d3ae7 100644 (file)
--- a/reactos/dll/win32/mpr/lang/mpr_Uk.rc
+++ b/reactos/dll/win32/mpr/lang/mpr_Uk.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "mprres.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/mpr/lang/mpr_Zh.rc b/reactos/dll/win32/mpr/lang/mpr_Zh.rc
index bd82626..f880464 100644 (file)
--- a/reactos/dll/win32/mpr/lang/mpr_Zh.rc
+++ b/reactos/dll/win32/mpr/lang/mpr_Zh.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "mprres.h"
-
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/mpr/mpr.rc b/reactos/dll/win32/mpr/mpr.rc
index 4e65a79..bc1cc70 100644 (file)
--- a/reactos/dll/win32/mpr/mpr.rc
+++ b/reactos/dll/win32/mpr/mpr.rc
@@ -17,10 +17,10 @@
  * 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 "windef.h"
-//#include "winbase.h"
-//#include "winuser.h"
-//#include "mprres.h"
+
+#include <winuser.h>
+
+#include "mprres.h"
 
 #include "version.rc"
 

diff --git a/reactos/dll/win32/mpr/mpr_main.c b/reactos/dll/win32/mpr/mpr_main.c
index fb4fee2..e319a0d 100644 (file)
--- a/reactos/dll/win32/mpr/mpr_main.c
+++ b/reactos/dll/win32/mpr/mpr_main.c
@@ -18,19 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "objbase.h"
-//#include "winnetwk.h"
-#include <wine/debug.h>
+#include "precomp.h"
 #include "wnetpriv.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(mpr);
-
  /*
   * FIXME: The following routines should use a private heap ...
   */

diff --git a/reactos/dll/win32/mpr/mprres.h b/reactos/dll/win32/mpr/mprres.h
index f8a8625..292b476 100644 (file)
--- a/reactos/dll/win32/mpr/mprres.h
+++ b/reactos/dll/win32/mpr/mprres.h
@@ -18,9 +18,6 @@
 #ifndef __WINE_MPRRES_H__
 #define __WINE_MPRRES_H__
 
-//#include <windef.h>
-#include <winuser.h>
-
 #define IDS_ENTIRENETWORK 1
 
 #define IDD_PROXYDLG     0x400

diff --git a/reactos/dll/win32/mpr/multinet.c b/reactos/dll/win32/mpr/multinet.c
index dc19f8e..326c5b1 100644 (file)
--- a/reactos/dll/win32/mpr/multinet.c
+++ b/reactos/dll/win32/mpr/multinet.c
@@ -18,17 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <winnetwk.h>
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(mpr);
-
+#include "precomp.h"
 
 /*****************************************************************
  *     MultinetGetConnectionPerformanceA [MPR.@]

diff --git a/reactos/dll/win32/mpr/netspi.h b/reactos/dll/win32/mpr/netspi.h
index e00b1a0..c6bb1ea 100644 (file)
--- a/reactos/dll/win32/mpr/netspi.h
+++ b/reactos/dll/win32/mpr/netspi.h
@@ -24,9 +24,6 @@
 #ifndef _NETSPI_H_
 #define _NETSPI_H_
 
-//#include "windef.h"
-#include <winnetwk.h>
-
 /*
  * Note: The Unicode variants of all these routines/structures
  *       apparently don't exist, at least not in Win95 ...

diff --git a/reactos/dll/win32/mpr/nps.c b/reactos/dll/win32/mpr/nps.c
index 590bb4f..7137425 100644 (file)
--- a/reactos/dll/win32/mpr/nps.c
+++ b/reactos/dll/win32/mpr/nps.c
@@ -19,23 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-
-#include <config.h>
-
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <netspi.h>
-#include <wine/debug.h>
-//#include "winerror.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mpr);
-
-//#include "wine/unicode.h"
+#include "precomp.h"
 
+#include "netspi.h"
 #include "mprres.h"
 
 /***********************************************************************

diff --git a/reactos/dll/win32/mpr/precomp.h b/reactos/dll/win32/mpr/precomp.h
new file mode 100644 (file)
index 0000000..bdda98b
--- /dev/null
+++ b/reactos/dll/win32/mpr/precomp.h
@@ -0,0 +1,18 @@
+#ifndef _MPR_PCH_
+#define _MPR_PCH_
+
+#include <config.h>
+
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#include <windef.h>
+#include <winbase.h>
+#include <winuser.h>
+#include <winreg.h>
+#include <winnetwk.h>
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(mpr);
+
+#endif /* _MPR_PCH_ */

diff --git a/reactos/dll/win32/mpr/pwcache.c b/reactos/dll/win32/mpr/pwcache.c
index 290331a..e8db835 100644 (file)
--- a/reactos/dll/win32/mpr/pwcache.c
+++ b/reactos/dll/win32/mpr/pwcache.c
@@ -19,19 +19,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
+#include "precomp.h"
 
-//#include <stdarg.h>
 #include <stdio.h>
 
-#include <windef.h>
-#include <winbase.h>
-#include <winnetwk.h>
-#include <winreg.h>
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(mpr);
-
 static const char mpr_key[] = "Software\\Wine\\Wine\\Mpr\\";
 
 static inline BYTE hex( BYTE x )

diff --git a/reactos/dll/win32/mpr/wnet.c b/reactos/dll/win32/mpr/wnet.c
index 806564a..16d23aa 100644 (file)
--- a/reactos/dll/win32/mpr/wnet.c
+++ b/reactos/dll/win32/mpr/wnet.c
@@ -20,25 +20,15 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
+#include "precomp.h"
 
-//#include <stdarg.h>
-#include <windef.h>
-//#include "winbase.h"
-//#include "winnls.h"
 #include <winioctl.h>
-#include <winnetwk.h>
 #include <npapi.h>
-#include <winreg.h>
-//#include "winuser.h"
 #define WINE_MOUNTMGR_EXTENSIONS
 #include <ddk/mountmgr.h>
-#include <wine/debug.h>
 #include <wine/unicode.h>
-#include "mprres.h"
-//#include "wnetpriv.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(mpr);
+#include "mprres.h"
 
 /* Data structures representing network service providers.  Assumes only one
  * thread creates them, and that they are constant for the life of the process