https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1e79d3bbbe10f76d7c2737...
commit 1e79d3bbbe10f76d7c27371beb0722c2be3ebd4d Author: Amine Khaldi amine.khaldi@reactos.org AuthorDate: Sun Apr 1 13:08:41 2018 +0100 Commit: Amine Khaldi amine.khaldi@reactos.org CommitDate: Sun Apr 1 13:08:41 2018 +0100
[IEXPLORE] Sync with Wine Staging 3.3. CORE-14434 --- base/applications/iexplore/iexplore.inf | 8 ++++++-- base/applications/iexplore/main.c | 23 +++++------------------ media/doc/README.WINE | 2 +- 3 files changed, 12 insertions(+), 21 deletions(-)
diff --git a/base/applications/iexplore/iexplore.inf b/base/applications/iexplore/iexplore.inf index 95340ba79a..5e059669d0 100644 --- a/base/applications/iexplore/iexplore.inf +++ b/base/applications/iexplore/iexplore.inf @@ -22,13 +22,16 @@ HKCR,"CLSID%CLSID_Internet%\Shell\OpenHomePage",,,"Open &Home Page" HKCR,"CLSID%CLSID_Internet%\Shell\OpenHomePage\Command",,,"""%16422%\Internet Explorer\iexplore.exe""" HKCR,"CLSID%CLSID_Internet%\ShellFolder",,2,"0x24"
+HKCR,"CLSID%CLSID_InternetExplorerManager%\LocalServer32",,,"""%16422%\Internet Explorer\iexplore.exe"" -startmanager" + + [Settings.Reg] HKCU,"Software\Microsoft\Internet Explorer\Main","ShowGoButton",2,"yes" -#HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",2,"http://www.winehq.org" +#HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",2,"https://www.winehq.org" HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",2,"http://www.reactos.org" HKCU,"Software\Microsoft\Internet Explorer\Main","Search Page",2,"http://www.google.com" HKCU,"Software\Microsoft\Internet Explorer\Settings","Text Color",2,"0,0,0" -#HKLM,"Software\Microsoft\Internet Explorer\Main","Default_Page_URL",2,"http://www.winehq.org" +#HKLM,"Software\Microsoft\Internet Explorer\Main","Default_Page_URL",2,"https://www.winehq.org" HKLM,"Software\Microsoft\Internet Explorer\Main","Default_Page_URL",2,"http://www.reactos.org" HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe",,,"%16422%\Internet Explorer\iexplore.exe" HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe","Path",,"%16422%\Internet Explorer;" @@ -43,3 +46,4 @@ HKLM,"Software\Microsoft\Internet Explorer","W2kVersion",,"8.0.6001.18702" [Strings] CLSID_InternetExplorer="{0002df01-0000-0000-c000-000000000046}" CLSID_Internet="{871c5380-42a0-1069-a2ea-08002b30309d}" +CLSID_InternetExplorerManager="{df4fcc34-067a-4e0a-8352-4a1a5095346e}" diff --git a/base/applications/iexplore/main.c b/base/applications/iexplore/main.c index 4b76ce3eda..b881443810 100644 --- a/base/applications/iexplore/main.c +++ b/base/applications/iexplore/main.c @@ -18,26 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-//#include <windows.h> - -#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <winreg.h> -#include <winver.h> - +#include <windows.h> #include <advpub.h> -//#include <ole2.h> -//#include <rpcproxy.h> +#include <ole2.h> +#include <rpcproxy.h>
-#include <wine/unicode.h> -#include <wine/debug.h> +#include "wine/unicode.h" +#include "wine/debug.h"
extern DWORD WINAPI IEWinMain(const WCHAR*, int);
diff --git a/media/doc/README.WINE b/media/doc/README.WINE index c0ddf543e1..492d022c16 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -235,7 +235,7 @@ reactos/base/applications/cmdutils/wscript # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-3.3 reactos/base/applications/games/winmine # Synced to WineStaging-2.16 with our own resources. reactos/base/applications/extrac32 # Synced to WineStaging-3.3 -reactos/base/applications/iexplore # Synced to WineStaging-2.9 +reactos/base/applications/iexplore # Synced to WineStaging-3.3 reactos/base/applications/notepad # Forked at Wine-20041201 reactos/base/applications/regedit # Out of sync reactos/base/applications/winhlp32 # Synced to Wine-3.0
-
Amine Khaldi