Commit 4b454f06 authored by Callum Linden's avatar Callum Linden

Source drop of Dullahan 1.3.2.XXXXX (new Dullahan version scheme with 3rd...

Source drop of Dullahan 1.3.2.XXXXX (new Dullahan version scheme with 3rd number for point release. Also add support for a setting to 'disable network services' as per CEF forum for macOS popup at launch)

--HG--
branch : vendor
parent 3cfcb534
......@@ -128,6 +128,7 @@ void app::init_dullahan()
settings.cache_path = ".\\webcube_cache";
settings.cookies_enabled = true;
settings.disable_gpu = false;
settings.disable_network_service = false;
settings.disable_web_security = false;
settings.file_access_from_file_urls = false;
settings.flash_enabled = false;
......
......@@ -152,6 +152,7 @@ class dullahan
bool disable_gpu = true; // disable GPU and GPU compositing
bool file_access_from_file_urls = false; // allow access files from local file system
bool disable_web_security = false; // like adding --disable-web-security to Chrome command line
bool disable_network_service = false; // like adding --disable-features=NetworkService to Chrome command line
bool autoplay_without_gesture = false; // like adding --autoplay-policy=???? to Chrome command line
bool flash_enabled = true; // system flash plugin
bool force_wave_audio = false; // forces Windows WaveOut/In audio
......
......@@ -53,6 +53,7 @@ dullahan_impl::dullahan_impl() :
mForceWaveAudio(false),
mDisableGPU(true),
mDisableWebSecurity(false),
mDisableNetworkService(false),
mAutoPlayWithoutGesture(false),
mFlipPixelsY(false),
mFlipMouseY(false),
......@@ -105,6 +106,11 @@ void dullahan_impl::OnBeforeCommandLineProcessing(const CefString& process_type,
command_line->AppendSwitch("--disable-web-security");
}
if (mDisableNetworkService)
{
command_line->AppendSwitch("--disable-features=NetworkService");
}
if (mAutoPlayWithoutGesture)
{
command_line->AppendSwitchWithValue("autoplay-policy", "no-user-gesture-required");
......@@ -212,6 +218,12 @@ bool dullahan_impl::init(dullahan::dullahan_settings& user_settings)
// needing a web server.
mDisableWebSecurity = user_settings.disable_web_security;
// this flag if set, adds a command line parameter that disables "network service" and
// is like adding --disable-features=NetworkService. This appears to be required after
// Chrome 75 to disable the "Chrome wants access to passwords" dialog on macOS that
// started to appear. May change later.
mDisableNetworkService = user_settings.disable_network_service;
// this flag, if set, allows video/audio to autoplay if the URL parameters are configured
// correctly to do so. (by default as of Chrome 70, audio/video does not autoplay)
mAutoPlayWithoutGesture = user_settings.autoplay_without_gesture;
......@@ -879,6 +891,8 @@ const std::string dullahan_impl::dullahan_version(bool show_bitwidth)
s << ".";
s << DULLAHAN_VERSION_MINOR;
s << ".";
s << DULLAHAN_VERSION_POINT;
s << ".";
s << DULLAHAN_VERSION_BUILD;
return append_bitwidth_string(s, show_bitwidth);
......
......@@ -148,6 +148,7 @@ class dullahan_impl :
bool mForceWaveAudio;
bool mDisableGPU;
bool mDisableWebSecurity;
bool mDisableNetworkService;
bool mAutoPlayWithoutGesture;
bool mFlipPixelsY;
bool mFlipMouseY;
......
......@@ -38,6 +38,7 @@
// version of this package
#define DULLAHAN_VERSION_MAJOR 1
#define DULLAHAN_VERSION_MINOR 3
#define DULLAHAN_VERSION_POINT 2
// The build version number as of v1.2 is now the date/time the build was made
// It is only regenerated if the constructed version header (dullahan_version.h)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment