From cb758248bdcc6d77eba40ab579552b6e68bbdec7 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 19 Jan 2014 10:26:08 +0000 Subject: [PATCH] [INETCPL] * Move some inclusions to the main header. * Extract the resource related definitions into resource.h and include it in both the main header and the resource file. * 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=61693 --- reactos/dll/cpl/inetcpl/content.c | 12 +---- reactos/dll/cpl/inetcpl/general.c | 21 +------- reactos/dll/cpl/inetcpl/inetcpl.c | 21 +------- reactos/dll/cpl/inetcpl/inetcpl.h | 70 ++++++++------------------- reactos/dll/cpl/inetcpl/inetcpl.rc | 6 ++- reactos/dll/cpl/inetcpl/lang/He.rc | 2 - reactos/dll/cpl/inetcpl/lang/Sr.rc | 2 - reactos/dll/cpl/inetcpl/lang/de-DE.rc | 2 - reactos/dll/cpl/inetcpl/lang/en-US.rc | 2 - reactos/dll/cpl/inetcpl/lang/fr-FR.rc | 2 - reactos/dll/cpl/inetcpl/lang/it-IT.rc | 2 - reactos/dll/cpl/inetcpl/lang/ja-JP.rc | 2 - reactos/dll/cpl/inetcpl/lang/ko-KR.rc | 2 - reactos/dll/cpl/inetcpl/lang/lt-LT.rc | 2 - reactos/dll/cpl/inetcpl/lang/nl-NL.rc | 2 - reactos/dll/cpl/inetcpl/lang/pl-PL.rc | 2 - reactos/dll/cpl/inetcpl/lang/pt-BR.rc | 2 - reactos/dll/cpl/inetcpl/lang/ro-RO.rc | 2 - reactos/dll/cpl/inetcpl/lang/ru-RU.rc | 2 - reactos/dll/cpl/inetcpl/lang/sv-SE.rc | 2 - reactos/dll/cpl/inetcpl/lang/tr-TR.rc | 2 - reactos/dll/cpl/inetcpl/lang/uk-UA.rc | 2 - reactos/dll/cpl/inetcpl/resource.h | 52 ++++++++++++++++++++ reactos/dll/cpl/inetcpl/security.c | 24 --------- 24 files changed, 80 insertions(+), 160 deletions(-) create mode 100644 reactos/dll/cpl/inetcpl/resource.h diff --git a/reactos/dll/cpl/inetcpl/content.c b/reactos/dll/cpl/inetcpl/content.c index 405e629f01c..f4588e759e5 100644 --- a/reactos/dll/cpl/inetcpl/content.c +++ b/reactos/dll/cpl/inetcpl/content.c @@ -19,19 +19,9 @@ * */ -#define NONAMELESSUNION -#define WIN32_NO_STATUS - -#include -#include -#include -#include -#include - #include "inetcpl.h" -#include -WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); +#include /********************************************************************* * display_cert_manager (internal) diff --git a/reactos/dll/cpl/inetcpl/general.c b/reactos/dll/cpl/inetcpl/general.c index 0a12fc15857..47a0f1b5f10 100644 --- a/reactos/dll/cpl/inetcpl/general.c +++ b/reactos/dll/cpl/inetcpl/general.c @@ -19,27 +19,10 @@ * */ -#define NONAMELESSUNION - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include -#include -#include -//#include -#include -#include -#include -//#include -#include - #include "inetcpl.h" -#include - -WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); +#include +#include static const WCHAR about_blank[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; static const WCHAR start_page[] = {'S','t','a','r','t',' ','P','a','g','e',0}; diff --git a/reactos/dll/cpl/inetcpl/inetcpl.c b/reactos/dll/cpl/inetcpl/inetcpl.c index e0cf3d97062..383d0a3bd06 100644 --- a/reactos/dll/cpl/inetcpl/inetcpl.c +++ b/reactos/dll/cpl/inetcpl/inetcpl.c @@ -19,28 +19,9 @@ * */ -#define NONAMELESSUNION -#define COBJMACROS -#define CONST_VTABLE -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include -#include -#include -//#include -#include -//#include -#include -#include - -#include - #include "inetcpl.h" - -WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); +#include DECLSPEC_HIDDEN HMODULE hcpl; diff --git a/reactos/dll/cpl/inetcpl/inetcpl.h b/reactos/dll/cpl/inetcpl/inetcpl.h index 4aae2922f3e..dabadef5e74 100644 --- a/reactos/dll/cpl/inetcpl/inetcpl.h +++ b/reactos/dll/cpl/inetcpl/inetcpl.h @@ -22,9 +22,26 @@ #ifndef __WINE_INETCPL__ #define __WINE_INETCPL__ +#include + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS +#define CONST_VTABLE +#define NONAMELESSUNION + #include +#include #include +#include +#include #include +#include + +#include +WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); extern HMODULE hcpl; INT_PTR CALLBACK content_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; @@ -52,55 +69,6 @@ static inline BOOL heap_free( void *mem ) #define NUM_PROPERTY_PAGES 8 -/* icons */ -#define ICO_MAIN 100 -#define ICO_INTERNET 1313 +#include "resource.h" -/* strings */ -#define IDS_CPL_NAME 1 -#define IDS_CPL_INFO 2 -#define IDS_SEC_SETTINGS 0x10 -#define IDS_SEC_LEVEL0 0x100 -#define IDS_SEC_LEVEL1 0x101 -#define IDS_SEC_LEVEL2 0x102 -#define IDS_SEC_LEVEL3 0x103 -#define IDS_SEC_LEVEL4 0x104 -#define IDS_SEC_LEVEL5 0x105 -#define IDS_SEC_LEVEL0_INFO 0x200 -#define IDS_SEC_LEVEL1_INFO 0x210 -#define IDS_SEC_LEVEL2_INFO 0x220 -#define IDS_SEC_LEVEL3_INFO 0x230 -#define IDS_SEC_LEVEL4_INFO 0x240 -#define IDS_SEC_LEVEL5_INFO 0x250 - -/* dialogs */ -#define IDC_STATIC -1 - -#define IDD_GENERAL 1000 -#define IDC_HOME_EDIT 1000 -#define IDC_HOME_CURRENT 1001 -#define IDC_HOME_DEFAULT 1002 -#define IDC_HOME_BLANK 1003 -#define IDC_HISTORY_DELETE 1004 -#define IDC_HISTORY_SETTINGS 1005 - -#define IDD_DELETE_HISTORY 1010 -#define IDC_DELETE_TEMP_FILES 1011 -#define IDC_DELETE_COOKIES 1012 -#define IDC_DELETE_HISTORY 1013 -#define IDC_DELETE_FORM_DATA 1014 -#define IDC_DELETE_PASSWORDS 1015 - -#define IDD_SECURITY 2000 -#define IDC_SEC_LISTVIEW 2001 -#define IDC_SEC_ZONE_INFO 2002 -#define IDC_SEC_GROUP 2003 -#define IDC_SEC_TRACKBAR 2004 -#define IDC_SEC_LEVEL 2005 -#define IDC_SEC_LEVEL_INFO 2006 - -#define IDD_CONTENT 4000 -#define IDC_CERT 4100 -#define IDC_CERT_PUBLISHER 4101 - -#endif +#endif /* __WINE_INETCPL__ */ diff --git a/reactos/dll/cpl/inetcpl/inetcpl.rc b/reactos/dll/cpl/inetcpl/inetcpl.rc index 0e8c1af4e3e..8c900be92b4 100644 --- a/reactos/dll/cpl/inetcpl/inetcpl.rc +++ b/reactos/dll/cpl/inetcpl/inetcpl.rc @@ -19,7 +19,11 @@ * */ -#include "inetcpl.h" +#include +#include +#include + +#include "resource.h" #include diff --git a/reactos/dll/cpl/inetcpl/lang/He.rc b/reactos/dll/cpl/inetcpl/lang/He.rc index 9c32eb07e5f..804e34fb653 100644 --- a/reactos/dll/cpl/inetcpl/lang/He.rc +++ b/reactos/dll/cpl/inetcpl/lang/He.rc @@ -22,8 +22,6 @@ * */ -#include "inetcpl.h" - #pragma code_page(65001) LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT diff --git a/reactos/dll/cpl/inetcpl/lang/Sr.rc b/reactos/dll/cpl/inetcpl/lang/Sr.rc index 46803a800e3..fe4ea892ecd 100644 --- a/reactos/dll/cpl/inetcpl/lang/Sr.rc +++ b/reactos/dll/cpl/inetcpl/lang/Sr.rc @@ -20,8 +20,6 @@ * */ -#include "inetcpl.h" - #pragma code_page(65001) LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC diff --git a/reactos/dll/cpl/inetcpl/lang/de-DE.rc b/reactos/dll/cpl/inetcpl/lang/de-DE.rc index 42a23417263..b4e9e71817e 100644 --- a/reactos/dll/cpl/inetcpl/lang/de-DE.rc +++ b/reactos/dll/cpl/inetcpl/lang/de-DE.rc @@ -19,8 +19,6 @@ * */ -#include "inetcpl.h" - #pragma code_page(65001) LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL diff --git a/reactos/dll/cpl/inetcpl/lang/en-US.rc b/reactos/dll/cpl/inetcpl/lang/en-US.rc index 7c71f303966..7d56aa4c221 100644 --- a/reactos/dll/cpl/inetcpl/lang/en-US.rc +++ b/reactos/dll/cpl/inetcpl/lang/en-US.rc @@ -19,8 +19,6 @@ * */ -#include "inetcpl.h" - LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT /* "General" propsheet */ diff --git a/reactos/dll/cpl/inetcpl/lang/fr-FR.rc b/reactos/dll/cpl/inetcpl/lang/fr-FR.rc index 50bcf8bdbe8..3d417a4fccf 100644 --- a/reactos/dll/cpl/inetcpl/lang/fr-FR.rc +++ b/reactos/dll/cpl/inetcpl/lang/fr-FR.rc @@ -20,8 +20,6 @@ * */ -#include "inetcpl.h" - LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL /* UTF-8 */ diff --git a/reactos/dll/cpl/inetcpl/lang/it-IT.rc b/reactos/dll/cpl/inetcpl/lang/it-IT.rc index 5101bd3ea37..11712559652 100644 --- a/reactos/dll/cpl/inetcpl/lang/it-IT.rc +++ b/reactos/dll/cpl/inetcpl/lang/it-IT.rc @@ -19,8 +19,6 @@ * */ -#include "inetcpl.h" - /* UTF-8 */ #pragma code_page(65001) diff --git a/reactos/dll/cpl/inetcpl/lang/ja-JP.rc b/reactos/dll/cpl/inetcpl/lang/ja-JP.rc index b0e54b506c2..f864f8534f0 100644 --- a/reactos/dll/cpl/inetcpl/lang/ja-JP.rc +++ b/reactos/dll/cpl/inetcpl/lang/ja-JP.rc @@ -20,8 +20,6 @@ * */ -#include "inetcpl.h" - /* UTF-8 */ #pragma code_page(65001) diff --git a/reactos/dll/cpl/inetcpl/lang/ko-KR.rc b/reactos/dll/cpl/inetcpl/lang/ko-KR.rc index b393cc97b06..9fc8e001142 100644 --- a/reactos/dll/cpl/inetcpl/lang/ko-KR.rc +++ b/reactos/dll/cpl/inetcpl/lang/ko-KR.rc @@ -20,8 +20,6 @@ * */ -#include "inetcpl.h" - #pragma code_page(65001) LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT diff --git a/reactos/dll/cpl/inetcpl/lang/lt-LT.rc b/reactos/dll/cpl/inetcpl/lang/lt-LT.rc index 2f4aed120bf..19236cb8b14 100644 --- a/reactos/dll/cpl/inetcpl/lang/lt-LT.rc +++ b/reactos/dll/cpl/inetcpl/lang/lt-LT.rc @@ -19,8 +19,6 @@ * */ -#include "inetcpl.h" - /* UTF-8 */ #pragma code_page(65001) diff --git a/reactos/dll/cpl/inetcpl/lang/nl-NL.rc b/reactos/dll/cpl/inetcpl/lang/nl-NL.rc index e79857b1d42..19bda0d19ca 100644 --- a/reactos/dll/cpl/inetcpl/lang/nl-NL.rc +++ b/reactos/dll/cpl/inetcpl/lang/nl-NL.rc @@ -19,8 +19,6 @@ * */ -#include "inetcpl.h" - LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL /* "General" propsheet */ diff --git a/reactos/dll/cpl/inetcpl/lang/pl-PL.rc b/reactos/dll/cpl/inetcpl/lang/pl-PL.rc index 67a2c469d8b..f262ea9c049 100644 --- a/reactos/dll/cpl/inetcpl/lang/pl-PL.rc +++ b/reactos/dll/cpl/inetcpl/lang/pl-PL.rc @@ -19,8 +19,6 @@ * */ -#include "inetcpl.h" - LANGUAGE LANG_POLISH, SUBLANG_DEFAULT /* UTF-8 */ diff --git a/reactos/dll/cpl/inetcpl/lang/pt-BR.rc b/reactos/dll/cpl/inetcpl/lang/pt-BR.rc index d6339183e28..0be7eb7332a 100644 --- a/reactos/dll/cpl/inetcpl/lang/pt-BR.rc +++ b/reactos/dll/cpl/inetcpl/lang/pt-BR.rc @@ -19,8 +19,6 @@ * */ -#include "inetcpl.h" - #pragma code_page(65001) LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN diff --git a/reactos/dll/cpl/inetcpl/lang/ro-RO.rc b/reactos/dll/cpl/inetcpl/lang/ro-RO.rc index d0e1d733030..a1f571736ff 100644 --- a/reactos/dll/cpl/inetcpl/lang/ro-RO.rc +++ b/reactos/dll/cpl/inetcpl/lang/ro-RO.rc @@ -21,8 +21,6 @@ * CHANGE LOG: 2011-11-09 initial translation */ -#include "inetcpl.h" - LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL /* "General" propsheet */ diff --git a/reactos/dll/cpl/inetcpl/lang/ru-RU.rc b/reactos/dll/cpl/inetcpl/lang/ru-RU.rc index 5d892e091c7..d91e8dbe2ce 100644 --- a/reactos/dll/cpl/inetcpl/lang/ru-RU.rc +++ b/reactos/dll/cpl/inetcpl/lang/ru-RU.rc @@ -19,8 +19,6 @@ * */ -#include "inetcpl.h" - /* UTF-8 */ #pragma code_page(65001) diff --git a/reactos/dll/cpl/inetcpl/lang/sv-SE.rc b/reactos/dll/cpl/inetcpl/lang/sv-SE.rc index 14abe5959a7..21525504b4d 100644 --- a/reactos/dll/cpl/inetcpl/lang/sv-SE.rc +++ b/reactos/dll/cpl/inetcpl/lang/sv-SE.rc @@ -19,8 +19,6 @@ * */ -#include "inetcpl.h" - #pragma code_page(65001) LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL diff --git a/reactos/dll/cpl/inetcpl/lang/tr-TR.rc b/reactos/dll/cpl/inetcpl/lang/tr-TR.rc index 0fa63e7a64d..6e4ce61f353 100644 --- a/reactos/dll/cpl/inetcpl/lang/tr-TR.rc +++ b/reactos/dll/cpl/inetcpl/lang/tr-TR.rc @@ -19,8 +19,6 @@ * */ -#include "inetcpl.h" - /* UTF-8 */ #pragma code_page(65001) diff --git a/reactos/dll/cpl/inetcpl/lang/uk-UA.rc b/reactos/dll/cpl/inetcpl/lang/uk-UA.rc index 2186904a7df..e14aca54538 100644 --- a/reactos/dll/cpl/inetcpl/lang/uk-UA.rc +++ b/reactos/dll/cpl/inetcpl/lang/uk-UA.rc @@ -20,8 +20,6 @@ * */ -#include "inetcpl.h" - /* UTF-8 */ #pragma code_page(65001) diff --git a/reactos/dll/cpl/inetcpl/resource.h b/reactos/dll/cpl/inetcpl/resource.h new file mode 100644 index 00000000000..7c596bcef7b --- /dev/null +++ b/reactos/dll/cpl/inetcpl/resource.h @@ -0,0 +1,52 @@ +#pragma once + +/* icons */ +#define ICO_MAIN 100 +#define ICO_INTERNET 1313 + +/* strings */ +#define IDS_CPL_NAME 1 +#define IDS_CPL_INFO 2 +#define IDS_SEC_SETTINGS 0x10 +#define IDS_SEC_LEVEL0 0x100 +#define IDS_SEC_LEVEL1 0x101 +#define IDS_SEC_LEVEL2 0x102 +#define IDS_SEC_LEVEL3 0x103 +#define IDS_SEC_LEVEL4 0x104 +#define IDS_SEC_LEVEL5 0x105 +#define IDS_SEC_LEVEL0_INFO 0x200 +#define IDS_SEC_LEVEL1_INFO 0x210 +#define IDS_SEC_LEVEL2_INFO 0x220 +#define IDS_SEC_LEVEL3_INFO 0x230 +#define IDS_SEC_LEVEL4_INFO 0x240 +#define IDS_SEC_LEVEL5_INFO 0x250 + +/* dialogs */ +#define IDC_STATIC -1 + +#define IDD_GENERAL 1000 +#define IDC_HOME_EDIT 1000 +#define IDC_HOME_CURRENT 1001 +#define IDC_HOME_DEFAULT 1002 +#define IDC_HOME_BLANK 1003 +#define IDC_HISTORY_DELETE 1004 +#define IDC_HISTORY_SETTINGS 1005 + +#define IDD_DELETE_HISTORY 1010 +#define IDC_DELETE_TEMP_FILES 1011 +#define IDC_DELETE_COOKIES 1012 +#define IDC_DELETE_HISTORY 1013 +#define IDC_DELETE_FORM_DATA 1014 +#define IDC_DELETE_PASSWORDS 1015 + +#define IDD_SECURITY 2000 +#define IDC_SEC_LISTVIEW 2001 +#define IDC_SEC_ZONE_INFO 2002 +#define IDC_SEC_GROUP 2003 +#define IDC_SEC_TRACKBAR 2004 +#define IDC_SEC_LEVEL 2005 +#define IDC_SEC_LEVEL_INFO 2006 + +#define IDD_CONTENT 4000 +#define IDC_CERT 4100 +#define IDC_CERT_PUBLISHER 4101 diff --git a/reactos/dll/cpl/inetcpl/security.c b/reactos/dll/cpl/inetcpl/security.c index 596103ff40e..20f5a1955c8 100644 --- a/reactos/dll/cpl/inetcpl/security.c +++ b/reactos/dll/cpl/inetcpl/security.c @@ -19,31 +19,7 @@ * */ -#define COBJMACROS -#define CONST_VTABLE -#define NONAMELESSUNION - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include -#include -#include -#include -//#include -//#include "commctrl.h" - -//#include "ole2.h" -//#include "urlmon.h" -//#include "initguid.h" -#include -#include - #include "inetcpl.h" -#include - -WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); typedef struct secdlg_data_s { HWND hsec; /* security propsheet */