mirror of
https://github.com/reactos/reactos.git
synced 2024-07-01 10:20:03 +00:00
[INETCPL] Sync with Wine Staging 3.3. CORE-14434
This commit is contained in:
parent
79a9b9f874
commit
88d3620955
|
@ -7,7 +7,7 @@ list(APPEND SOURCE
|
||||||
content.c
|
content.c
|
||||||
general.c
|
general.c
|
||||||
security.c
|
security.c
|
||||||
inetcpl.h)
|
precomp.h)
|
||||||
|
|
||||||
file(GLOB inetcpl_rc_deps resources/*.*)
|
file(GLOB inetcpl_rc_deps resources/*.*)
|
||||||
add_rc_deps(inetcpl.rc ${inetcpl_rc_deps})
|
add_rc_deps(inetcpl.rc ${inetcpl_rc_deps})
|
||||||
|
@ -22,5 +22,5 @@ set_module_type(inetcpl cpl UNICODE)
|
||||||
target_link_libraries(inetcpl wine)
|
target_link_libraries(inetcpl wine)
|
||||||
add_delay_importlibs(inetcpl cryptui wininet ole32 urlmon shell32)
|
add_delay_importlibs(inetcpl cryptui wininet ole32 urlmon shell32)
|
||||||
add_importlibs(inetcpl advapi32 comctl32 user32 shlwapi msvcrt kernel32 ntdll)
|
add_importlibs(inetcpl advapi32 comctl32 user32 shlwapi msvcrt kernel32 ntdll)
|
||||||
add_pch(inetcpl inetcpl.h SOURCE)
|
add_pch(inetcpl precomp.h SOURCE)
|
||||||
add_cd_file(TARGET inetcpl DESTINATION reactos/system32 FOR all)
|
add_cd_file(TARGET inetcpl DESTINATION reactos/system32 FOR all)
|
||||||
|
|
|
@ -19,10 +19,17 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "inetcpl.h"
|
#include <stdarg.h>
|
||||||
|
#include <windef.h>
|
||||||
|
#include <winbase.h>
|
||||||
|
#include <winuser.h>
|
||||||
#include <cryptuiapi.h>
|
#include <cryptuiapi.h>
|
||||||
|
|
||||||
|
#include "inetcpl.h"
|
||||||
|
#include "wine/debug.h"
|
||||||
|
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(inetcpl);
|
||||||
|
|
||||||
/*********************************************************************
|
/*********************************************************************
|
||||||
* display_cert_manager (internal)
|
* display_cert_manager (internal)
|
||||||
*
|
*
|
||||||
|
|
|
@ -19,11 +19,21 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "inetcpl.h"
|
#include <stdarg.h>
|
||||||
|
#include <windef.h>
|
||||||
|
#include <winbase.h>
|
||||||
|
#include <winuser.h>
|
||||||
#include <wininet.h>
|
#include <wininet.h>
|
||||||
|
#include <winreg.h>
|
||||||
|
#include <shlwapi.h>
|
||||||
|
#include <prsht.h>
|
||||||
#include <shlobj.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 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 start_page[] = {'S','t','a','r','t',' ','P','a','g','e',0};
|
||||||
static const WCHAR default_page[] = {'D','e','f','a','u','l','t','_','P','a','g','e','_','U','R','L',0};
|
static const WCHAR default_page[] = {'D','e','f','a','u','l','t','_','P','a','g','e','_','U','R','L',0};
|
||||||
|
|
|
@ -19,9 +19,25 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#define NONAMELESSUNION
|
||||||
|
#define COBJMACROS
|
||||||
|
#define CONST_VTABLE
|
||||||
|
|
||||||
|
#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"
|
#include "inetcpl.h"
|
||||||
|
|
||||||
#include <cpl.h>
|
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(inetcpl);
|
||||||
|
|
||||||
DECLSPEC_HIDDEN HMODULE hcpl;
|
DECLSPEC_HIDDEN HMODULE hcpl;
|
||||||
|
|
||||||
|
|
|
@ -22,53 +22,71 @@
|
||||||
#ifndef __WINE_INETCPL__
|
#ifndef __WINE_INETCPL__
|
||||||
#define __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 <windef.h>
|
||||||
#include <winbase.h>
|
|
||||||
#include <winuser.h>
|
#include <winuser.h>
|
||||||
#include <winreg.h>
|
|
||||||
#include <ole2.h>
|
|
||||||
#include <commctrl.h>
|
#include <commctrl.h>
|
||||||
#include <shlwapi.h>
|
|
||||||
|
|
||||||
#include <wine/debug.h>
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(inetcpl);
|
|
||||||
|
|
||||||
extern HMODULE hcpl;
|
extern HMODULE hcpl;
|
||||||
INT_PTR CALLBACK content_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN;
|
INT_PTR CALLBACK content_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN;
|
||||||
INT_PTR CALLBACK general_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN;
|
INT_PTR CALLBACK general_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN;
|
||||||
INT_PTR CALLBACK security_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN;
|
INT_PTR CALLBACK security_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN;
|
||||||
|
|
||||||
/* ## Memory allocation functions ## */
|
|
||||||
|
|
||||||
static inline void * __WINE_ALLOC_SIZE(1) heap_alloc( size_t len )
|
|
||||||
{
|
|
||||||
return HeapAlloc( GetProcessHeap(), 0, len );
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero( size_t len )
|
|
||||||
{
|
|
||||||
return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len );
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline BOOL heap_free( void *mem )
|
|
||||||
{
|
|
||||||
return HeapFree( GetProcessHeap(), 0, mem );
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ######### */
|
|
||||||
|
|
||||||
#define NUM_PROPERTY_PAGES 8
|
#define NUM_PROPERTY_PAGES 8
|
||||||
|
|
||||||
#include "resource.h"
|
/* icons */
|
||||||
|
#define ICO_MAIN 100
|
||||||
|
#define ICO_INTERNET 1313
|
||||||
|
#ifdef __REACTOS__
|
||||||
|
#define ICO_CERTIFICATES 1314
|
||||||
|
#define ICO_HISTORY 1315
|
||||||
|
#define ICO_HOME 1316
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /* __WINE_INETCPL__ */
|
/* 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
|
||||||
|
|
|
@ -19,11 +19,8 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <windef.h>
|
#include "inetcpl.h"
|
||||||
#include <winuser.h>
|
|
||||||
#include <commctrl.h>
|
|
||||||
|
|
||||||
#include "resource.h"
|
|
||||||
|
|
||||||
#include <reactos/manifest_hosted.rc>
|
#include <reactos/manifest_hosted.rc>
|
||||||
|
|
||||||
|
@ -108,7 +105,7 @@
|
||||||
#define WINE_PRODUCTVERSION_STR "8.00.6001.18939"
|
#define WINE_PRODUCTVERSION_STR "8.00.6001.18939"
|
||||||
|
|
||||||
#include "wine/wine_common_ver.rc"
|
#include "wine/wine_common_ver.rc"
|
||||||
|
|
||||||
/* @makedep: inetcpl.ico */
|
/* @makedep: inetcpl.ico */
|
||||||
ICO_MAIN ICON "resources/inetcpl.ico"
|
ICO_MAIN ICON "resources/inetcpl.ico"
|
||||||
ICO_INTERNET ICON "resources/inetcpl.ico"
|
ICO_INTERNET ICON "resources/inetcpl.ico"
|
||||||
|
|
27
dll/cpl/inetcpl/precomp.h
Normal file
27
dll/cpl/inetcpl/precomp.h
Normal file
|
@ -0,0 +1,27 @@
|
||||||
|
|
||||||
|
#ifndef _INETCPL_PRECOMP_H_
|
||||||
|
#define _INETCPL_PRECOMP_H_
|
||||||
|
|
||||||
|
#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>
|
||||||
|
|
||||||
|
#include "inetcpl.h"
|
||||||
|
|
||||||
|
#endif /* !_INETCPL_PRECOMP_H_ */
|
|
@ -1,57 +0,0 @@
|
||||||
#pragma once
|
|
||||||
|
|
||||||
/* icons */
|
|
||||||
#define ICO_MAIN 100
|
|
||||||
#define ICO_RESTRICTED 4481
|
|
||||||
#define ICO_TRUSTED 4480
|
|
||||||
#define ICO_INTERNET 1313
|
|
||||||
#define ICO_CERTIFICATES 1314
|
|
||||||
#define ICO_HISTORY 1315
|
|
||||||
#define ICO_HOME 1316
|
|
||||||
|
|
||||||
/* 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
|
|
|
@ -19,7 +19,27 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#define COBJMACROS
|
||||||
|
#define CONST_VTABLE
|
||||||
|
|
||||||
|
#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 "inetcpl.h"
|
||||||
|
#include "wine/debug.h"
|
||||||
|
#include "wine/heap.h"
|
||||||
|
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(inetcpl);
|
||||||
|
|
||||||
typedef struct secdlg_data_s {
|
typedef struct secdlg_data_s {
|
||||||
HWND hsec; /* security propsheet */
|
HWND hsec; /* security propsheet */
|
||||||
|
|
|
@ -220,7 +220,7 @@ reactos/dll/win32/xinput1_3 # Synced to WineStaging-2.9
|
||||||
reactos/dll/win32/xinput9_1_0 # Synced to WineStaging-2.9
|
reactos/dll/win32/xinput9_1_0 # Synced to WineStaging-2.9
|
||||||
reactos/dll/win32/xmllite # Synced to WineStaging-3.3
|
reactos/dll/win32/xmllite # Synced to WineStaging-3.3
|
||||||
|
|
||||||
reactos/dll/cpl/inetcpl # Synced to WineStaging-2.9
|
reactos/dll/cpl/inetcpl # Synced to WineStaging-3.3
|
||||||
|
|
||||||
reactos/win32ss/printing/monitors/localmon/ui/ # Synced to WineStaging-2.9 (known there as /dll/win32/localui)
|
reactos/win32ss/printing/monitors/localmon/ui/ # Synced to WineStaging-2.9 (known there as /dll/win32/localui)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue