diff --git a/reactos/dll/win32/shlwapi/assoc.c b/reactos/dll/win32/shlwapi/assoc.c index b2dca99a79c..b34c2724551 100644 --- a/reactos/dll/win32/shlwapi/assoc.c +++ b/reactos/dll/win32/shlwapi/assoc.c @@ -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 -//#include - -#include -#include -#include -#include -//#include "objbase.h" -//#include "shlguid.h" -#include -#include -//#include "wine/unicode.h" -#include - -WINE_DEFAULT_DEBUG_CHANNEL(shell); +#include "precomp.h" /* Default IQueryAssociations::Init() flags */ #define SHLWAPI_DEF_ASSOCF (ASSOCF_INIT_BYEXENAME|ASSOCF_INIT_DEFAULTTOSTAR| \ diff --git a/reactos/dll/win32/shlwapi/clist.c b/reactos/dll/win32/shlwapi/clist.c index d4db8da36a8..763a40e3498 100644 --- a/reactos/dll/win32/shlwapi/clist.c +++ b/reactos/dll/win32/shlwapi/clist.c @@ -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 -//#include - -#define COBJMACROS - -#include -#include -//#include "winuser.h" -//#include "objbase.h" -#include -#include - -WINE_DEFAULT_DEBUG_CHANNEL(shell); +#include "precomp.h" /* dwSignature for contained DATABLOCK_HEADER items */ #define CLIST_ID_CONTAINER (~0U) diff --git a/reactos/dll/win32/shlwapi/istream.c b/reactos/dll/win32/shlwapi/istream.c index 3a87dc4ee4c..581871ece86 100644 --- a/reactos/dll/win32/shlwapi/istream.c +++ b/reactos/dll/win32/shlwapi/istream.c @@ -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 -//#include - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include -#include -//#include "winerror.h" -#include -#define NO_SHLWAPI_REG -#define NO_SHLWAPI_PATH -#include -#include - -WINE_DEFAULT_DEBUG_CHANNEL(shell); +#include "precomp.h" #define STGM_ACCESS_MODE(stgm) ((stgm)&0x0000f) #define STGM_SHARE_MODE(stgm) ((stgm)&0x000f0) diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Da.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Da.rc index bfbe9a20d80..2ce6736f102 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Da.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Da.rc @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_DANISH, SUBLANG_DEFAULT IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_De.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_De.rc index c473e00fbb7..b5f5eb03efe 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_De.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_De.rc @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - #pragma code_page(65001) LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_En.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_En.rc index 8418f0eff7a..d3f2e395e11 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_En.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_En.rc @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Es.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Es.rc index 16c9d52cc35..64cdd69b817 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Es.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Es.rc @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Fi.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Fi.rc index 54fa502048c..7ca9fcad241 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Fi.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Fi.rc @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Fr.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Fr.rc index 6623a359743..2354e396ad0 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Fr.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Fr.rc @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - /* UTF-8 */ #pragma code_page(65001) diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_He.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_He.rc index 862dec170dd..7266c30b1ad 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_He.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_He.rc @@ -20,8 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Hu.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Hu.rc index c279b7c333f..f9b8866a777 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Hu.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Hu.rc @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - /* UTF-8 */ #pragma code_page(65001) diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_It.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_It.rc index ea1851308e3..304c0ee01cf 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_It.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_It.rc @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Ja.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Ja.rc index 722a01b8056..2e4d725d19e 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Ja.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Ja.rc @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - /* UTF-8 */ #pragma code_page(65001) diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Ko.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Ko.rc index b209496dd92..2c8793ea44b 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Ko.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Ko.rc @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Lt.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Lt.rc index 7ddbbeae96f..7dd490965f9 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Lt.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Lt.rc @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - /* UTF-8 */ #pragma code_page(65001) diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Nl.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Nl.rc index 82ef57da192..0203c88094e 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Nl.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Nl.rc @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_No.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_No.rc index 7f7d321af5a..cce32f074da 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_No.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_No.rc @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Pl.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Pl.rc index 9e72ee0f7e3..1f3298f9827 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Pl.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Pl.rc @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_POLISH, SUBLANG_DEFAULT IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Pt.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Pt.rc index f976aae16b8..5f799583771 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Pt.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Pt.rc @@ -20,8 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - #pragma code_page(65001) LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Ro.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Ro.rc index d59a92fcb5d..ed27f807b4b 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Ro.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Ro.rc @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Ru.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Ru.rc index 8d833b1f97e..bda962c7467 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Ru.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Ru.rc @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - /* UTF-8 */ #pragma code_page(65001) diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Si.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Si.rc index 926460183d8..bbd1d0c6e7a 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Si.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Si.rc @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Sk.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Sk.rc index 6f2354b6d67..8c2287749c4 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Sk.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Sk.rc @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Sv.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Sv.rc index c55b1d36e9c..f3f6e734e5a 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Sv.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Sv.rc @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Tr.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Tr.rc index c51e80abe53..f7269f8012e 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Tr.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Tr.rc @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Uk.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Uk.rc index 099f2bf3131..0760fd71c22 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Uk.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Uk.rc @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - /* UTF-8 */ #pragma code_page(65001) diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Zh.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Zh.rc index 77d6f3ac449..e9f12855ea6 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Zh.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Zh.rc @@ -18,8 +18,6 @@ * 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) diff --git a/reactos/dll/win32/shlwapi/msgbox.c b/reactos/dll/win32/shlwapi/msgbox.c index 73fe8dba7c7..31f53f9479a 100644 --- a/reactos/dll/win32/shlwapi/msgbox.c +++ b/reactos/dll/win32/shlwapi/msgbox.c @@ -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 -//#include "wine/port.h" - -#include -//#include - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#include -#include -//#include "winuser.h" -#include -#include -#include -#include - -#include "resource.h" - - -WINE_DEFAULT_DEBUG_CHANNEL(shell); +#include "precomp.h" extern HINSTANCE shlwapi_hInstance; /* in shlwapi_main.c */ diff --git a/reactos/dll/win32/shlwapi/ordinal.c b/reactos/dll/win32/shlwapi/ordinal.c index 915113565e1..233d3ec46fe 100644 --- a/reactos/dll/win32/shlwapi/ordinal.c +++ b/reactos/dll/win32/shlwapi/ordinal.c @@ -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 "precomp.h" -#include -//#include "wine/port.h" - -//#include #include -//#include -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include -#include -//#include "winnls.h" -#include -#include -//#include "winuser.h" #include #include -#include #include -#include "objbase.h" -//#include "exdisp.h" -#include "shdeprecated.h" -#include -#include +#include #include #include #include #include -#include -#include - - -WINE_DEFAULT_DEBUG_CHANNEL(shell); /* DLL handles for late bound calls */ extern HINSTANCE shlwapi_hInstance; diff --git a/reactos/dll/win32/shlwapi/path.c b/reactos/dll/win32/shlwapi/path.c index 47fb520b522..383c6ec3bd8 100644 --- a/reactos/dll/win32/shlwapi/path.c +++ b/reactos/dll/win32/shlwapi/path.c @@ -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 -//#include "wine/port.h" - -//#include -//#include -//#include - -#include -#include -#include -#include -#include -#include -#include -#define NO_SHLWAPI_STREAM -#include -#include - -WINE_DEFAULT_DEBUG_CHANNEL(shell); +#include "precomp.h" /* Get a function pointer from a DLL handle */ #define GET_FUNC(func, module, name, fail) \ diff --git a/reactos/dll/win32/shlwapi/precomp.h b/reactos/dll/win32/shlwapi/precomp.h new file mode 100644 index 00000000000..d5fc1114e59 --- /dev/null +++ b/reactos/dll/win32/shlwapi/precomp.h @@ -0,0 +1,34 @@ +#ifndef _SHLWAPI_PCH_ +#define _SHLWAPI_PCH_ + +#include + +#include + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include +#include +#include +#include +#include +#include +#define NO_SHLWAPI_STREAM +#define NO_SHLWAPI_USER +#include +#include + +#include + +#include +WINE_DEFAULT_DEBUG_CHANNEL(shell); + +#include "resource.h" + +#endif /* _SHLWAPI_PCH_ */ diff --git a/reactos/dll/win32/shlwapi/reg.c b/reactos/dll/win32/shlwapi/reg.c index af836f0de5e..6a52ea8e90c 100644 --- a/reactos/dll/win32/shlwapi/reg.c +++ b/reactos/dll/win32/shlwapi/reg.c @@ -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 -//#include -#include -#include -#include -#include -#include -#define NO_SHLWAPI_STREAM -#include -#include - -WINE_DEFAULT_DEBUG_CHANNEL(shell); +#include "precomp.h" /* Key/Value names for MIME content types */ static const char lpszContentTypeA[] = "Content Type"; diff --git a/reactos/dll/win32/shlwapi/regstream.c b/reactos/dll/win32/shlwapi/regstream.c index 2ef0da2fc46..b4340a503b7 100644 --- a/reactos/dll/win32/shlwapi/regstream.c +++ b/reactos/dll/win32/shlwapi/regstream.c @@ -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 -//#include - -#define COBJMACROS - -//#include "winerror.h" -#include -#include -#include -#include -//#include "shlwapi.h" - -#include - -WINE_DEFAULT_DEBUG_CHANNEL(shell); +#include "precomp.h" typedef struct { diff --git a/reactos/dll/win32/shlwapi/resource.h b/reactos/dll/win32/shlwapi/resource.h index 215a4d64f29..2cc17a886e3 100644 --- a/reactos/dll/win32/shlwapi/resource.h +++ b/reactos/dll/win32/shlwapi/resource.h @@ -17,12 +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 */ + #ifndef WINE_SHLWAPI_RESOURCE_H #define WINE_SHLWAPI_RESOURCE_H -//#include -#include - #define IDS_BYTES_FORMAT 64 #define IDS_TIME_INTERVAL_HOURS 65 #define IDS_TIME_INTERVAL_MINUTES 66 diff --git a/reactos/dll/win32/shlwapi/shlwapi.rc b/reactos/dll/win32/shlwapi/shlwapi.rc index c0688b0d6b7..6a588958c77 100644 --- a/reactos/dll/win32/shlwapi/shlwapi.rc +++ b/reactos/dll/win32/shlwapi/shlwapi.rc @@ -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 + +#include "resource.h" #include "version.rc" diff --git a/reactos/dll/win32/shlwapi/shlwapi_main.c b/reactos/dll/win32/shlwapi/shlwapi_main.c index 44889e644a2..d4f9e3698c7 100644 --- a/reactos/dll/win32/shlwapi/shlwapi_main.c +++ b/reactos/dll/win32/shlwapi/shlwapi_main.c @@ -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 - -#include -#include -#define NO_SHLWAPI_REG -#define NO_SHLWAPI_STREAM -#include -#include - -WINE_DEFAULT_DEBUG_CHANNEL(shell); +#include "precomp.h" DECLSPEC_HIDDEN HINSTANCE shlwapi_hInstance = 0; DECLSPEC_HIDDEN DWORD SHLWAPI_ThreadRef_index = TLS_OUT_OF_INDEXES; diff --git a/reactos/dll/win32/shlwapi/stopwatch.c b/reactos/dll/win32/shlwapi/stopwatch.c index d44b750d1f7..28c85c3164d 100644 --- a/reactos/dll/win32/shlwapi/stopwatch.c +++ b/reactos/dll/win32/shlwapi/stopwatch.c @@ -23,24 +23,7 @@ * B) Want to use a substandard API to tune its performance. */ -#define WIN32_NO_STATUS - -#include -//#include "wine/port.h" - -#include -//#include -//#include - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#include -#include -//#include "winreg.h" -#include -#include - -WINE_DEFAULT_DEBUG_CHANNEL(shell); +#include "precomp.h" /************************************************************************* * @ [SHLWAPI.241] diff --git a/reactos/dll/win32/shlwapi/string.c b/reactos/dll/win32/shlwapi/string.c index cba16d720fb..1dcc1cc18f4 100644 --- a/reactos/dll/win32/shlwapi/string.c +++ b/reactos/dll/win32/shlwapi/string.c @@ -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 -//#include "wine/port.h" +#include "precomp.h" #include -#include -//#include -//#include - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#include -#include -#define NO_SHLWAPI_REG -#define NO_SHLWAPI_STREAM -#include -//#include "wingdi.h" -//#include "winuser.h" -#include #include #include -#include -#include - -#include "resource.h" - -WINE_DEFAULT_DEBUG_CHANNEL(shell); extern HINSTANCE shlwapi_hInstance; diff --git a/reactos/dll/win32/shlwapi/thread.c b/reactos/dll/win32/shlwapi/thread.c index 6747a51b893..4fd0d46cd9d 100644 --- a/reactos/dll/win32/shlwapi/thread.c +++ b/reactos/dll/win32/shlwapi/thread.c @@ -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 -//#include - -#define COBJMACROS - -#include -#include -#include -//#include "winuser.h" -#define NO_SHLWAPI_REG -#define NO_SHLWAPI_PATH -#define NO_SHLWAPI_GDI -#define NO_SHLWAPI_STREAM -#define NO_SHLWAPI_USER -#include -#include -#include - -WINE_DEFAULT_DEBUG_CHANNEL(shell); +#include "precomp.h" extern DWORD SHLWAPI_ThreadRef_index; /* Initialised in shlwapi_main.c */ diff --git a/reactos/dll/win32/shlwapi/url.c b/reactos/dll/win32/shlwapi/url.c index 6b591560b2a..b1da8281e67 100644 --- a/reactos/dll/win32/shlwapi/url.c +++ b/reactos/dll/win32/shlwapi/url.c @@ -18,34 +18,15 @@ * 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 -//#include "wine/port.h" -#include -//#include -//#include -#include -#include -//#include "winnls.h" -//#include "winerror.h" -#include #include -#include -#include -#define NO_SHLWAPI_STREAM -#include #include -#include 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) { LPWSTR ret = NULL; diff --git a/reactos/dll/win32/shlwapi/wsprintf.c b/reactos/dll/win32/shlwapi/wsprintf.c index 7d213b1b48f..aacca9f1e36 100644 --- a/reactos/dll/win32/shlwapi/wsprintf.c +++ b/reactos/dll/win32/shlwapi/wsprintf.c @@ -23,21 +23,10 @@ */ #define WIN32_NO_STATUS - -//#include -//#include -//#include - -//#include "windef.h" -//#include "winbase.h" -#define NO_SHLWAPI_REG -//#include "shlwapi.h" - #include 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) */ #define WPRINTF_ZEROPAD 0x0004 /* Pad with zeros ('0' prefix) */