[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

diff --git a/reactos/dll/cpl/inetcpl/content.c b/reactos/dll/cpl/inetcpl/content.c
index 405e629..f4588e7 100644 (file)
--- 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 <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-#include <cryptuiapi.h>
-
 #include "inetcpl.h"
-#include <wine/debug.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(inetcpl);
+#include <cryptuiapi.h>
 
 /*********************************************************************
  * display_cert_manager (internal)

diff --git a/reactos/dll/cpl/inetcpl/general.c b/reactos/dll/cpl/inetcpl/general.c
index 0a12fc1..47a0f1b 100644 (file)
--- a/reactos/dll/cpl/inetcpl/general.c
+++ b/reactos/dll/cpl/inetcpl/general.c
@@ -19,28 +19,11 @@
  *
  */
 
-#define NONAMELESSUNION
-
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include "inetcpl.h"
 
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-//#include <winuser.h>
 #include <wininet.h>
-#include <winreg.h>
-#include <shlwapi.h>
-//#include <prsht.h>
 #include <shlobj.h>
 
-#include "inetcpl.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(inetcpl);
-
 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};
 static const WCHAR reg_ie_main[] = {'S','o','f','t','w','a','r','e','\\',

diff --git a/reactos/dll/cpl/inetcpl/inetcpl.c b/reactos/dll/cpl/inetcpl/inetcpl.c
index e0cf3d9..383d0a3 100644 (file)
--- 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 <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-//#include <wingdi.h>
-#include <winuser.h>
-//#include <commctrl.h>
-#include <cpl.h>
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "inetcpl.h"
 
-
-WINE_DEFAULT_DEBUG_CHANNEL(inetcpl);
+#include <cpl.h>
 
 DECLSPEC_HIDDEN HMODULE hcpl;
 

diff --git a/reactos/dll/cpl/inetcpl/inetcpl.h b/reactos/dll/cpl/inetcpl/inetcpl.h
index 4aae292..dabadef 100644 (file)
--- 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 <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define COBJMACROS
+#define CONST_VTABLE
+#define NONAMELESSUNION
+
 #include <windef.h>
+#include <winbase.h>
 #include <winuser.h>
+#include <winreg.h>
+#include <ole2.h>
 #include <commctrl.h>
+#include <shlwapi.h>
+
+#include <wine/debug.h>
+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
-
-/* 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
+#include "resource.h"
 
-#endif
+#endif /* __WINE_INETCPL__ */

diff --git a/reactos/dll/cpl/inetcpl/inetcpl.rc b/reactos/dll/cpl/inetcpl/inetcpl.rc
index 0e8c1af..8c900be 100644 (file)
--- a/reactos/dll/cpl/inetcpl/inetcpl.rc
+++ b/reactos/dll/cpl/inetcpl/inetcpl.rc
@@ -19,7 +19,11 @@
  *
  */
 
-#include "inetcpl.h"
+#include <windef.h>
+#include <winuser.h>
+#include <commctrl.h>
+
+#include "resource.h"
 
 #include <reactos/manifest_dll.rc>
 

diff --git a/reactos/dll/cpl/inetcpl/lang/He.rc b/reactos/dll/cpl/inetcpl/lang/He.rc
index 9c32eb0..804e34f 100644 (file)
--- 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 46803a8..fe4ea89 100644 (file)
--- 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 42a2341..b4e9e71 100644 (file)
--- 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 7c71f30..7d56aa4 100644 (file)
--- 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 50bcf8b..3d417a4 100644 (file)
--- 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 5101bd3..1171255 100644 (file)
--- 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 b0e54b5..f864f85 100644 (file)
--- 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 b393cc9..9fc8e00 100644 (file)
--- 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 2f4aed1..19236cb 100644 (file)
--- 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 e79857b..19bda0d 100644 (file)
--- 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 67a2c46..f262ea9 100644 (file)
--- 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 d633918..0be7eb7 100644 (file)
--- 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 d0e1d73..a1f5717 100644 (file)
--- 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 5d892e0..d91e8db 100644 (file)
--- 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 14abe59..2152550 100644 (file)
--- 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 0fa63e7..6e4ce61 100644 (file)
--- 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 2186904..e14aca5 100644 (file)
--- 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 (file)
index 0000000..7c596bc
--- /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 596103f..20f5a19 100644 (file)
--- 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 <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-//#include <prsht.h>
-//#include "commctrl.h"
-
-//#include "ole2.h"
-//#include "urlmon.h"
-//#include "initguid.h"
-#include <winreg.h>
-#include <shlwapi.h>
-
 #include "inetcpl.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(inetcpl);
 
 typedef struct secdlg_data_s {
     HWND hsec;  /* security propsheet */