[ros-diffs] [akhaldi] 61445: [SHLWAPI] * 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 alre...

Author: akhaldi
Date: Fri Dec 27 13:34:32 2013
New Revision: 61445

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

Added:
    trunk/reactos/dll/win32/shlwapi/precomp.h   (with props)
Modified:
    trunk/reactos/dll/win32/shlwapi/assoc.c
    trunk/reactos/dll/win32/shlwapi/clist.c
    trunk/reactos/dll/win32/shlwapi/istream.c
    trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Da.rc
    trunk/reactos/dll/win32/shlwapi/lang/shlwapi_De.rc
    trunk/reactos/dll/win32/shlwapi/lang/shlwapi_En.rc
    trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Es.rc
    trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Fi.rc
    trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Fr.rc
    trunk/reactos/dll/win32/shlwapi/lang/shlwapi_He.rc
    trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Hu.rc
    trunk/reactos/dll/win32/shlwapi/lang/shlwapi_It.rc
    trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ja.rc
    trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ko.rc
    trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Lt.rc
    trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Nl.rc
    trunk/reactos/dll/win32/shlwapi/lang/shlwapi_No.rc
    trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Pl.rc
    trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Pt.rc
    trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ro.rc
    trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ru.rc
    trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Si.rc
    trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Sk.rc
    trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Sv.rc
    trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Tr.rc
    trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Uk.rc
    trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Zh.rc
    trunk/reactos/dll/win32/shlwapi/msgbox.c
    trunk/reactos/dll/win32/shlwapi/ordinal.c
    trunk/reactos/dll/win32/shlwapi/path.c
    trunk/reactos/dll/win32/shlwapi/reg.c
    trunk/reactos/dll/win32/shlwapi/regstream.c
    trunk/reactos/dll/win32/shlwapi/resource.h
    trunk/reactos/dll/win32/shlwapi/shlwapi.rc
    trunk/reactos/dll/win32/shlwapi/shlwapi_main.c
    trunk/reactos/dll/win32/shlwapi/stopwatch.c
    trunk/reactos/dll/win32/shlwapi/string.c
    trunk/reactos/dll/win32/shlwapi/thread.c
    trunk/reactos/dll/win32/shlwapi/url.c
    trunk/reactos/dll/win32/shlwapi/wsprintf.c

Modified: trunk/reactos/dll/win32/shlwapi/assoc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/assoc.c?…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/assoc.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/assoc.c	[iso-8859-1] Fri Dec 27 13:34:32 2013
@@ -17,25 +17,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
  */
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
-//#include <assert.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <winnls.h>
-#include <winreg.h>
-//#include "objbase.h"
-//#include "shlguid.h"
-#include <shlobj.h>
-#include <shlwapi.h>
-//#include "wine/unicode.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(shell);
+
+#include "precomp.h"
 
 /* Default IQueryAssociations::Init() flags */
 #define SHLWAPI_DEF_ASSOCF (ASSOCF_INIT_BYEXENAME|ASSOCF_INIT_DEFAULTTOSTAR| \

Modified: trunk/reactos/dll/win32/shlwapi/clist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/clist.c?…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/clist.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/clist.c	[iso-8859-1] Fri Dec 27 13:34:32 2013
@@ -17,23 +17,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
  */
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
-//#include <string.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "objbase.h"
-#include <shlobj.h>
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(shell);
+
+#include "precomp.h"
 
 /* dwSignature for contained DATABLOCK_HEADER items */
 #define CLIST_ID_CONTAINER (~0U)

Modified: trunk/reactos/dll/win32/shlwapi/istream.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/istream.…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/istream.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/istream.c	[iso-8859-1] Fri Dec 27 13:34:32 2013
@@ -17,27 +17,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
  */
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
-//#include <string.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"
-#include <winnls.h>
-#define NO_SHLWAPI_REG
-#define NO_SHLWAPI_PATH
-#include <shlwapi.h>
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(shell);
+
+#include "precomp.h"
 
 #define STGM_ACCESS_MODE(stgm)   ((stgm)&0x0000f)
 #define STGM_SHARE_MODE(stgm)    ((stgm)&0x000f0)

Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Da.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Da.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Da.rc	[iso-8859-1] Fri Dec 27 13:34:32
2013
@@ -17,8 +17,6 @@
  * 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 "resource.h"
 
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_De.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_De.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_De.rc	[iso-8859-1] Fri Dec 27 13:34:32
2013
@@ -17,8 +17,6 @@
  * 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 "resource.h"
 
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_En.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_En.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_En.rc	[iso-8859-1] Fri Dec 27 13:34:32
2013
@@ -17,8 +17,6 @@
  * 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 "resource.h"
 
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Es.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Es.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Es.rc	[iso-8859-1] Fri Dec 27 13:34:32
2013
@@ -17,8 +17,6 @@
  * 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 "resource.h"
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 

Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Fi.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Fi.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Fi.rc	[iso-8859-1] Fri Dec 27 13:34:32
2013
@@ -17,8 +17,6 @@
  * 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 "resource.h"
 
 LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Fr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Fr.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Fr.rc	[iso-8859-1] Fri Dec 27 13:34:32
2013
@@ -17,8 +17,6 @@
  * 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 "resource.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_He.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_He.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_He.rc	[iso-8859-1] Fri Dec 27 13:34:32
2013
@@ -19,8 +19,6 @@
  * 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 "resource.h"
 
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Hu.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Hu.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Hu.rc	[iso-8859-1] Fri Dec 27 13:34:32
2013
@@ -17,8 +17,6 @@
  * 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 "resource.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_It.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_It.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_It.rc	[iso-8859-1] Fri Dec 27 13:34:32
2013
@@ -17,8 +17,6 @@
  * 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 "resource.h"
 
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 

Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ja.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ja.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ja.rc	[iso-8859-1] Fri Dec 27 13:34:32
2013
@@ -17,8 +17,6 @@
  * 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 "resource.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ko.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ko.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ko.rc	[iso-8859-1] Fri Dec 27 13:34:32
2013
@@ -17,8 +17,6 @@
  * 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 "resource.h"
 
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Lt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Lt.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Lt.rc	[iso-8859-1] Fri Dec 27 13:34:32
2013
@@ -17,8 +17,6 @@
  * 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 "resource.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Nl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Nl.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Nl.rc	[iso-8859-1] Fri Dec 27 13:34:32
2013
@@ -17,8 +17,6 @@
  * 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 "resource.h"
 
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 

Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_No.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_No.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_No.rc	[iso-8859-1] Fri Dec 27 13:34:32
2013
@@ -17,8 +17,6 @@
  * 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 "resource.h"
 
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 

Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Pl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Pl.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Pl.rc	[iso-8859-1] Fri Dec 27 13:34:32
2013
@@ -18,8 +18,6 @@
  * 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 "resource.h"
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Pt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Pt.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Pt.rc	[iso-8859-1] Fri Dec 27 13:34:32
2013
@@ -19,8 +19,6 @@
  * 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 "resource.h"
 
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ro.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ro.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ro.rc	[iso-8859-1] Fri Dec 27 13:34:32
2013
@@ -16,8 +16,6 @@
  * 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 "resource.h"
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 

Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ru.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ru.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Ru.rc	[iso-8859-1] Fri Dec 27 13:34:32
2013
@@ -17,8 +17,6 @@
  * 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 "resource.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Si.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Si.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Si.rc	[iso-8859-1] Fri Dec 27 13:34:32
2013
@@ -17,8 +17,6 @@
  * 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 "resource.h"
 
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Sk.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Sk.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Sk.rc	[iso-8859-1] Fri Dec 27 13:34:32
2013
@@ -17,8 +17,6 @@
  * 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 "resource.h"
 
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Sv.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Sv.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Sv.rc	[iso-8859-1] Fri Dec 27 13:34:32
2013
@@ -17,8 +17,6 @@
  * 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 "resource.h"
 
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 

Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Tr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Tr.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Tr.rc	[iso-8859-1] Fri Dec 27 13:34:32
2013
@@ -17,8 +17,6 @@
  * 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 "resource.h"
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Uk.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Uk.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Uk.rc	[iso-8859-1] Fri Dec 27 13:34:32
2013
@@ -17,8 +17,6 @@
  * 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 "resource.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Zh.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Zh.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Zh.rc	[iso-8859-1] Fri Dec 27 13:34:32
2013
@@ -17,8 +17,6 @@
  * 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 "resource.h"
 
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/shlwapi/msgbox.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/msgbox.c…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/msgbox.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/msgbox.c	[iso-8859-1] Fri Dec 27 13:34:32 2013
@@ -18,30 +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 <config.h>
-//#include "wine/port.h"
-
-#include <stdarg.h>
-//#include <string.h>
-
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <winreg.h>
-#include <shlwapi.h>
-#include <wine/unicode.h>
-#include <wine/debug.h>
-
-#include "resource.h"
-
-
-WINE_DEFAULT_DEBUG_CHANNEL(shell);
+#include "precomp.h"
 
 extern HINSTANCE shlwapi_hInstance; /* in shlwapi_main.c */
 

Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/ordinal.…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/ordinal.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/ordinal.c	[iso-8859-1] Fri Dec 27 13:34:32 2013
@@ -20,45 +20,18 @@
  * 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 <stdarg.h>
+#include "precomp.h"
+
 #include <stdio.h>
-//#include <string.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winnls.h"
-#include <winreg.h>
-#include <wingdi.h>
-//#include "winuser.h"
+
 #include <winver.h>
 #include <winnetwk.h>
-#include <wincon.h>
 #include <mmsystem.h>
-#include "objbase.h"
-//#include "exdisp.h"
-#include "shdeprecated.h"
-#include <shlobj.h>
-#include <shlwapi.h>
+#include <shdeprecated.h>
 #include <shellapi.h>
 #include <commdlg.h>
 #include <mlang.h>
 #include <mshtmhst.h>
-#include <wine/unicode.h>
-#include <wine/debug.h>
-
-
-WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 /* DLL handles for late bound calls */
 extern HINSTANCE shlwapi_hInstance;

Modified: trunk/reactos/dll/win32/shlwapi/path.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/path.c?r…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/path.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/path.c	[iso-8859-1] Fri Dec 27 13:34:32 2013
@@ -19,29 +19,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 <config.h>
-//#include "wine/port.h"
-
-//#include <stdarg.h>
-//#include <string.h>
-//#include <stdlib.h>
-
-#include <wine/unicode.h>
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <winreg.h>
-#include <winternl.h>
-#define NO_SHLWAPI_STREAM
-#include <shlwapi.h>
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(shell);
+#include "precomp.h"
 
 /* Get a function pointer from a DLL handle */
 #define GET_FUNC(func, module, name, fail) \

Added: trunk/reactos/dll/win32/shlwapi/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/precomp.…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/precomp.h	(added)
+++ trunk/reactos/dll/win32/shlwapi/precomp.h	[iso-8859-1] Fri Dec 27 13:34:32 2013
@@ -0,0 +1,34 @@
+#ifndef _SHLWAPI_PCH_
+#define _SHLWAPI_PCH_
+
+#include <wine/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 <wingdi.h>
+#include <wincon.h>
+#include <winternl.h>
+#define NO_SHLWAPI_STREAM
+#define NO_SHLWAPI_USER
+#include <shlwapi.h>
+#include <shlobj.h>
+
+#include <wine/unicode.h>
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
+
+#include "resource.h"
+
+#endif /* _SHLWAPI_PCH_ */

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

Modified: trunk/reactos/dll/win32/shlwapi/reg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/reg.c?re…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/reg.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/reg.c	[iso-8859-1] Fri Dec 27 13:34:32 2013
@@ -19,22 +19,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>
-//#include <string.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-#include <winreg.h>
-#include <wine/debug.h>
-#define NO_SHLWAPI_STREAM
-#include <shlwapi.h>
-#include <wine/unicode.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(shell);
+#include "precomp.h"
 
 /* Key/Value names for MIME content types */
 static const char lpszContentTypeA[] = "Content Type";

Modified: trunk/reactos/dll/win32/shlwapi/regstream.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/regstrea…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/regstream.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/regstream.c	[iso-8859-1] Fri Dec 27 13:34:32 2013
@@ -19,25 +19,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>
-//#include <string.h>
-
-#define COBJMACROS
-
-//#include "winerror.h"
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
-#include <winreg.h>
-//#include "shlwapi.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(shell);
+#include "precomp.h"
 
 typedef struct
 {

Modified: trunk/reactos/dll/win32/shlwapi/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/resource…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/resource.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/resource.h	[iso-8859-1] Fri Dec 27 13:34:32 2013
@@ -17,11 +17,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
 #ifndef WINE_SHLWAPI_RESOURCE_H
 #define WINE_SHLWAPI_RESOURCE_H
-
-//#include <windef.h>
-#include <winuser.h>
 
 #define IDS_BYTES_FORMAT 64
 #define IDS_TIME_INTERVAL_HOURS 65

Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/shlwapi.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/shlwapi.rc	[iso-8859-1] Fri Dec 27 13:34:32 2013
@@ -18,10 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winuser.h"
-//#include "resource.h"
+#include <winuser.h>
+
+#include "resource.h"
 
 #include "version.rc"
 

Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/shlwapi_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/shlwapi_main.c	[iso-8859-1] Fri Dec 27 13:34:32 2013
@@ -19,20 +19,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>
-
-#include <windef.h>
-#include <winbase.h>
-#define NO_SHLWAPI_REG
-#define NO_SHLWAPI_STREAM
-#include <shlwapi.h>
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(shell);
+#include "precomp.h"
 
 DECLSPEC_HIDDEN HINSTANCE shlwapi_hInstance = 0;
 DECLSPEC_HIDDEN DWORD SHLWAPI_ThreadRef_index = TLS_OUT_OF_INDEXES;

Modified: trunk/reactos/dll/win32/shlwapi/stopwatch.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/stopwatc…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/stopwatch.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/stopwatch.c	[iso-8859-1] Fri Dec 27 13:34:32 2013
@@ -23,24 +23,7 @@
  * B) Want to use a substandard API to tune its performance.
  */
 
-#define WIN32_NO_STATUS
-
-#include <config.h>
-//#include "wine/port.h"
-
-#include <stdarg.h>
-//#include <string.h>
-//#include <stdlib.h>
-
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-#include <windef.h>
-#include <winbase.h>
-//#include "winreg.h"
-#include <winternl.h>
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(shell);
+#include "precomp.h"
 
 /*************************************************************************
  *      @	[SHLWAPI.241]

Modified: trunk/reactos/dll/win32/shlwapi/string.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/string.c…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/string.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/string.c	[iso-8859-1] Fri Dec 27 13:34:32 2013
@@ -19,36 +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 "precomp.h"
 
 #include <math.h>
-#include <stdarg.h>
-//#include <stdio.h>
-//#include <string.h>
-
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-#include <windef.h>
-#include <winbase.h>
-#define NO_SHLWAPI_REG
-#define NO_SHLWAPI_STREAM
-#include <shlwapi.h>
-//#include "wingdi.h"
-//#include "winuser.h"
-#include <shlobj.h>
 #include <mlang.h>
 #include <ddeml.h>
-#include <wine/unicode.h>
-#include <wine/debug.h>
-
-#include "resource.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 extern HINSTANCE shlwapi_hInstance;
 

Modified: trunk/reactos/dll/win32/shlwapi/thread.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/thread.c…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/thread.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/thread.c	[iso-8859-1] Fri Dec 27 13:34:32 2013
@@ -18,29 +18,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
  */
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
-//#include <string.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-#include <winnls.h>
-//#include "winuser.h"
-#define NO_SHLWAPI_REG
-#define NO_SHLWAPI_PATH
-#define NO_SHLWAPI_GDI
-#define NO_SHLWAPI_STREAM
-#define NO_SHLWAPI_USER
-#include <shlwapi.h>
-#include <shlobj.h>
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(shell);
+
+#include "precomp.h"
 
 extern DWORD SHLWAPI_ThreadRef_index;  /* Initialised in shlwapi_main.c */
 

Modified: trunk/reactos/dll/win32/shlwapi/url.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/url.c?re…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/url.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/url.c	[iso-8859-1] Fri Dec 27 13:34:32 2013
@@ -18,33 +18,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 <config.h>
-//#include "wine/port.h"
-#include <stdarg.h>
-//#include <string.h>
-//#include <stdlib.h>
-#include <windef.h>
-#include <winbase.h>
-//#include "winnls.h"
-//#include "winerror.h"
-#include <wine/unicode.h>
+#include "precomp.h"
+
 #include <wininet.h>
-#include <winreg.h>
-#include <winternl.h>
-#define NO_SHLWAPI_STREAM
-#include <shlwapi.h>
 #include <intshcut.h>
-#include <wine/debug.h>
 
 HMODULE WINAPI MLLoadLibraryW(LPCWSTR,HMODULE,DWORD);
 BOOL    WINAPI MLFreeLibrary(HMODULE);
 HRESULT WINAPI MLBuildResURLW(LPCWSTR,HMODULE,DWORD,LPCWSTR,LPWSTR,DWORD);
-
-WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 static inline WCHAR *heap_strdupAtoW(const char *str)
 {

Modified: trunk/reactos/dll/win32/shlwapi/wsprintf.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/wsprintf…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/wsprintf.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/wsprintf.c	[iso-8859-1] Fri Dec 27 13:34:32 2013
@@ -23,20 +23,9 @@
  */
 
 #define WIN32_NO_STATUS
-
-//#include <stdarg.h>
-//#include <string.h>
-//#include <stdio.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-#define NO_SHLWAPI_REG
-//#include "shlwapi.h"
-
 #include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(string);
-
 
 #define WPRINTF_LEFTALIGN   0x0001  /* Align output on the left ('-' prefix) */
 #define WPRINTF_PREFIX_HEX  0x0002  /* Prefix hex with 0x ('#' prefix) */