diff --git a/reactos/dll/win32/mpr/auth.c b/reactos/dll/win32/mpr/auth.c index a112e114ff7..bf5c671f883 100644 --- 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 - -#include -#include -#include -#include - -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 a3f15a6c87c..72debde3314 100644 --- 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 2bbdf3b1804..801fedc4c6a 100644 --- 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 ae03903a2f4..64f67a603ab 100644 --- 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 566529f89fb..7fa736ced58 100644 --- 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 cf369c60f9e..360698f67cc 100644 --- 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 72951354830..3e261b30645 100644 --- 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 700afc10c04..1427bbd5f89 100644 --- 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 c4642402606..aec9ef2f95a 100644 --- 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 9870a6dd0d2..46fbf7f8de3 100644 --- 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 3a6a2f86661..5c046cbb8f3 100644 --- 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 0bd8ac57537..03158e2b21a 100644 --- 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 13bc0b8c82a..26425d66ae6 100644 --- 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 b72fe1d432a..2a6727cfbfb 100644 --- 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 611539fbf49..0f218ab99a1 100644 --- 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 3035508bf40..af5758e7f90 100644 --- 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 90a5fa1ee5e..13c4dacfa1c 100644 --- 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 27527a06985..df7e70552f1 100644 --- 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 ead1d420933..f0dd10b5f00 100644 --- 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 1e1ffe76581..94f78b5bc32 100644 --- 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 c9098f2abd5..cbbf4110d77 100644 --- 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 c1da38ca846..1f962cbf1e5 100644 --- 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 5890e7bd5fb..e0011e5cdb1 100644 --- 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 35ddf3c48e0..68d3ae7a6a2 100644 --- 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 bd82626cd9a..f88046420b8 100644 --- 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 4e65a790013..bc1cc70a684 100644 --- 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 + +#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 fb4fee265f1..e319a0d59d5 100644 --- 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 - -#include -#include -//#include "objbase.h" -//#include "winnetwk.h" -#include +#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 f8a86254bee..292b4765260 100644 --- 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 -#include - #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 dc19f8e6ea2..326c5b14eb6 100644 --- 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 - -#include -#include -#include -#include - -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 e00b1a0dfaf..c6bb1ea5216 100644 --- 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 - /* * 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 590bb4fda3c..7137425997e 100644 --- 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 - -#include - -#include -#include -//#include "winuser.h" -#include -#include -//#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 index 00000000000..bdda98b7c2c --- /dev/null +++ b/reactos/dll/win32/mpr/precomp.h @@ -0,0 +1,18 @@ +#ifndef _MPR_PCH_ +#define _MPR_PCH_ + +#include + +#include + +#define WIN32_NO_STATUS +#include +#include +#include +#include +#include + +#include +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 290331ae4fb..e8db83573aa 100644 --- 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 #include -#include -#include -#include -#include -#include - -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 806564af909..16d23aa739e 100644 --- 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 -#include -//#include "winbase.h" -//#include "winnls.h" #include -#include #include -#include -//#include "winuser.h" #define WINE_MOUNTMGR_EXTENSIONS #include -#include #include -#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