From 03f4bdac66f00abfd6c220b1bb9734f1f6229168 Mon Sep 17 00:00:00 2001 From: henrypp Date: Thu, 12 Jan 2017 21:27:09 +0600 Subject: [PATCH] 2.0 --- CHANGELOG.md | 16 +++++- LICENSE | 2 +- README.md | 99 +++++++++++++++++++++++--------------- bin/History.txt | 14 ++++++ bin/License.txt | 2 +- bin/Readme.txt | 94 +++++++++++++++++++++++------------- bin/SetDefaultBrowser.bat | 2 +- bin/chrlauncher.ini | 69 ++++++++++++++++---------- chrlauncher.vcxproj | 8 +-- src/main.cpp | Bin 34864 -> 45734 bytes src/main.h | Bin 1612 -> 2410 bytes src/resource.h | 26 ++++++---- src/resource.rc | Bin 5720 -> 6292 bytes 13 files changed, 217 insertions(+), 115 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d469e1e..62d53a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,20 @@ +v2.0 (12 January 2017) +* now download and install update is working in background ++ added tray icon and show it when new version found ++ added download control option ++ added "ChromiumBinary" option to set custom Chromium binary file name +- increased download buffer size +- fixed run Chromium when directory contain spaces +- fixed race conditions on download +- fixed relative/environment path generation +- fixed open links if chrlauncher set as default browser +- removed PPAPI from package +- updated readme +- code cleanup + v1.9.4 (16 September 2016) -- fixed localization (issue #32) + output debug strings on silent mode +- fixed localization (issue #32) v1.9.3 (15 September 2016) + command line arguments diff --git a/LICENSE b/LICENSE index 4457f9e..0e97fb7 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2016, Henry++. +Copyright (c) 2015-2017, Henry++. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/README.md b/README.md index 223e4d9..e414159 100644 --- a/README.md +++ b/README.md @@ -4,75 +4,98 @@ Small and very fast portable launcher and updater for Chromium. -``` -To set as default internet browser run SetDefaultBrowser.bat (as admin). -``` +#### Default browser: +chrlauncher has feature to use portable Chromium as default browser and it will be open links from another programs through chrlauncher. +- start "SetDefaultBrowser.bat" (as admin). +- start "Control panel" -> "Default programs" -> "Set your default programs" -> "chrlauncher" and set all checkboxes on. -#### Command line +#### Command line: +There is list of arguments overrides .ini options ``` -/f - forced update checking -/q - no error messages visible (quiet) +/a - auto download new version of Chromium if present +/b - bring chrlauncher to front on download started +/f - force update checking +/q - no error messages will be shown (quiet) ``` -#### Supported browser +#### Supported browser: - Launcher - Chromium and their clones (like Google Chrome, Yandex Browser and other legitimate trojans!). - Updater - Chromium only. -#### Folder structure -- \bin - binaries directory. -- \profile - profile directory. +#### Flash Player: +chrlauncher has feature for use portable Flash Player PPAPI. +- download portable Flash Player PPAPI 32-bit/64-bit: http://effect8.ru/soft/media/adobe-flash-player-portable.html +- unpack archive to the "Plugins" folder. +- open "chrlauncher.ini" and find "FlashPlayerPath" option and then set ".\Plugins\%flash_player_dll_name_here%" -#### Settings +#### Settings: ~~~ [chrlauncher] -# Command line for Chromium: -# -# See here: -# http://peter.sh/experiments/chromium-command-line-switches/ -# +# Command line for Chromium (string): +# See here: http://peter.sh/experiments/chromium-command-line-switches/ ChromiumCommandLine=--user-data-dir=..\profile --no-default-browser-check --allow-outdated-plugins --disable-component-update -# Chromium binaries directory: -# +# Chromium binaries directory (string): ChromiumDirectory=.\bin -# Adobe Flash Player PPAPI DLL path: -# -# See here: -# http://effect8.ru/soft/media/adobe-flash-player-portable.html -# +# Chromium binary file name (string): +ChromiumBinary=chrome.exe + +# Adobe Flash Player PPAPI portable library path (string): +# Download here: http://effect8.ru/soft/media/adobe-flash-player-portable.html FlashPlayerPath=.\plugins\pepflashplayer.dll -# Set Chromium binaries architecture: +# Set Chromium binaries architecture (integer): # # 0 -> autodetect (default) # 64 -> 64-bit # 32 -> 32-bit -# ChromiumArchitecture=0 -# Type of Chromium builds: +# Auto download updates if founded (boolean) # -# dev-official -> official development builds from snapshots repository (default) -# dev-codecs-sync -> unofficial development builds with codecs from "github.com/henrypp/chromium" -# stable-codecs-sync -> unofficial stable builds with codecs from "github.com/henrypp/chromium" -# dev-codecs-nosync -> unofficial development builds with codecs and without the profile button from "github.com/henrypp/chromium" -# stable-codecs-nosync -> unofficial stable builds with codecs and without the profile button from "github.com/henrypp/chromium" +# false -> show tray tip if update found, downloading manually (default) +# true -> auto download update and install it! +ChromiumAutoDownload=falseboolean + +# Bring chrlauncher window when download started (boolean) +# +# false -> don't bring main window to front automatically (default) +# true -> bring chrlauncher window to front when download started +ChromiumBringToFront=false + +# Set error mode (boolean): +# +# false -> show warning messages (default) +# true -> no error messages will be shown +ChromiumIsSilent=false + +# Type of Chromium builds: # +# dev-official -> official development builds from snapshots repository "commondatastorage.googleapis.com/chromium-browser-snapshots/index.html" +# dev-codecs-sync -> unofficial development builds with codecs from "github.com/henrypp/chromium/releases" (default) +# stable-codecs-sync -> unofficial stable builds with codecs from "github.com/henrypp/chromium/releases" +# dev-codecs-nosync -> unofficial development builds with codecs and without the profile button from "github.com/henrypp/chromium/releases" +# stable-codecs-nosync -> unofficial stable builds with codecs and without the profile button from "github.com/henrypp/chromium/releases" ChromiumType=dev-codecs-sync -# Check for new Chromium version once in X days: +# Check for new Chromium version once in X days (integer): # +# 1 -> check updates once in a 1 day (default) # 0 -> disable update checking -# 1 -> once in day (default) -# +# -1 -> force update checking ChromiumCheckPeriod=1 -# Last update checking timestamp: -# -ChromiumCheckPeriodLast=0 +# Last cached founded build date of Chromium in unix-time format(integer): +ChromiumLastBuild=0 + +# Last cached update checking timestamp (integer): +ChromiumLastCheck=0 + +# Last cached founded version of Chromium (string): +ChromiumLastVersion= ~~~ Website: www.henrypp.org
Support: support@henrypp.org

-(c) 2016 Henry++ +(c) 2015-2017 Henry++ diff --git a/bin/History.txt b/bin/History.txt index bd0484a..b114d95 100644 --- a/bin/History.txt +++ b/bin/History.txt @@ -1,3 +1,17 @@ +v2.0 (12 January 2017) +* now download and install update is working in background ++ added tray icon and show it when new version found ++ added download control option ++ added "ChromiumBinary" option to set custom Chromium binary file name +- increased download buffer size +- fixed run Chromium when directory contain spaces +- fixed race conditions on download +- fixed relative/environment path generation +- fixed open links if chrlauncher set as default browser +- removed PPAPI from package +- updated readme +- code cleanup + v1.9.4 (16 September 2016) + output debug strings on silent mode - fixed localization (issue #32) diff --git a/bin/License.txt b/bin/License.txt index 7b1f2fd..3a484c4 100644 --- a/bin/License.txt +++ b/bin/License.txt @@ -1,4 +1,4 @@ -Copyright (c) 2016, Henry++. +Copyright (c) 2015-2017, Henry++. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/bin/Readme.txt b/bin/Readme.txt index 9b5e114..2f923fc 100644 --- a/bin/Readme.txt +++ b/bin/Readme.txt @@ -1,71 +1,97 @@ chrlauncher Small and very fast portable launcher and updater for Chromium. -To set as default internet browser run SetDefaultBrowser.bat (as admin). + +Default browser: +chrlauncher has feature to use portable Chromium as default browser and it will be open links from another programs through chrlauncher. +- start "SetDefaultBrowser.bat" (as admin). +- start "Control panel" -> "Default programs" -> "Set your default programs" -> "chrlauncher" and set all checkboxes on. Command line: -/f - forced update checking -/q - no error messages visible (quiet) +There is list of arguments overrides .ini options. +/a - auto download new version of Chromium if present +/b - bring chrlauncher to front on download started +/f - force update checking +/q - no error messages will be shown (quiet) Supported browser: - Launcher - Chromium and their clones (like Google Chrome, Yandex Browser and other legitimate trojans!). - Updater - Chromium only. -Folder structure: -- \bin - binaries directory. -- \profile - profile directory. +Flash Player: +chrlauncher has feature for use portable Flash Player PPAPI. +- download portable Flash Player PPAPI 32-bit/64-bit: http://effect8.ru/soft/media/adobe-flash-player-portable.html +- unpack archive to the "Plugins" folder. +- open "chrlauncher.ini" and find "FlashPlayerPath" option and then set ".\Plugins\%flash_player_dll_name_here%" Settings: [chrlauncher] -# Command line for Chromium: -# -# See here: -# http://peter.sh/experiments/chromium-command-line-switches/ -# +# Command line for Chromium (string): +# See here: http://peter.sh/experiments/chromium-command-line-switches/ ChromiumCommandLine=--user-data-dir=..\profile --no-default-browser-check --allow-outdated-plugins --disable-component-update -# Chromium binaries directory: -# +# Chromium binaries directory (string): ChromiumDirectory=.\bin -# Adobe Flash Player PPAPI DLL path: -# -# See here: -# http://effect8.ru/soft/media/adobe-flash-player-portable.html -# +# Chromium binary file name (string): +ChromiumBinary=chrome.exe + +# Adobe Flash Player PPAPI portable library path (string): +# Download here: http://effect8.ru/soft/media/adobe-flash-player-portable.html FlashPlayerPath=.\plugins\pepflashplayer.dll -# Set Chromium binaries architecture: +# Set Chromium binaries architecture (integer): # # 0 -> autodetect (default) # 64 -> 64-bit # 32 -> 32-bit -# ChromiumArchitecture=0 -# Type of Chromium builds: +# Auto download updates if founded (boolean) # -# dev-official -> official development builds from snapshots repository (default) -# dev-codecs-sync -> unofficial development builds with codecs from "github.com/henrypp/chromium" -# stable-codecs-sync -> unofficial stable builds with codecs from "github.com/henrypp/chromium" -# dev-codecs-nosync -> unofficial development builds with codecs and without the profile button from "github.com/henrypp/chromium" -# stable-codecs-nosync -> unofficial stable builds with codecs and without the profile button from "github.com/henrypp/chromium" +# false -> show tray tip if update found, downloading manually (default) +# true -> auto download update and install it! +ChromiumAutoDownload=falseboolean + +# Bring chrlauncher window when download started (boolean) # -ChromiumType=dev-official +# false -> don't bring main window to front automatically (default) +# true -> bring chrlauncher window to front when download started +ChromiumBringToFront=false -# Check for new Chromium version once in X days: +# Set error mode (boolean): # -# 0 -> disable update checking -# 1 -> once in day (default) +# false -> show warning messages (default) +# true -> no error messages will be shown +ChromiumIsSilent=false + +# Type of Chromium builds: # -ChromiumCheckPeriod=1 +# dev-official -> official development builds from snapshots repository "commondatastorage.googleapis.com/chromium-browser-snapshots/index.html" +# dev-codecs-sync -> unofficial development builds with codecs from "github.com/henrypp/chromium/releases" (default) +# stable-codecs-sync -> unofficial stable builds with codecs from "github.com/henrypp/chromium/releases" +# dev-codecs-nosync -> unofficial development builds with codecs and without the profile button from "github.com/henrypp/chromium/releases" +# stable-codecs-nosync -> unofficial stable builds with codecs and without the profile button from "github.com/henrypp/chromium/releases" +ChromiumType=dev-codecs-sync -# Last update checking timestamp: +# Check for new Chromium version once in X days (integer): # -ChromiumCheckPeriodLast=0 +# 1 -> check updates once in a 1 day (default) +# 0 -> disable update checking +# -1 -> force update checking +ChromiumCheckPeriod=1 + +# Last cached founded build date of Chromium in unix-time format(integer): +ChromiumLastBuild=0 + +# Last cached update checking timestamp (integer): +ChromiumLastCheck=0 + +# Last cached founded version of Chromium (string): +ChromiumLastVersion= Website: www.henrypp.org Support: support@henrypp.org -(c) 2016 Henry++ +(c) 2015-2017 Henry++ diff --git a/bin/SetDefaultBrowser.bat b/bin/SetDefaultBrowser.bat index 469910b..d3e4c8c 100644 --- a/bin/SetDefaultBrowser.bat +++ b/bin/SetDefaultBrowser.bat @@ -43,7 +43,7 @@ if not exist "%CHRLAUNCHER_PATH%" ( reg add "HKLM\Software\Clients\StartMenuInternet\chrlauncher\Capabilities" /v "ApplicationIcon" /t REG_SZ /d "%CHRLAUNCHER_ICON%" /f reg add "HKLM\Software\Clients\StartMenuInternet\chrlauncher\Capabilities" /v "ApplicationName" /t REG_SZ /d "chrlauncher" /f - reg add "HKLM\Software\Clients\StartMenuInternet\chrlauncher\Capabilities" /v "ApplicationDescription" /t REG_SZ /d "Chromium (portable)" /f + reg add "HKLM\Software\Clients\StartMenuInternet\chrlauncher\Capabilities" /v "ApplicationDescription" /t REG_SZ /d "Chromium portable launcher and updater" /f reg add "HKLM\Software\Clients\StartMenuInternet\chrlauncher\Capabilities\FileAssociations" /v ".htm" /t REG_SZ /d "chrlauncherHTML" /f reg add "HKLM\Software\Clients\StartMenuInternet\chrlauncher\Capabilities\FileAssociations" /v ".html" /t REG_SZ /d "chrlauncherHTML" /f diff --git a/bin/chrlauncher.ini b/bin/chrlauncher.ini index 80c166c..71819b7 100644 --- a/bin/chrlauncher.ini +++ b/bin/chrlauncher.ini @@ -1,48 +1,65 @@ [chrlauncher] -# Command line for Chromium: -# -# See here: -# http://peter.sh/experiments/chromium-command-line-switches/ -# +# Command line for Chromium (string): +# See here: http://peter.sh/experiments/chromium-command-line-switches/ ChromiumCommandLine=--user-data-dir=..\profile --no-default-browser-check --allow-outdated-plugins --disable-component-update -# Chromium binaries directory: -# +# Chromium binaries directory (string): ChromiumDirectory=.\bin -# Adobe Flash Player PPAPI DLL path: -# -# See here: -# http://effect8.ru/soft/media/adobe-flash-player-portable.html -# +# Chromium binary file name (string): +ChromiumBinary=chrome.exe + +# Adobe Flash Player PPAPI portable library path (string): +# Download here: http://effect8.ru/soft/media/adobe-flash-player-portable.html FlashPlayerPath=.\plugins\pepflashplayer.dll -# Set Chromium binaries architecture: +# Set Chromium binaries architecture (integer): # # 0 -> autodetect (default) # 64 -> 64-bit # 32 -> 32-bit -# ChromiumArchitecture=0 -# Type of Chromium builds: +# Auto download updates if founded (boolean) +# +# false -> show tray tip if update found, downloading manually (default) +# true -> auto download update and install it! +ChromiumAutoDownload=falseboolean + +# Bring chrlauncher window when download started (boolean) +# +# false -> don't bring main window to front automatically (default) +# true -> bring chrlauncher window to front when download started +ChromiumBringToFront=false + +# Set error mode (boolean): # -# dev-official -> official development builds from snapshots repository (default) -# dev-codecs-sync -> unofficial development builds with codecs from "github.com/henrypp/chromium" -# stable-codecs-sync -> unofficial stable builds with codecs from "github.com/henrypp/chromium" -# dev-codecs-nosync -> unofficial development builds with codecs and without the profile button from "github.com/henrypp/chromium" -# stable-codecs-nosync -> unofficial stable builds with codecs and without the profile button from "github.com/henrypp/chromium" +# false -> show warning messages (default) +# true -> no error messages will be shown +ChromiumIsSilent=false + +# Type of Chromium builds: # +# dev-official -> official development builds from snapshots repository "commondatastorage.googleapis.com/chromium-browser-snapshots/index.html" +# dev-codecs-sync -> unofficial development builds with codecs from "github.com/henrypp/chromium/releases" (default) +# stable-codecs-sync -> unofficial stable builds with codecs from "github.com/henrypp/chromium/releases" +# dev-codecs-nosync -> unofficial development builds with codecs and without the profile button from "github.com/henrypp/chromium/releases" +# stable-codecs-nosync -> unofficial stable builds with codecs and without the profile button from "github.com/henrypp/chromium/releases" ChromiumType=dev-codecs-sync -# Check for new Chromium version once in X days: +# Check for new Chromium version once in X days (integer): # +# 1 -> check updates once in a 1 day (default) # 0 -> disable update checking -# 1 -> once in day (default) -# +# -1 -> force update checking ChromiumCheckPeriod=1 -# Last update checking timestamp: -# -ChromiumCheckPeriodLast=0 +# Last cached founded build date of Chromium in unix-time format(integer): +ChromiumLastBuild=0 + +# Last cached update checking timestamp (integer): +ChromiumLastCheck=0 + +# Last cached founded version of Chromium (string): +ChromiumLastVersion= diff --git a/chrlauncher.vcxproj b/chrlauncher.vcxproj index 16dc78b..7c86f9e 100644 --- a/chrlauncher.vcxproj +++ b/chrlauncher.vcxproj @@ -125,7 +125,7 @@ Sync false true - _UNICODE;UNICODE;_CRT_SECURE_NO_WARNINGS;_APP_NO_SETTINGS;_APP_NO_UPDATES;%(PreprocessorDefinitions) + _UNICODE;UNICODE;_CRT_SECURE_NO_WARNINGS;_APP_NO_SETTINGS;_APP_NO_UPDATES;_APP_HAVE_TRAY;_APP_STARTMINIMIZED;%(PreprocessorDefinitions) @@ -166,7 +166,7 @@ Sync false true - _UNICODE;UNICODE;_CRT_SECURE_NO_WARNINGS;_APP_NO_SETTINGS;_APP_NO_UPDATES;%(PreprocessorDefinitions) + _UNICODE;UNICODE;_CRT_SECURE_NO_WARNINGS;_APP_NO_SETTINGS;_APP_NO_UPDATES;_APP_HAVE_TRAY;_APP_STARTMINIMIZED;%(PreprocessorDefinitions) @@ -212,7 +212,7 @@ None - _UNICODE;UNICODE;_CRT_SECURE_NO_WARNINGS;_APP_NO_SETTINGS;_APP_NO_UPDATES;%(PreprocessorDefinitions) + _UNICODE;UNICODE;_CRT_SECURE_NO_WARNINGS;_APP_NO_SETTINGS;_APP_NO_UPDATES;_APP_HAVE_TRAY;_APP_STARTMINIMIZED;%(PreprocessorDefinitions) true @@ -257,7 +257,7 @@ None - _UNICODE;UNICODE;_CRT_SECURE_NO_WARNINGS;_APP_NO_SETTINGS;_APP_NO_UPDATES;%(PreprocessorDefinitions) + _UNICODE;UNICODE;_CRT_SECURE_NO_WARNINGS;_APP_NO_SETTINGS;_APP_NO_UPDATES;_APP_HAVE_TRAY;_APP_STARTMINIMIZED;%(PreprocessorDefinitions) false diff --git a/src/main.cpp b/src/main.cpp index 60344f5eaf48f8c026ebfed05ec166c8e14abece..1bf7ce5e5bcb0aa91df5f87c3157b36dd1df8a6d 100644 GIT binary patch delta 9498 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 I{hsFk0mswDpa1{> delta 4219 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 diff --git a/src/main.h b/src/main.h index b36829e009b8810af9a1f262359217dd56f56e07..036a1ab0a8074b5eb3ae23c449051ff79638de59 100644 GIT binary patch delta 611 zcma)(&q@Me6vdCD18Iq6h(sG92*fOvtiW1GMrCCYMM#v4|4J~Gam;13Zc%ifp$F(0 zS_MJR;I=4e(Y`Yym9;5`%gjCZ{?5JMd=CRp-m7$f9AU%|K@_vMYxg!ahDk)EV+%`K zaXDj{V2vRM%5rb7+$dQoD}$juY#@gnY$J&*RK|_(*0;7f&s(c!(=}5p07o7M>mDp9}CMBG*>;GI6 z#yIM<{u7l)drSHpUcbh53^GMVn`5hdb6I(_2Z!@qutM#~>L@d-%ZoicR6&!JZXLor zTvMLyQzNGO%cV=x%P%R%d^E?s3~DE2W-x7K0lH`;4Q6?|R+xYOs)$^wKId0mE*wF* zR=vI&`8NBzJM1IQ3y;aUI_4=@nz>WWbR=%k1e3Jv1xOfd2bbwMiKq(yt z1Bj#^quJ!GOp%kzm~Tw}#gaEUi_L~RoWYsFgTav@h(Td;Is4(s3)uN4cX5dE`vS!x k7~&ZMfOH6h$K-ByWuQ2pWC24WLkU9$Lo@?66+E1A0EYY~ZU6uP diff --git a/src/resource.h b/src/resource.h index 1c6f6ec..6b7162f 100644 --- a/src/resource.h +++ b/src/resource.h @@ -7,16 +7,18 @@ // Menu Id #define IDM_MAIN 100 +#define IDM_TRAY 101 // Dialogs #define IDD_MAIN 100 // Main Dlg -#define IDC_PROGRESS 1001 -#define IDC_BROWSER 1002 -#define IDC_CURRENTVERSION 1003 -#define IDC_VERSION 1004 -#define IDC_DATE 1005 +#define IDC_PROGRESS 1000 +#define IDC_BROWSER 1001 +#define IDC_CURRENTVERSION 1002 +#define IDC_VERSION 1003 +#define IDC_DATE 1004 +#define IDC_START_BTN 1005 #define IDC_STATUSBAR 1006 // Main Menu @@ -25,6 +27,13 @@ #define IDM_DONATE 2002 #define IDM_ABOUT 2003 +// Tray Menu +#define IDM_TRAY_SHOW 3000 +#define IDM_TRAY_START 3001 +#define IDM_TRAY_WEBSITE 3002 +#define IDM_TRAY_ABOUT 3003 +#define IDM_TRAY_EXIT 3004 + // Icons #define IDI_MAIN 100 @@ -38,10 +47,9 @@ #define IDS_STATUS_DOWNLOAD 1005 #define IDS_STATUS_INSTALL 1006 -#define IDS_STATUS_ERROR 1007 -#define IDS_STATUS_CLOSEBROWSER 1008 -#define IDS_STATUS_NOTFOUND 1009 +#define IDS_STATUS_FOUND 1007 +#define IDS_STATUS_ERROR 1008 -#define IDS_QUESTION_BUSY 1010 +#define IDS_QUESTION_STOP 1009 #endif // __RESOURCE_H__ diff --git a/src/resource.rc b/src/resource.rc index f71e27ca460b8ee1a6cfe5306246c1a6ecccf08e..f3e0f4a9a40f98f4945a171820e68cb861f12f58 100644 GIT binary patch delta 884 zcma)4O-mb56g_4n(}`B8VkyMHWFS&eYoh_pqLf4UYA7Ln#?Vv|o7h7G<9LTHY{0`Sy&R0f#=Td3Uu4_|EQxDGpB0hA0?`y=iQWRe z@qq?*u}w^uXg2ED=jlqu=!9CuA(TJud}vbone5VBIibwYlcBXSlV>PX2|*yVm19v9zKcV&Gu zZCc;WCGMFg#~oFfvOb!t@UeRh|`k>#S-+L$&AisLjZ(LGSnYS7Jw+O*3>jvDf^DXQA5s5WF^o3kZ9Xtqwd|dthzMop*_!fZ@