timamsk/Open-Shell-Menu
1
0
Fork 0
mirror of https://github.com/Open-Shell/Open-Shell-Menu.git synced 2026-04-11 17:37:22 +10:00
Code Issues Packages Projects Releases Wiki Activity

Few improvements (#65)

Browse Source 
* Fix naming inconsistencies

'Menu' vs 'StartMenu'

* Installer: Remove Facebook link

* Installer: Remove PayPal donate remnants

* OpenShellReadme: Remove info about product version
This commit is contained in:
ge0rdi
2018-08-13 06:28:42 +02:00
committed by Xenhat
parent ad05abe113
commit 2fb9448ffd
30 changed files with 70 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Src/Setup/BuildBinaries.bat
View File

@@ -81,17 +81,17 @@ copy /B Output\x64\ClassicExplorer64.dll Output\PDB64 > nul
REM IE 32
copy /B ..\ClassicIE\Setup\ClassicIEDLL_32.pdb Output\PDB32 > nul
copy /B Output\ClassicIEDLL_32.dll Output\PDB32 > nul
copy /B ..\ClassicIE\Setup\ClassicIE_32.exe Output\PDB32 > nul
copy /B ..\ClassicIE\Setup\ClassicIE_32.pdb Output\PDB32 > nul
copy /B Output\ClassicIE_32.exe Output\PDB32 > nul
REM IE 64
copy /B ..\ClassicIE\Setup64\ClassicIEDLL_64.pdb Output\PDB64 > nul
copy /B Output\x64\ClassicIEDLL_64.dll Output\PDB64 > nul
copy /B ..\ClassicIE\Setup64\ClassicIE_64.exe Output\PDB64 > nul
copy /B ..\ClassicIE\Setup64\ClassicIE_64.pdb Output\PDB64 > nul
copy /B Output\x64\ClassicIE_64.exe Output\PDB64 > nul
REM Menu 32
copy /B ..\StartMenu\Setup\Menu.pdb Output\PDB32 > nul
copy /B ..\StartMenu\Setup\StartMenu.pdb Output\PDB32 > nul
copy /B Output\StartMenu.exe Output\PDB32 > nul
copy /B ..\StartMenu\Setup\StartMenuDLL.pdb Output\PDB32 > nul
copy /B Output\StartMenuDLL.dll Output\PDB32 > nul
@@ -101,7 +101,7 @@ copy /B ..\Update\Release\Update.pdb Output\PDB32 > nul
copy /B Output\Update.exe Output\PDB32 > nul
REM Menu 64
copy /B ..\StartMenu\Setup64\Menu.pdb Output\PDB64 > nul
copy /B ..\StartMenu\Setup64\StartMenu.pdb Output\PDB64 > nul
copy /B Output\x64\StartMenu.exe Output\PDB64 > nul
copy /B ..\StartMenu\Setup64\StartMenuDLL.pdb Output\PDB64 > nul
copy /B Output\x64\StartMenuDLL.dll Output\PDB64 > nul

8
Src/Setup/Setup.cpp
View File

@@ -286,7 +286,7 @@ int APIENTRY wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCm
if (extract)
{
wchar_t msiName[_MAX_PATH];
Sprintf(msiName,_countof(msiName),L"Setup%d_%d_%d_%d.msi",extract,HIWORD(pVer->dwProductVersionMS),LOWORD(pVer->dwProductVersionMS),HIWORD(pVer->dwProductVersionLS));
Sprintf(msiName,_countof(msiName),L"OpenShellSetup%d_%d_%d_%d.msi",extract,HIWORD(pVer->dwProductVersionMS),LOWORD(pVer->dwProductVersionMS),HIWORD(pVer->dwProductVersionLS));
return ExtractMsi(hInstance,msiName,extract==64,bQuiet);
}
@@ -326,8 +326,8 @@ int APIENTRY wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCm
BOOL b64=FALSE;
isWow64Process(GetCurrentProcess(),&b64);
// look for an old version the start menu (2.0.0 or older) and show a warning if it is still running. the uninstaller for such old versions doesn't close the start menu
HWND hwnd=FindWindow(L"Menu.CStartHookWindow",L"StartHookWindow");
// look for an old version of the classic start menu (2.0.0 or older) and show a warning if it is still running. the uninstaller for such old versions doesn't close the start menu
HWND hwnd=FindWindow(L"ClassicStartMenu.CStartHookWindow",L"StartHookWindow");
if (hwnd)
{
bool bStartMenu=false;
@@ -391,7 +391,7 @@ int APIENTRY wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCm
}
wchar_t msiName[_MAX_PATH];
Sprintf(msiName,_countof(msiName),L"%%ALLUSERSPROFILE%%\\Setup%d_%d_%d_%d.msi",b64?64:32,HIWORD(pVer->dwProductVersionMS),LOWORD(pVer->dwProductVersionMS),HIWORD(pVer->dwProductVersionLS));
Sprintf(msiName,_countof(msiName),L"%%ALLUSERSPROFILE%%\\OpenShellSetup%d_%d_%d_%d.msi",b64?64:32,HIWORD(pVer->dwProductVersionMS),LOWORD(pVer->dwProductVersionMS),HIWORD(pVer->dwProductVersionLS));
DoEnvironmentSubst(msiName,_countof(msiName));
int ex=ExtractMsi(hInstance,msiName,b64!=FALSE,bQuiet);
if (ex) return ex;

6
Src/Setup/Setup.rc
View File

@@ -81,9 +81,9 @@ BEGIN
VALUE "CompanyName", "Open-Shell"
VALUE "FileDescription", "Adds classic shell features to Windows 7 and Windows 8"
VALUE "FileVersion", _PRODUCT_VERSION_STR
VALUE "InternalName", "Setup"
VALUE "InternalName", "OpenShellSetup"
VALUE "LegalCopyright", "Copyright (C) 2017-2018, The Open-Shell Team"
VALUE "OriginalFilename", "Setup.exe"
VALUE "OriginalFilename", "OpenShellSetup.exe"
VALUE "ProductName", "Open-Shell"
VALUE "ProductVersion", _PRODUCT_VERSION_STR
END
@@ -162,7 +162,7 @@ END
STRINGTABLE
BEGIN
IDS_HELP "Open-Shell Setup will install Open-Shell on your computer. Possible command lines:\n <no command line> - runs the installer normally\n extract32 - extracts the 32-bit MSI\n extract64 - extracts the 64-bit MSI\n help, /? - shows the command line help\n <some msiexec options> - the options are passed to msiexec\n * if the options contain %MSI% (all caps) the token is replaced by the name of the extracted MSI file\n * if %MSI% is not found, the setup runs ""msiexec /i <MSI file> <some msiexec options>""\n * run msiexec with no parameters to see the full list of msiexec options\n\nExamples:\n /qn - runs the installer in quiet mode\n /x %MSI% /qb - uninstalls the product in basic UI level\n /f %MSI% - repairs the product\n /l* log.txt - runs the installer and logs the process in the log.txt file\n /qn ADDLOCAL=ClassicExplorer - installs only Classic Explorer in quiet mode\n /qn ADDLOCAL=Menu APPLICATIONFOLDER=C:\\OpenShell - installs only Open-Shell Menu in quiet mode in the folder C:\\OpenShell\n ADDLOCAL=Menu,ClassicIE - runs the installer in full UI mode with Open-Shell Menu and Classic IE checked by default"
IDS_HELP "Open-Shell Setup will install Open-Shell on your computer. Possible command lines:\n <no command line> - runs the installer normally\n extract32 - extracts the 32-bit MSI\n extract64 - extracts the 64-bit MSI\n help, /? - shows the command line help\n <some msiexec options> - the options are passed to msiexec\n * if the options contain %MSI% (all caps) the token is replaced by the name of the extracted MSI file\n * if %MSI% is not found, the setup runs ""msiexec /i <MSI file> <some msiexec options>""\n * run msiexec with no parameters to see the full list of msiexec options\n\nExamples:\n /qn - runs the installer in quiet mode\n /x %MSI% /qb - uninstalls the product in basic UI level\n /f %MSI% - repairs the product\n /l* log.txt - runs the installer and logs the process in the log.txt file\n /qn ADDLOCAL=ClassicExplorer - installs only Classic Explorer in quiet mode\n /qn ADDLOCAL=StartMenu APPLICATIONFOLDER=C:\\OpenShell - installs only Open-Shell Start Menu in quiet mode in the folder C:\\OpenShell\n ADDLOCAL=StartMenu,ClassicIE - runs the installer in full UI mode with Open-Shell Start Menu and Classic IE checked by default"
END
#endif // English (U.S.) resources

34
Src/Setup/Setup.wxs
View File

@@ -66,7 +66,7 @@
<ComponentRef Id="ClassicExplorerSettings.exe" />
<ComponentRef Id="ExplorerSettingsLink" />
</Feature>
<Feature Id="Menu" Level="1" Title="!(loc.StartMenuTitle)" ConfigurableDirectory="APPLICATIONFOLDER" AllowAdvertise="no" Description="!(loc.StartMenuDesc)">
<Feature Id="StartMenu" Level="1" Title="!(loc.StartMenuTitle)" ConfigurableDirectory="APPLICATIONFOLDER" AllowAdvertise="no" Description="!(loc.StartMenuDesc)">
<ComponentRef Id="StartMenu.exe" />
<ComponentRef Id="StartMenuDLL.dll" />
<ComponentRef Id="StartMenuL10N.ini" />
@@ -392,21 +392,7 @@
<Text><![CDATA[<a href="https://github.com/Open-Shell/Open-Shell-Menu">!(loc.WebLink)</a>]]></Text>
<Condition Action="show">NOT Installed</Condition>
</Control>
<!-- <Control Type="Icon" Id="Icon2" Width="12" Height="12" X="7" Y="220" Hidden="yes" Text="donate.ico"> -->
<!-- <Condition Action="show">NOT Installed</Condition> -->
<!-- </Control> -->
<!-- <Control Type="Hyperlink" Id="Link2" Width="112" Height="10" X="22" Y="221" Hidden="yes" ToolTip="www.paypal.com"> -->
<!-- <Text><![CDATA[<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=5N8TPRAQJWX8G&lc=US&item_name=Classic%20Shell&no_note=1&no_shipping=1&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted">!(loc.DonateLink)</a>]]></Text> -->
<!-- <Condition Action="show">NOT Installed</Condition> -->
<!-- </Control> -->
<Control Type="Icon" Id="Icon3" Width="12" Height="12" X="185" Y="203" Hidden="yes" Text="facebook.ico">
<Condition Action="show">NOT Installed</Condition>
</Control>
<Control Type="Hyperlink" Id="Link3" Width="140" Height="10" X="200" Y="204" Hidden="yes" ToolTip="www.facebook.com">
<Text><![CDATA[<a href="https://www.facebook.com/classicshell">!(loc.FacebookLink)</a>]]></Text>
<Condition Action="show">NOT Installed</Condition>
</Control>
<Control Id="OptionalCheckBox" Type="CheckBox" X="188" Y="220" Width="130" Height="12" Hidden="yes" Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" CheckBoxValue="1" Text="!(loc.ViewReadme)">
<Control Id="OptionalCheckBox" Type="CheckBox" X="188" Y="204" Width="130" Height="12" Hidden="yes" Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" CheckBoxValue="1" Text="!(loc.ViewReadme)">
<Condition Action="show">NOT Installed</Condition>
</Control>
</Dialog>
@@ -452,7 +438,7 @@
<Component Id="StartMenu.exe" Guid="F74C0FF3-A8C0-4B6E-AFD2-F9467DE4D90B" Win64="yes" DiskId="2">
<File Id="StartMenu.exe" KeyPath="yes" Checksum="yes" Source="Output\x64\StartMenu.exe" Vital="yes" />
<Shortcut Id="StartMenuSettings" Name="Start Menu Settings" Advertise="no" Arguments="-settings" Description="!(loc.StartSettingsDesc)" Target="[APPLICATIONFOLDER]StartMenu.exe" WorkingDirectory="APPLICATIONFOLDER">
<ShortcutProperty Key="System.AppUserModel.ID" Value="OpenShell.Menu.Settings" />
<ShortcutProperty Key="System.AppUserModel.ID" Value="OpenShell.StartMenu.Settings" />
</Shortcut>
</Component>
<Component Id="StartMenuDLL.dll" Guid="C5226061-17DE-4DF6-A088-CC84F6A7BE84" Win64="yes" DiskId="2">
@@ -462,7 +448,7 @@
<Component Id="StartMenu.exe" Guid="F74C0FF3-A8C0-4B6E-AFD2-F9467DE4D90B" Win64="no" DiskId="2">
<File Id="StartMenu.exe" KeyPath="yes" Checksum="yes" Source="Output\StartMenu.exe" Vital="yes" />
<Shortcut Id="StartMenuSettings" Name="Start Menu Settings" Advertise="no" Arguments="-settings" Description="!(loc.StartSettingsDesc)" Target="[APPLICATIONFOLDER]StartMenu.exe" WorkingDirectory="APPLICATIONFOLDER">
<ShortcutProperty Key="System.AppUserModel.ID" Value="OpenShell.Menu.Settings" />
<ShortcutProperty Key="System.AppUserModel.ID" Value="OpenShell.StartMenu.Settings" />
</Shortcut>
</Component>
<Component Id="StartMenuDLL.dll" Guid="C5226061-17DE-4DF6-A088-CC84F6A7BE84" Win64="no" DiskId="2">
@@ -471,7 +457,7 @@
<?endif ?>
<Component Id="StartScreenLink" Guid="5C71165B-5451-417b-ADF5-86983ED2489A" Win64="$(var.CS_WIN64)">
<Shortcut Id="StartScreen" Name="Start Screen" Advertise="no" Arguments="-togglenew" Description="!(loc.StartScreenDesc)" Target="[APPLICATIONFOLDER]StartMenu.exe" WorkingDirectory="APPLICATIONFOLDER" Icon="StartScreen.exe">
<ShortcutProperty Key="System.AppUserModel.ID" Value="OpenShell.Menu.StartScreen" />
<ShortcutProperty Key="System.AppUserModel.ID" Value="OpenShell.StartMenu.StartScreen" />
<ShortcutProperty Key="System.AppUserModel.StartPinOption" Value="1" />
<ShortcutProperty Key="System.AppUserModel.ExcludeFromShowInNewInstall" Value="1" />
<Icon Id="StartScreen.exe" SourceFile="..\StartMenu\StartMenuDLL\startb.ico" />
@@ -563,7 +549,7 @@
</Component>
<Component Id="AutoRun" Guid="64987C22-72C7-419D-B5A5-D2E6CB4865B6" Win64="$(var.CS_WIN64)">
<RegistryKey Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Run">
<RegistryValue Value="&quot;[APPLICATIONFOLDER]StartMenu.exe&quot; -autorun" Type="string" Name="Open-Shell Menu" />
<RegistryValue Value="&quot;[APPLICATIONFOLDER]StartMenu.exe&quot; -autorun" Type="string" Name="Open-Shell Start Menu" />
</RegistryKey>
</Component>
<Component Id="TreatAs" Guid="B1E7462A-E1E2-47eb-A42C-7BD272D738AA" Win64="$(var.CS_WIN64)">
@@ -595,7 +581,7 @@
</Component>
<Component Id="MenuSettingsLink" Guid="F2B638D3-EBE1-4C8F-9C53-08A4F21ACFA3">
<Shortcut Id="MenuSettingsLink" Name="!(loc.StartMenuItem)" Advertise="no" Description="!(loc.StartSettingsDesc)" Target="[APPLICATIONFOLDER]StartMenu.exe" WorkingDirectory="APPLICATIONFOLDER" Arguments="-settings">
<ShortcutProperty Key="System.AppUserModel.ID" Value="OpenShell.Menu.Settings" />
<ShortcutProperty Key="System.AppUserModel.ID" Value="OpenShell.StartMenu.Settings" />
</Shortcut>
<CreateFolder />
<Condition>START_MENU_FOLDER=1</Condition>
@@ -651,13 +637,11 @@
</Upgrade>
<InstallExecuteSequence>
<RemoveExistingProducts After="InstallInitialize" />
<Custom Action="CloseStartMenu" Before="InstallValidate"><![CDATA[((!Menu=3) AND (&Menu=2)) OR PREVIOUSVERSIONSINSTALLED OR REINSTALL]]></Custom>
<Custom Action="LaunchStartMenu" After="InstallFinalize"><![CDATA[(!Menu=3 OR &Menu=3) AND NOT REMOVE AND NOSTART<>1]]></Custom>
<Custom Action="CloseStartMenu" Before="InstallValidate"><![CDATA[((!StartMenu=3) AND (&StartMenu=2)) OR PREVIOUSVERSIONSINSTALLED OR REINSTALL]]></Custom>
<Custom Action="LaunchStartMenu" After="InstallFinalize"><![CDATA[(!StartMenu=3 OR &StartMenu=3) AND NOT REMOVE AND NOSTART<>1]]></Custom>
</InstallExecuteSequence>
<Binary Id="SetupHelper.exe" SourceFile="Output\SetupHelper.exe" />
<Binary Id="dialog2.jpg" SourceFile="..\Setup\dialog2.jpg" />
<Binary Id="donate.ico" SourceFile="..\Setup\donate.ico" />
<Binary Id="web.ico" SourceFile="..\Setup\web.ico" />
<Binary Id="facebook.ico" SourceFile="..\Setup\facebook.ico" />
</Product>
</Wix>

2
Src/Setup/SetupHelper/SetupHelper.cpp
View File

@@ -41,7 +41,7 @@ int ExitStartMenu( void )
}
RegCloseKey(hKey);
}
HWND updateOwner=FindWindow(L"Update.COwnerWindow",NULL);
HWND updateOwner=FindWindow(L"OpenShellUpdate.COwnerWindow",NULL);
if (updateOwner)
PostMessage(updateOwner,WM_CLEAR,0,0);
return 0;

9
Src/Setup/Utility/ManualUninstall.cpp
View File

@@ -741,11 +741,11 @@ static void DeleteSettings( HKEY root, const wchar_t *rootName, const wchar_t *k
LogMessage(-1,L"Deleting registry key %s\\%s\\OpenShell",rootName,keyName);
else if (error!=ERROR_FILE_NOT_FOUND)
LogMessage(error,L"Failed to delete registry key %s\\%s\\OpenShell.",rootName,keyName);
error=RegDeleteTree2(hkey,L"Menu");
error=RegDeleteTree2(hkey,L"StartMenu");
if (error==ERROR_SUCCESS)
LogMessage(-1,L"Deleting registry key %s\\%s\\Menu",rootName,keyName);
LogMessage(-1,L"Deleting registry key %s\\%s\\StartMenu",rootName,keyName);
else if (error!=ERROR_FILE_NOT_FOUND)
LogMessage(error,L"Failed to delete registry key %s\\%s\\Menu.",rootName,keyName);
LogMessage(error,L"Failed to delete registry key %s\\%s\\StartMenu.",rootName,keyName);
RegCloseKey(hkey);
HKEY root2;
@@ -911,7 +911,7 @@ static void ManualUninstallInternal( void )
progress.SetWindowPos(HWND_TOP,0,0,0,0,SWP_NOSIZE|SWP_NOMOVE);
{
// stop start menu
HWND hwnd=FindWindow(L"Menu.CStartHookWindow",L"StartHookWindow");
HWND hwnd=FindWindow(L"OpenShellMenu.CStartHookWindow",L"StartHookWindow");
if (hwnd) PostMessage(hwnd,WM_USER+10,MSG_EXIT,0);
int time=GetTickCount();
@@ -997,7 +997,6 @@ static void ManualUninstallInternal( void )
DeleteRegKeySOFTWARE(L"Microsoft\\Windows\\CurrentVersion\\Explorer\\Browser Helper Objects\\{EA801577-E6AD-4BD5-8F71-4BE0154331A4}",bIsWow64);
DeleteRegKeySOFTWARE(L"Microsoft\\Windows\\CurrentVersion\\Explorer\\ShellIconOverlayIdentifiers\\ShareOverlay",bIsWow64);
DeleteRegKeySOFTWARE(L"OpenShell\\OpenShell",bIsWow64);
DeleteRegKeySOFTWARE(L"OpenShell\\OpenShell",bIsWow64);
DeleteRegValueSOFTWARE(L"Microsoft\\Internet Explorer\\Toolbar",L"{553891B7-A0D5-4526-BE18-D3CE461D6310}",bIsWow64);
DeleteRegValueSOFTWARE(L"Microsoft\\Windows\\CurrentVersion\\Policies\\Ext\\CLSID",L"{449D0D6E-2412-4E61-B68F-1CB625CD9E52}",bIsWow64);

8
Src/Setup/Utility/SaveLogFile.cpp
View File

@@ -662,7 +662,7 @@ static void WriteLogFile( FILE *f )
for (std::set<CString,CompareStrings>::const_iterator it=programs.begin();it!=programs.end();++it)
fwprintf(f,L"\t\t%s\r\n",(const wchar_t*)(*it));
fwprintf(f,L"\r\nClassic Start\r\n");
fwprintf(f,L"\r\nOpen-Shell\r\n");
wchar_t csPath[_MAX_PATH]=L"";
// classic shell version
{
@@ -682,13 +682,13 @@ static void WriteLogFile( FILE *f )
size=_countof(csPath);
if (regKey.QueryStringValue(L"Path",csPath,&size)==ERROR_SUCCESS)
{
fwprintf(f,L"\tClassic Start path: '%s'\r\n",csPath);
fwprintf(f,L"\tOpen-Shell path: '%s'\r\n",csPath);
PathRemoveBackslash(csPath);
}
DWORD val;
if (regKey.QueryDWORDValue(L"Version",val)==ERROR_SUCCESS)
fwprintf(f,L"\tClassic Start version: %d.%d.%d\r\n",val>>24,(val>>16)&0xFF,val&0xFFFF);
fwprintf(f,L"\tOpen-Shell version: %d.%d.%d\r\n",val>>24,(val>>16)&0xFF,val&0xFFFF);
if (regKey.QueryDWORDValue(L"WinVersion",val)==ERROR_SUCCESS)
fwprintf(f,L"\tWin version during installation: %d.%02d.%d\r\n",val>>24,(val>>16)&0xFF,val&0xFFFF);
@@ -974,7 +974,7 @@ static void WriteLogFileAdmin( FILE *f )
}
for (std::vector<DWORD>::const_iterator it=menus.begin();it!=menus.end();++it)
{
fwprintf(f,L"\r\nMenu process: %d\r\n",*it);
fwprintf(f,L"\r\nStartMenu process: %d\r\n",*it);
HANDLE hProcess=OpenProcess(PROCESS_QUERY_INFORMATION|PROCESS_VM_READ,FALSE,*it);
if (hProcess)
{

BIN
Src/Setup/donate.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
Src/Setup/facebook.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB