Disable sandbox.

Fix HandleDelayLoadFailureCommon breakpoint by removing Common Controls
manifest.

Author: cztomczak

cef/app.cpp

@@ -4,7 +4,6 @@
 
 #pragma comment(lib, "libcef.lib")
 #pragma comment(lib, "libcef_dll_wrapper.lib")
-#pragma comment(lib, "cef_sandbox.lib")
 
 #include "app.h"
 #include <string>

defines.h

@@ -4,10 +4,12 @@
 
 #pragma once
 
+// #define CEF_USE_SANDBOX 1
+// Currently sandbox disabled due to issue. Reported:
+// https://magpcss.org/ceforum/viewtopic.php?f=6&t=20037
+
 #define WINVER          _WIN32_WINNT_WIN10
 #define _WIN32_WINNT    _WIN32_WINNT_WIN10
-#define _WIN32_IE       _WIN32_IE_IE60SP2
-#define _RICHEDIT_VER   0x0200
 
 #define _AMD64_ 1
 

main.cpp

@@ -5,14 +5,15 @@
 #include "defines.h"
 #include <Windows.h>
 
-#pragma comment(linker, "/manifestdependency:\"type='win32' "\
-    "name='Microsoft.Windows.Common-Controls' version='6.0.0.0' "\
-    "processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' "\
-    "language='*'\"")
+#if defined(CEF_USE_SANDBOX)
+#pragma comment(lib, "cef_sandbox.lib")
+#endif
 
 #include <crtdbg.h> // _ASSERT() macro
 #include "resource.h"
 
+#include "include/cef_sandbox_win.h"
+
 #include "main_window.h"
 #include "logging.h"
 #include "executable.h"
@@ -271,10 +272,17 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
         LOGGER_WARNING << "CommandLineToArgvW() failed";
     }
 
+    // Sandbox support
+    void* sandbox_info = nullptr;
+#ifdef CEF_USE_SANDBOX
+    CefScopedSandboxInfo scoped_sandbox;
+    sandbox_info = scoped_sandbox.sandbox_info();
+#endif
+
     // CEF subprocesses.
     CefMainArgs main_args(hInstance);
     CefRefPtr<App> app(new App);
-    int exit_code = CefExecuteProcess(main_args, app.get(), NULL);
+    int exit_code = CefExecuteProcess(main_args, app.get(), sandbox_info);
     if (exit_code >= 0) {
         ShutdownLogging();
         return exit_code;
@@ -377,10 +385,15 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
         cef_settings.remote_debugging_port = remote_debugging_port;
     }
 
-    // Sandbox support
-    // cef_settings.no_sandbox = true;
+#if defined(CEF_USE_SANDBOX)
+    LOGGER_INFO << "Sandbox is enabled";
+    cef_settings.no_sandbox = false;
+#else
+    LOGGER_INFO << "Sandbox is disabled";
+    cef_settings.no_sandbox = true;
+#endif
 
-    CefInitialize(main_args, cef_settings, app.get(), NULL);
+    CefInitialize(main_args, cef_settings, app.get(), sandbox_info);
     CreateMainWindow(hInstance, nCmdShow, main_window_title);
     CefRunMessageLoop();
     CefShutdown();

phpdesktop-chrome.vcxproj

@@ -115,7 +115,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;WIN64;_WINDOWS;STRICT;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN32;_WIN64;_WINDOWS;STRICT;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>
@@ -333,17 +333,25 @@
     <ClInclude Include="window_utils.h" />
   </ItemGroup>
   <ItemGroup>
+    <None Include=".gitattributes" />
     <None Include="AUTHORS.txt" />
     <None Include="cef\README.txt" />
     <None Include="icon.ico" />
     <None Include=".gitignore" />
     <None Include="icon.png" />
+    <None Include="README.md" />
     <None Include="settings.json">
       <FileType>Document</FileType>
     </None>
+    <None Include="www\blenc_encode.php" />
+    <None Include="www\blenc_myscript.php" />
     <None Include="www\cookies.php" />
+    <None Include="www\dialogs.php" />
     <None Include="www\download.php" />
     <None Include="www\env-variables.php" />
+    <None Include="www\error-404.php" />
+    <None Include="www\error-500.php" />
+    <None Include="www\execute-command.php" />
     <None Include="www\forms.php" />
     <None Include="www\google.php" />
     <None Include="www\html5-video.php" />
@@ -352,16 +360,24 @@
     <None Include="license.txt" />
     <None Include="www\javascript-api.php" />
     <None Include="www\loading-error.php" />
+    <None Include="www\mouse-cursor-loading.php" />
     <None Include="www\no-cache.php" />
+    <None Include="www\ob-flush.php" />
+    <None Include="www\open-folder-in-explorer.php" />
+    <None Include="www\php-error.php" />
     <None Include="www\phpinfo.php" />
     <None Include="resource.aps" />
     <None Include="www\chrome-version.php" />
     <None Include="www\popup.php" />
+    <None Include="www\pretty-urls.php" />
+    <None Include="www\request-quota.php" />
     <None Include="www\session.php" />
     <None Include="www\speech-recognition.php" />
     <None Include="www\sqlite.php" />
+    <None Include="www\style.css" />
     <None Include="www\temp-dir.php" />
     <None Include="www\upload.php" />
+    <None Include="www\window-close.php" />
     <None Include="www\_pdo.php" />
   </ItemGroup>
   <ItemGroup>

resource.rc

@@ -14,17 +14,17 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE
+1 TEXTINCLUDE 
 BEGIN
     "resource.h\0"
 END
 
-2 TEXTINCLUDE
+2 TEXTINCLUDE 
 BEGIN
     "\0"
 END
 
-3 TEXTINCLUDE
+3 TEXTINCLUDE 
 BEGIN
     "\0"
 END
@@ -41,14 +41,15 @@ END
 // remains consistent on all systems.
 IDR_MAINWINDOW          ICON                    "icon.ico"
 
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 57,0,0,0
- PRODUCTVERSION 57,0,0,0
+ FILEVERSION 130,0,0,0
+ PRODUCTVERSION 130,0,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -65,12 +66,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "PHP Desktop"
             VALUE "FileDescription", "PHP Desktop Chrome"
-            VALUE "FileVersion", "57.0.0.0"
+            VALUE "FileVersion", "130.0.0.0"
             VALUE "InternalName", "phpdesktop"
             VALUE "LegalCopyright", "(c) Czarek Tomczak 2012"
             VALUE "OriginalFilename", "phpdesktop-chrome.exe"
             VALUE "ProductName", "PHP Desktop Chrome"
-            VALUE "ProductVersion", "57.0.0.0"
+            VALUE "ProductVersion", "130.0.0.0"
         END
     END
     BLOCK "VarFileInfo"