[ros-diffs] [akhaldi] 61693: [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 ...

Author: akhaldi
Date: Sun Jan 19 10:26:08 2014
New Revision: 61693

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

Added:
    trunk/reactos/dll/cpl/inetcpl/resource.h   (with props)
Modified:
    trunk/reactos/dll/cpl/inetcpl/content.c
    trunk/reactos/dll/cpl/inetcpl/general.c
    trunk/reactos/dll/cpl/inetcpl/inetcpl.c
    trunk/reactos/dll/cpl/inetcpl/inetcpl.h
    trunk/reactos/dll/cpl/inetcpl/inetcpl.rc
    trunk/reactos/dll/cpl/inetcpl/lang/He.rc
    trunk/reactos/dll/cpl/inetcpl/lang/Sr.rc
    trunk/reactos/dll/cpl/inetcpl/lang/de-DE.rc
    trunk/reactos/dll/cpl/inetcpl/lang/en-US.rc
    trunk/reactos/dll/cpl/inetcpl/lang/fr-FR.rc
    trunk/reactos/dll/cpl/inetcpl/lang/it-IT.rc
    trunk/reactos/dll/cpl/inetcpl/lang/ja-JP.rc
    trunk/reactos/dll/cpl/inetcpl/lang/ko-KR.rc
    trunk/reactos/dll/cpl/inetcpl/lang/lt-LT.rc
    trunk/reactos/dll/cpl/inetcpl/lang/nl-NL.rc
    trunk/reactos/dll/cpl/inetcpl/lang/pl-PL.rc
    trunk/reactos/dll/cpl/inetcpl/lang/pt-BR.rc
    trunk/reactos/dll/cpl/inetcpl/lang/ro-RO.rc
    trunk/reactos/dll/cpl/inetcpl/lang/ru-RU.rc
    trunk/reactos/dll/cpl/inetcpl/lang/sv-SE.rc
    trunk/reactos/dll/cpl/inetcpl/lang/tr-TR.rc
    trunk/reactos/dll/cpl/inetcpl/lang/uk-UA.rc
    trunk/reactos/dll/cpl/inetcpl/security.c

Modified: trunk/reactos/dll/cpl/inetcpl/content.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/content.c?…
==============================================================================
--- trunk/reactos/dll/cpl/inetcpl/content.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/inetcpl/content.c	[iso-8859-1] Sun Jan 19 10:26:08 2014
@@ -19,19 +19,9 @@
  *
  */
 
-#define NONAMELESSUNION
-#define WIN32_NO_STATUS
+#include "inetcpl.h"
 
-#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);
 
 /*********************************************************************
  * display_cert_manager (internal)

Modified: trunk/reactos/dll/cpl/inetcpl/general.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/general.c?…
==============================================================================
--- trunk/reactos/dll/cpl/inetcpl/general.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/inetcpl/general.c	[iso-8859-1] Sun Jan 19 10:26:08 2014
@@ -19,27 +19,10 @@
  *
  */
 
-#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 "inetcpl.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};

Modified: trunk/reactos/dll/cpl/inetcpl/inetcpl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/inetcpl.c?…
==============================================================================
--- trunk/reactos/dll/cpl/inetcpl/inetcpl.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/inetcpl/inetcpl.c	[iso-8859-1] Sun Jan 19 10:26:08 2014
@@ -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 "inetcpl.h"
+
 #include <cpl.h>
-#include <ole2.h>
-
-#include <wine/debug.h>
-
-#include "inetcpl.h"
-
-
-WINE_DEFAULT_DEBUG_CHANNEL(inetcpl);
 
 DECLSPEC_HIDDEN HMODULE hcpl;
 

Modified: trunk/reactos/dll/cpl/inetcpl/inetcpl.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/inetcpl.h?…
==============================================================================
--- trunk/reactos/dll/cpl/inetcpl/inetcpl.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/inetcpl/inetcpl.h	[iso-8859-1] Sun Jan 19 10:26:08 2014
@@ -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 @@
 
 #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__ */

Modified: trunk/reactos/dll/cpl/inetcpl/inetcpl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/inetcpl.rc…
==============================================================================
--- trunk/reactos/dll/cpl/inetcpl/inetcpl.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/inetcpl/inetcpl.rc	[iso-8859-1] Sun Jan 19 10:26:08 2014
@@ -19,7 +19,11 @@
  *
  */
 
-#include "inetcpl.h"
+#include <windef.h>
+#include <winuser.h>
+#include <commctrl.h>
+
+#include "resource.h"
 
 #include <reactos/manifest_dll.rc>
 

Modified: trunk/reactos/dll/cpl/inetcpl/lang/He.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/He.rc…
==============================================================================
--- trunk/reactos/dll/cpl/inetcpl/lang/He.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/inetcpl/lang/He.rc	[iso-8859-1] Sun Jan 19 10:26:08 2014
@@ -21,8 +21,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
-
-#include "inetcpl.h"
 
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/cpl/inetcpl/lang/Sr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/Sr.rc…
==============================================================================
--- trunk/reactos/dll/cpl/inetcpl/lang/Sr.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/inetcpl/lang/Sr.rc	[iso-8859-1] Sun Jan 19 10:26:08 2014
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
-
-#include "inetcpl.h"
 
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/cpl/inetcpl/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/de-DE…
==============================================================================
--- trunk/reactos/dll/cpl/inetcpl/lang/de-DE.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/inetcpl/lang/de-DE.rc	[iso-8859-1] Sun Jan 19 10:26:08 2014
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
-
-#include "inetcpl.h"
 
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/cpl/inetcpl/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/en-US…
==============================================================================
--- trunk/reactos/dll/cpl/inetcpl/lang/en-US.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/inetcpl/lang/en-US.rc	[iso-8859-1] Sun Jan 19 10:26:08 2014
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
-
-#include "inetcpl.h"
 
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/cpl/inetcpl/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/fr-FR…
==============================================================================
--- trunk/reactos/dll/cpl/inetcpl/lang/fr-FR.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/inetcpl/lang/fr-FR.rc	[iso-8859-1] Sun Jan 19 10:26:08 2014
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
-
-#include "inetcpl.h"
 
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 

Modified: trunk/reactos/dll/cpl/inetcpl/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/it-IT…
==============================================================================
--- trunk/reactos/dll/cpl/inetcpl/lang/it-IT.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/inetcpl/lang/it-IT.rc	[iso-8859-1] Sun Jan 19 10:26:08 2014
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
-
-#include "inetcpl.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/cpl/inetcpl/lang/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/ja-JP…
==============================================================================
--- trunk/reactos/dll/cpl/inetcpl/lang/ja-JP.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/inetcpl/lang/ja-JP.rc	[iso-8859-1] Sun Jan 19 10:26:08 2014
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
-
-#include "inetcpl.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/cpl/inetcpl/lang/ko-KR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/ko-KR…
==============================================================================
--- trunk/reactos/dll/cpl/inetcpl/lang/ko-KR.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/inetcpl/lang/ko-KR.rc	[iso-8859-1] Sun Jan 19 10:26:08 2014
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
-
-#include "inetcpl.h"
 
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/cpl/inetcpl/lang/lt-LT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/lt-LT…
==============================================================================
--- trunk/reactos/dll/cpl/inetcpl/lang/lt-LT.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/inetcpl/lang/lt-LT.rc	[iso-8859-1] Sun Jan 19 10:26:08 2014
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
-
-#include "inetcpl.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/cpl/inetcpl/lang/nl-NL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/nl-NL…
==============================================================================
--- trunk/reactos/dll/cpl/inetcpl/lang/nl-NL.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/inetcpl/lang/nl-NL.rc	[iso-8859-1] Sun Jan 19 10:26:08 2014
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
-
-#include "inetcpl.h"
 
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 

Modified: trunk/reactos/dll/cpl/inetcpl/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/pl-PL…
==============================================================================
--- trunk/reactos/dll/cpl/inetcpl/lang/pl-PL.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/inetcpl/lang/pl-PL.rc	[iso-8859-1] Sun Jan 19 10:26:08 2014
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
-
-#include "inetcpl.h"
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/cpl/inetcpl/lang/pt-BR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/pt-BR…
==============================================================================
--- trunk/reactos/dll/cpl/inetcpl/lang/pt-BR.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/inetcpl/lang/pt-BR.rc	[iso-8859-1] Sun Jan 19 10:26:08 2014
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
-
-#include "inetcpl.h"
 
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/cpl/inetcpl/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/ro-RO…
==============================================================================
--- trunk/reactos/dll/cpl/inetcpl/lang/ro-RO.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/inetcpl/lang/ro-RO.rc	[iso-8859-1] Sun Jan 19 10:26:08 2014
@@ -20,8 +20,6 @@
  * TRANSLATOR:       Fulea Ștefan (PM on ReactOS Forum at fulea.stefan)
  * CHANGE LOG:       2011-11-09  initial translation
  */
-
-#include "inetcpl.h"
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 

Modified: trunk/reactos/dll/cpl/inetcpl/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/ru-RU…
==============================================================================
--- trunk/reactos/dll/cpl/inetcpl/lang/ru-RU.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/inetcpl/lang/ru-RU.rc	[iso-8859-1] Sun Jan 19 10:26:08 2014
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
-
-#include "inetcpl.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/cpl/inetcpl/lang/sv-SE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/sv-SE…
==============================================================================
--- trunk/reactos/dll/cpl/inetcpl/lang/sv-SE.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/inetcpl/lang/sv-SE.rc	[iso-8859-1] Sun Jan 19 10:26:08 2014
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
-
-#include "inetcpl.h"
 
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/cpl/inetcpl/lang/tr-TR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/tr-TR…
==============================================================================
--- trunk/reactos/dll/cpl/inetcpl/lang/tr-TR.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/inetcpl/lang/tr-TR.rc	[iso-8859-1] Sun Jan 19 10:26:08 2014
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
-
-#include "inetcpl.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/cpl/inetcpl/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/uk-UA…
==============================================================================
--- trunk/reactos/dll/cpl/inetcpl/lang/uk-UA.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/inetcpl/lang/uk-UA.rc	[iso-8859-1] Sun Jan 19 10:26:08 2014
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  */
-
-#include "inetcpl.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Added: trunk/reactos/dll/cpl/inetcpl/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/resource.h…
==============================================================================
--- trunk/reactos/dll/cpl/inetcpl/resource.h	(added)
+++ trunk/reactos/dll/cpl/inetcpl/resource.h	[iso-8859-1] Sun Jan 19 10:26:08 2014
@@ -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

Propchange: trunk/reactos/dll/cpl/inetcpl/resource.h
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/dll/cpl/inetcpl/security.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/security.c…
==============================================================================
--- trunk/reactos/dll/cpl/inetcpl/security.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/inetcpl/security.c	[iso-8859-1] Sun Jan 19 10:26:08 2014
@@ -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 */