25 Mar
2018
25 Mar
'18
11:46 a.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=88d3620955dd110687cc0…
commit 88d3620955dd110687cc0e718ba164e2e6f86c29
Author: Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Sun Mar 25 12:46:20 2018 +0100
Commit: Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Sun Mar 25 12:46:20 2018 +0100
[INETCPL] Sync with Wine Staging 3.3. CORE-14434
---
dll/cpl/inetcpl/CMakeLists.txt | 4 +-
dll/cpl/inetcpl/content.c | 9 ++++-
dll/cpl/inetcpl/general.c | 14 ++++++-
dll/cpl/inetcpl/inetcpl.c | 18 ++++++++-
dll/cpl/inetcpl/inetcpl.h | 86 +++++++++++++++++++++++++-----------------
dll/cpl/inetcpl/inetcpl.rc | 7 +---
dll/cpl/inetcpl/precomp.h | 27 +++++++++++++
dll/cpl/inetcpl/resource.h | 57 ----------------------------
dll/cpl/inetcpl/security.c | 20 ++++++++++
media/doc/README.WINE | 2 +-
10 files changed, 141 insertions(+), 103 deletions(-)
diff --git a/dll/cpl/inetcpl/CMakeLists.txt b/dll/cpl/inetcpl/CMakeLists.txt
index dc7de0aaaa..dfdd6b8638 100644
--- a/dll/cpl/inetcpl/CMakeLists.txt
+++ b/dll/cpl/inetcpl/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
content.c
general.c
security.c
- inetcpl.h)
+ precomp.h)
file(GLOB inetcpl_rc_deps resources/*.*)
add_rc_deps(inetcpl.rc ${inetcpl_rc_deps})
@@ -22,5 +22,5 @@ set_module_type(inetcpl cpl UNICODE)
target_link_libraries(inetcpl wine)
add_delay_importlibs(inetcpl cryptui wininet ole32 urlmon shell32)
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)
diff --git a/dll/cpl/inetcpl/content.c b/dll/cpl/inetcpl/content.c
index f4588e759e..d71c8b2326 100644
--- a/dll/cpl/inetcpl/content.c
+++ b/dll/cpl/inetcpl/content.c
@@ -19,9 +19,16 @@
*
*/
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winuser.h>
+#include <cryptuiapi.h>
+
#include "inetcpl.h"
+#include "wine/debug.h"
-#include <cryptuiapi.h>
+WINE_DEFAULT_DEBUG_CHANNEL(inetcpl);
/*********************************************************************
* display_cert_manager (internal)
diff --git a/dll/cpl/inetcpl/general.c b/dll/cpl/inetcpl/general.c
index 66e614e7de..e0f473caf7 100644
--- a/dll/cpl/inetcpl/general.c
+++ b/dll/cpl/inetcpl/general.c
@@ -19,11 +19,21 @@
*
*/
-#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 default_page[] =
{'D','e','f','a','u','l','t','_','P','a','g','e','_','U','R','L',0};
diff --git a/dll/cpl/inetcpl/inetcpl.c b/dll/cpl/inetcpl/inetcpl.c
index 0410e3f177..578867a892 100644
--- a/dll/cpl/inetcpl/inetcpl.c
+++ b/dll/cpl/inetcpl/inetcpl.c
@@ -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 <cpl.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(inetcpl);
DECLSPEC_HIDDEN HMODULE hcpl;
diff --git a/dll/cpl/inetcpl/inetcpl.h b/dll/cpl/inetcpl/inetcpl.h
index dabadef5e7..b01362bdc6 100644
--- a/dll/cpl/inetcpl/inetcpl.h
+++ b/dll/cpl/inetcpl/inetcpl.h
@@ -22,53 +22,71 @@
#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;
INT_PTR CALLBACK general_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN;
INT_PTR CALLBACK security_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN;
-/* ## Memory allocation functions ## */
+#define NUM_PROPERTY_PAGES 8
-static inline void * __WINE_ALLOC_SIZE(1) heap_alloc( size_t len )
-{
- return HeapAlloc( GetProcessHeap(), 0, len );
-}
+/* icons */
+#define ICO_MAIN 100
+#define ICO_INTERNET 1313
+#ifdef __REACTOS__
+#define ICO_CERTIFICATES 1314
+#define ICO_HISTORY 1315
+#define ICO_HOME 1316
+#endif
-static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero( size_t len )
-{
- return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len );
-}
+/* 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
-static inline BOOL heap_free( void *mem )
-{
- return HeapFree( GetProcessHeap(), 0, mem );
-}
+/* 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 NUM_PROPERTY_PAGES 8
+#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
-#include "resource.h"
+#define IDD_CONTENT 4000
+#define IDC_CERT 4100
+#define IDC_CERT_PUBLISHER 4101
-#endif /* __WINE_INETCPL__ */
+#endif
diff --git a/dll/cpl/inetcpl/inetcpl.rc b/dll/cpl/inetcpl/inetcpl.rc
index 687b15cce2..aeeb9fbcae 100644
--- a/dll/cpl/inetcpl/inetcpl.rc
+++ b/dll/cpl/inetcpl/inetcpl.rc
@@ -19,11 +19,8 @@
*
*/
-#include <windef.h>
-#include <winuser.h>
-#include <commctrl.h>
+#include "inetcpl.h"
-#include "resource.h"
#include <reactos/manifest_hosted.rc>
@@ -108,7 +105,7 @@
#define WINE_PRODUCTVERSION_STR "8.00.6001.18939"
#include "wine/wine_common_ver.rc"
-
+
/* @makedep: inetcpl.ico */
ICO_MAIN ICON "resources/inetcpl.ico"
ICO_INTERNET ICON "resources/inetcpl.ico"
diff --git a/dll/cpl/inetcpl/precomp.h b/dll/cpl/inetcpl/precomp.h
new file mode 100644
index 0000000000..8faa56fac9
--- /dev/null
+++ b/dll/cpl/inetcpl/precomp.h
@@ -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_ */
diff --git a/dll/cpl/inetcpl/resource.h b/dll/cpl/inetcpl/resource.h
deleted file mode 100644
index 7b0b45f8c7..0000000000
--- a/dll/cpl/inetcpl/resource.h
+++ /dev/null
@@ -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
diff --git a/dll/cpl/inetcpl/security.c b/dll/cpl/inetcpl/security.c
index 20f5a1955c..543ada433d 100644
--- a/dll/cpl/inetcpl/security.c
+++ b/dll/cpl/inetcpl/security.c
@@ -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 "wine/debug.h"
+#include "wine/heap.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(inetcpl);
typedef struct secdlg_data_s {
HWND hsec; /* security propsheet */
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 62f294ee1f..c8603c6a80 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -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/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)
2422
days inactive
2422
days old
0 comments
1 participants
participants (1)
-
Amine Khaldi