Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-27 09:00:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

[INETCPL]

Browse source 
* 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
This commit is contained in:
Amine Khaldi 2014-01-19 10:26:08 +00:00
parent 034d812701
commit cb758248bd
24 changed files with 80 additions and 160 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reactos/dll/cpl/inetcpl/content.c
View file

@ -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)

21
reactos/dll/cpl/inetcpl/general.c
View file

@ -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 <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);
#include <wininet.h>
#include <shlobj.h>
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};

21
reactos/dll/cpl/inetcpl/inetcpl.c
View file

@ -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;

70
reactos/dll/cpl/inetcpl/inetcpl.h
View file

@ -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
#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__ */

6
reactos/dll/cpl/inetcpl/inetcpl.rc
View file

@ -19,7 +19,11 @@
*
*/
#include "inetcpl.h"
#include <windef.h>
#include <winuser.h>
#include <commctrl.h>
#include "resource.h"
#include <reactos/manifest_dll.rc>

2
reactos/dll/cpl/inetcpl/lang/He.rc
View file

@ -22,8 +22,6 @@
*
*/
#include "inetcpl.h"
#pragma code_page(65001)
LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT

2
reactos/dll/cpl/inetcpl/lang/Sr.rc
View file

@ -20,8 +20,6 @@
*
*/
#include "inetcpl.h"
#pragma code_page(65001)
LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC

2
reactos/dll/cpl/inetcpl/lang/de-DE.rc
View file

@ -19,8 +19,6 @@
*
*/
#include "inetcpl.h"
#pragma code_page(65001)
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL

2
reactos/dll/cpl/inetcpl/lang/en-US.rc
View file

@ -19,8 +19,6 @@
*
*/
#include "inetcpl.h"
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
/* "General" propsheet */

2
reactos/dll/cpl/inetcpl/lang/fr-FR.rc
View file

@ -20,8 +20,6 @@
*
*/
#include "inetcpl.h"
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
/* UTF-8 */

2
reactos/dll/cpl/inetcpl/lang/it-IT.rc
View file

@ -19,8 +19,6 @@
*
*/
#include "inetcpl.h"
/* UTF-8 */
#pragma code_page(65001)

2
reactos/dll/cpl/inetcpl/lang/ja-JP.rc
View file

@ -20,8 +20,6 @@
*
*/
#include "inetcpl.h"
/* UTF-8 */
#pragma code_page(65001)

2
reactos/dll/cpl/inetcpl/lang/ko-KR.rc
View file

@ -20,8 +20,6 @@
*
*/
#include "inetcpl.h"
#pragma code_page(65001)
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT

2
reactos/dll/cpl/inetcpl/lang/lt-LT.rc
View file

@ -19,8 +19,6 @@
*
*/
#include "inetcpl.h"
/* UTF-8 */
#pragma code_page(65001)

2
reactos/dll/cpl/inetcpl/lang/nl-NL.rc
View file

@ -19,8 +19,6 @@
*
*/
#include "inetcpl.h"
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
/* "General" propsheet */

2
reactos/dll/cpl/inetcpl/lang/pl-PL.rc
View file

@ -19,8 +19,6 @@
*
*/
#include "inetcpl.h"
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
/* UTF-8 */

2
reactos/dll/cpl/inetcpl/lang/pt-BR.rc
View file

@ -19,8 +19,6 @@
*
*/
#include "inetcpl.h"
#pragma code_page(65001)
LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN

2
reactos/dll/cpl/inetcpl/lang/ro-RO.rc
View file

@ -21,8 +21,6 @@
* CHANGE LOG: 2011-11-09 initial translation
*/
#include "inetcpl.h"
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
/* "General" propsheet */

2
reactos/dll/cpl/inetcpl/lang/ru-RU.rc
View file

@ -19,8 +19,6 @@
*
*/
#include "inetcpl.h"
/* UTF-8 */
#pragma code_page(65001)

2
reactos/dll/cpl/inetcpl/lang/sv-SE.rc
View file

@ -19,8 +19,6 @@
*
*/
#include "inetcpl.h"
#pragma code_page(65001)
LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL

2
reactos/dll/cpl/inetcpl/lang/tr-TR.rc
View file

@ -19,8 +19,6 @@
*
*/
#include "inetcpl.h"
/* UTF-8 */
#pragma code_page(65001)

2
reactos/dll/cpl/inetcpl/lang/uk-UA.rc
View file

@ -20,8 +20,6 @@
*
*/
#include "inetcpl.h"
/* UTF-8 */
#pragma code_page(65001)

52
reactos/dll/cpl/inetcpl/resource.h Normal file
View file

@ -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

24
reactos/dll/cpl/inetcpl/security.c
View file

@ -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 */