timamsk/Open-Shell-Menu
1
0
Fork 0
mirror of https://github.com/Open-Shell/Open-Shell-Menu.git synced 2026-04-13 20:28:31 +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

10
Src/Lib/Settings.cpp
View File

@@ -416,8 +416,8 @@ static void GetRegPaths( TSettingsComponent component, const wchar_t *&regPath,
gpPath=L"Software\\Policies\\OpenShell\\ClassicExplorer";
break;
case COMPONENT_MENU:
regPath=L"Software\\OpenShell\\Menu";
gpPath=L"Software\\Policies\\OpenShell\\Menu";
regPath=L"Software\\OpenShell\\StartMenu";
gpPath=L"Software\\Policies\\OpenShell\\StartMenu";
break;
case COMPONENT_IE:
regPath=L"Software\\OpenShell\\ClassicIE";
@@ -2418,7 +2418,7 @@ static const char *g_AdmxText1csm=
"\t\t</definitions>\r\n"
"\t</supportedOn>\r\n"
"\t<categories>\r\n"
"\t\t<category name=\"Menu\" displayName=\"$(string.MenuCat)\" explainText=\"$(string.MenuCatHelp)\">\r\n"
"\t\t<category name=\"StartMenu\" displayName=\"$(string.MenuCat)\" explainText=\"$(string.MenuCatHelp)\">\r\n"
"\t\t\t<parentCategory ref=\"classic_shell:OpenShell\" />\r\n"
"\t\t</category>\r\n";
@@ -2545,9 +2545,9 @@ bool SaveAdmx( TSettingsComponent component, const char *admxFile, const char *a
admlText1=g_AdmlText1ce;
break;
case COMPONENT_MENU:
keyName="Software\\Policies\\OpenShell\\Menu";
keyName="Software\\Policies\\OpenShell\\StartMenu";
prefix="CSM_";
catName="Menu";
catName="StartMenu";
admxText1=g_AdmxText1csm;
admlText1=g_AdmlText1csm;
break;

8
Src/Localization/Chinese/OpenShellReadme.rtf
View File

@@ -4,10 +4,8 @@
{\*\generator Riched20 10.0.17134}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1
\pard\brdrb\brdrs\brdrw20\brsp80 \widctlpar\sa300\qc\cf1\expndtw5\kerning28\f0\fs52 Open-Shell\par
\pard\keep\keepn\widctlpar\s2\sb200\sl276\slmult1\cf2\expndtw0\kerning0\b\f1\fs26\'b0\'e6\'b1\'be\f0 4.3.1 \endash\f1\'b3\'a3\'b9\'e6\'b0\'e6\'b1\'be\f0\par
\pard\widctlpar\sa200\sl276\slmult1\cf0\b0\f2\fs22\par
\f1\'b8\'d0\'d0\'bb\'c4\'fa\'b0\'b2\'d7\'b0\cf3\b\f2 Classic Shell\f3\'99\cf0\b0\f1\'a1\'a3\'cb\'fc\'bd\'ab\'d2\'bb\'d0\'a9\'c8\'b1\'c9\'d9\'b5\'c4\'cc\'d8\'d0\'d4\'b2\'b9\'b3\'e4\'b5\'bd\f2 Windows 7, Windows 8, Windows 8.1 \f1\'ba\'cd\f2 Windows 10\emdash\emdash\f1\'c0\'fd\'c8\'e7\'be\'ad\'b5\'e4\'bf\'aa\'ca\'bc\'b2\'cb\'b5\'a5\'a1\'a2\'bf\'aa\'ca\'bc\'b0\'b4\'c5\'a5\'a1\'a2\'d7\'ca\'d4\'b4\'b9\'dc\'c0\'ed\'c6\'f7\'b9\'a4\'be\'df\'c0\'b8\'b5\'c8\'b5\'c8\'a1\'a3\f2\par
\f1\'b8\'d0\'d0\'bb\'c4\'fa\'b0\'b2\'d7\'b0\cf3\b\f2 Open-Shell\f3\'99\cf0\b0\f1\'a1\'a3\'cb\'fc\'bd\'ab\'d2\'bb\'d0\'a9\'c8\'b1\'c9\'d9\'b5\'c4\'cc\'d8\'d0\'d4\'b2\'b9\'b3\'e4\'b5\'bd\f2 Windows 7, Windows 8, Windows 8.1 \f1\'ba\'cd\f2 Windows 10\emdash\emdash\f1\'c0\'fd\'c8\'e7\'be\'ad\'b5\'e4\'bf\'aa\'ca\'bc\'b2\'cb\'b5\'a5\'a1\'a2\'bf\'aa\'ca\'bc\'b0\'b4\'c5\'a5\'a1\'a2\'d7\'ca\'d4\'b4\'b9\'dc\'c0\'ed\'c6\'f7\'b9\'a4\'be\'df\'c0\'b8\'b5\'c8\'b5\'c8\'a1\'a3\f2\par
\par
\pard\widctlpar\f1\'d7\'ee\'d0\'c2\'b5\'c4\'b0\'e6\'b1\'be\'bf\'c9\'d2\'d4\'d4\'da\f2 OpenShell\f1\'b5\'c4\'cd\'f8\'d5\'be\'d5\'d2\'b5\'bd\'a3\'ba\f2\par
@@ -1596,8 +1594,8 @@ f0fcce418511c4ad418511c4ad418511c4ad418511c4ad418511c4ad418511c4ad418511c4ad41
\pard\keep\keepn\widctlpar\s1\sb480\sl480\slmult1\cf5\b\f1\fs28\'d0\'b6\'d4\'d8\f0\par
\pard\widctlpar\sa200\sl276\slmult1\cf0\b0\f1\fs22\'d2\'aa\'d0\'b6\'d4\'d8\cf3\b\f2 Classic Shell\cf0\b0\f1\'a3\'ac\'bf\'c9\'b0\'b4\'d2\'d4\'cf\'c2\'b2\'bd\'d6\'e8\'b2\'d9\'d7\'f7\'a3\'ba\f2\par
1)\f1\'b4\'f2\'bf\'aa\'bf\'d8\'d6\'c6\'c3\'e6\'b0\'e5\'a3\'ac\'d1\'a1\'d4\'f1\ldblquote\'b3\'cc\'d0\'f2\'ba\'cd\'b9\'a6\'c4\'dc\rdblquote\'a3\'ac\'d5\'d2\'b5\'bd\'b2\'a2\'cb\'ab\'bb\'f7\ldblquote\f2 Classic Shell\f1\rdblquote\'a3\'ac\'c8\'bb\'ba\'f3\'b0\'b4\'d5\'d5\'cb\'b5\'c3\'f7\'b2\'d9\'d7\'f7\'a1\'a3\'c4\'e3\'bf\'c9\'c4\'dc\'d0\'e8\'d2\'aa\'d6\'d8\'d0\'c2\'c6\'f4\'b6\'af\f2 Windows\f1\'d2\'d4\'cd\'ea\'b3\'c9\'d0\'b6\'d4\'d8\'c1\'f7\'b3\'cc\'a1\'a3\f2\par
\pard\widctlpar\sa200\sl276\slmult1\cf0\b0\f1\fs22\'d2\'aa\'d0\'b6\'d4\'d8\cf3\b\f2 Open-Shell\cf0\b0\f1\'a3\'ac\'bf\'c9\'b0\'b4\'d2\'d4\'cf\'c2\'b2\'bd\'d6\'e8\'b2\'d9\'d7\'f7\'a3\'ba\f2\par
1)\f1\'b4\'f2\'bf\'aa\'bf\'d8\'d6\'c6\'c3\'e6\'b0\'e5\'a3\'ac\'d1\'a1\'d4\'f1\ldblquote\'b3\'cc\'d0\'f2\'ba\'cd\'b9\'a6\'c4\'dc\rdblquote\'a3\'ac\'d5\'d2\'b5\'bd\'b2\'a2\'cb\'ab\'bb\'f7\ldblquote\f2 Open-Shell\f1\rdblquote\'a3\'ac\'c8\'bb\'ba\'f3\'b0\'b4\'d5\'d5\'cb\'b5\'c3\'f7\'b2\'d9\'d7\'f7\'a1\'a3\'c4\'e3\'bf\'c9\'c4\'dc\'d0\'e8\'d2\'aa\'d6\'d8\'d0\'c2\'c6\'f4\'b6\'af\f2 Windows\f1\'d2\'d4\'cd\'ea\'b3\'c9\'d0\'b6\'d4\'d8\'c1\'f7\'b3\'cc\'a1\'a3\f2\par
2)\f1\'c8\'e7\'b9\'fb\'c4\'e3\'b0\'b2\'d7\'b0\'c1\'cb\'c8\'ce\'ba\'ce\'b6\'ee\'cd\'e2\'b5\'c4\'bf\'aa\'ca\'bc\'b2\'cb\'b5\'a5\'c6\'a4\'b7\'f4\'a3\'ac\'c4\'e3\'d0\'e8\'d2\'aa\'d7\'d4\'d0\'d0\'bd\'ab\'c6\'e4\'c9\'be\'b3\'fd\'a1\'a3\f2\par
}

2
Src/Localization/ChineseTW/OpenShellReadme.rtf
View File

@@ -4,8 +4,6 @@
{\*\generator Riched20 10.0.17134}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1
\pard\brdrb\brdrs\brdrw20\brsp80 \widctlpar\sa300\qc\cf1\expndtw5\kerning28\f0\fs52 Open-Shell\par
\pard\widctlpar\sa200\sl276\slmult1\cf2\expndtw15\kerning0\b\f1\fs24\'aa\'a9\'a5\'bb\f0 4.3.1 \endash \f1\'b3\'71\'a5\'ce\'aa\'a9\'a5\'bb\f0\par
\pard\widctlpar\cf0\expndtw0\b0\f2\fs22\par
\f1\'b7\'50\'c1\'c2\'b1\'7a\'a6\'77\'b8\'cb\f2 \cf3\b Open-Shell\'99\cf0\b0\f1\'a1\'43\f2 \f1\'a5\'a6\'a6\'62\f2 Windows 7, Windows 8, Windows 8.1\f1\'a9\'4d\f2 Windows 10\f1\'bc\'57\'a5\'5b\'a4\'46\'a4\'40\'a8\'c7\'af\'ca\'a4\'d6\'aa\'ba\'a5\'5c\'af\'e0\f2 - \f1\'a4\'f1\'a6\'70\'a4\'40\'ad\'d3\'a8\'e5\'ab\'ac\f2 [\f1\'b6\'7d\'a9\'6c\f2 ] \f1\'a5\'5c\'af\'e0\'aa\'ed\'a1\'42\f2 [\f1\'b6\'7d\'a9\'6c\f2 ] \f1\'ab\'f6\'b6\'73\'a1\'42\f2 Windows \f1\'c0\'c9\'ae\'d7\'c1\'60\'ba\'de\'a4\'75\'a8\'e3\'a6\'43\'a9\'4d\'a8\'e4\'a5\'a6\'a1\'43\f2\par
\par

4
Src/Localization/English/OpenShellReadme.rtf
View File

@@ -4,8 +4,6 @@
{\*\generator Riched20 10.0.17134}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1
\pard\brdrb\brdrs\brdrw20\brsp80 \widctlpar\sa300\qc\cf1\expndtw5\kerning28\f0\fs52 Open-Shell\par
\pard\widctlpar\sa200\sl276\slmult1\cf2\expndtw15\kerning0\b\i\fs24 Version 4.3.1 \endash general release\par
\pard\widctlpar\cf0\expndtw0\b0\i0\f1\fs22\par
Thank you for installing \cf3\b Open-Shell\'99\cf0\b0 . It adds some missing features to Windows 7, Windows 8, Windows 8.1 and Windows 10 - like a classic start menu, start button, a toolbar for Windows Explorer and others.\par
\par
@@ -98,7 +96,7 @@ To uninstall \cf3\b Open-Shell\cf0\b0 follow these steps:\par
\pard
{\pntext\f1 1)\tab}{\*\pn\pnlvlbody\pnf1\pnindent0\pnstart1\pndec{\pntxta)}}
\widctlpar\fi-360\li720 Open \b Control Panel -> Programs and Features\b0 and double-click on \b Classic Shell\b0 . Then follow the instructions. You may have to restart Windows to complete the process.\par
\widctlpar\fi-360\li720 Open \b Control Panel -> Programs and Features\b0 and double-click on \b Open-Shell\b0 . Then follow the instructions. You may have to restart Windows to complete the process.\par
{\pntext\f1 2)\tab}If you installed any additional skins for the start menu you will have to delete them manually\par
\pard\widctlpar\par

2
Src/Localization/French/OpenShellReadme.rtf
View File

@@ -4,8 +4,6 @@
{\*\generator Riched20 10.0.17134}{\*\mmathPr\mmathFont4\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1
\pard\brdrb\brdrs\brdrw20\brsp80 \nowidctlpar\sa300\sl200\slmult0\qc\cf1\expndtw5\kerning1\f0\fs52 Open-Shell\par
\pard\nowidctlpar\sa200\sl276\slmult1\cf2\expndtw15\kerning0\b\i\fs24 Diffusion g\f1\'e9\f0 n\f1\'e9\f0 rale \f1\endash\f0 Version 4.3.1\b0\par
\pard\nowidctlpar\cf0\expndtw0\kerning1\i0\f2\fs22\par
\b Merci d'avoir install\f1\'e9\f2 \cf3 Open-Shell\'99\cf0 . Cela permet d'ajouter des fonctions manquantes \f1\'e0\f2 Windows 7, Windows 8, Windows 8.1 et Windows 10 \f1\endash\f2 Comme le classique menu d\f1\'e9\f2 marrer, le bouton d\f1\'e9\f2 marrer, une barre d'outils pour l'explorateur Windows et d'autres.\b0\par
\par

4
Src/Localization/German/OpenShellReadme.rtf
View File

@@ -4,8 +4,6 @@
{\*\generator Riched20 10.0.17134}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1
\pard\brdrb\brdrs\brdrw20\brsp80 \widctlpar\sa300\qc\cf1\expndtw5\kerning28\f0\fs52 Open-Shell\par
\pard\widctlpar\sa200\sl276\slmult1\cf2\expndtw15\kerning0\b\i\fs24 Version 4.3.1 \endash Finale Version\par
\pard\widctlpar\cf0\expndtw0\b0\i0\f1\fs22\par
Vielen Dank f\'fcr die Installation von \cf3\b Open-Shell\'99\cf0\b0 . Durch Open-Shell werden in Windows 7, Windows 8, Windows 8.1 und Windows 10 einige fehlende Funktionen aus fr\'fcheren Windows Versionen hinzugef\'fcgt - wie ein klassisches Startmen\'fc, eine Starttaste (Startschaltfl\'e4che mit Windows Symbol), eine Werkzeugleiste f\'fcr den Windows Explorer und andere Funktionen.\par
\par
@@ -97,7 +95,7 @@ Um \cf3\b Open-Shell\cf0\b0 zu deinstallieren bitte die nachfolgenden Schritte
\pard
{\pntext\f1 1)\tab}{\*\pn\pnlvlbody\pnf1\pnindent0\pnstart1\pndec{\pntxta)}}
\widctlpar\fi-360\li720\b Systemsteuerung -> Programme und Funktionen\b0 \'f6ffnen und auf \b Classic Shell\b0 klicken. Danach den Anweisungen folgen. Anschlie\'dfend muss Windows neu gestartet werden, damit der Vorgang vollst\'e4ndig abgeschlossen wird.\par
\widctlpar\fi-360\li720\b Systemsteuerung -> Programme und Funktionen\b0 \'f6ffnen und auf \b Open-Shell\b0 klicken. Danach den Anweisungen folgen. Anschlie\'dfend muss Windows neu gestartet werden, damit der Vorgang vollst\'e4ndig abgeschlossen wird.\par
{\pntext\f1 2)\tab}Sofern f\'fcr das Startmen\'fc nachtr\'e4glich zus\'e4tzliche Skin-Dateien installiert worden sind, m\'fcssen diese anschlie\'dfend manuell deinstalliert werden\par
\pard\widctlpar\par

2
Src/Localization/Italian/OpenShellReadme.rtf
View File

@@ -4,8 +4,6 @@
{\*\generator Riched20 10.0.17134}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1
\pard\brdrb\brdrs\brdrw20\brsp80 \widctlpar\sa300\qc\cf1\expndtw5\kerning28\f0\fs52 Open-Shell\par
\pard\widctlpar\sa200\sl276\slmult1\cf2\expndtw15\kerning0\b\i\fs24 Versione 4.3.0 \endash reelase generale\par
\pard\widctlpar\cf0\expndtw0\b0\i0\f1\fs22\par
\lang2064 Grazie per aver installato \cf3\b Open-Shell\'99\cf0\b0 .Il programma aggiunge alcune funzionalit\'e0 mancanti a Windows 7, Windows 8, Windows 8.1 e Windows 10 - come il menu Start classico, il puslante Start, una barra strumenti per Windows Explorer e altro ancora.\par
\par

2
Src/Localization/Polish/OpenShellReadme.rtf
View File

@@ -4,8 +4,6 @@
{\*\generator Riched20 10.0.17134}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1
\pard\brdrb\brdrs\brdrw20\brsp80 \widctlpar\sa300\qc\cf1\expndtw5\kerning28\f0\fs52 Open-Shell\par
\pard\widctlpar\sa200\sl276\slmult1\cf2\expndtw15\kerning0\b\i\fs24 Wersja 4.3.1 \endash \cf3\f1 wydanie og\'f3lne\cf2\fs22\par
\pard\widctlpar\cf0\expndtw0\b0\i0\par
\f2 Dzi\'eakujemy za zainstalowanie \cf3\b\f1 Open-Shell\'99\cf0\b0 . \f2 Program dodaje niekt\'f3re brakuj\'b9ce funkcje w systemie Windows 7\f1 , Windows 8, Windows 8.1 i Windows 10\f2 - jak w klasyczne menu Start, przycisk Start, pasek narz\'eadzi Eksploratora Windows i inne.\f1\par
\par

2
Src/Localization/Russian/OpenShellReadme.rtf
View File

@@ -4,8 +4,6 @@
{\*\generator Riched20 10.0.17134}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1
\pard\brdrb\brdrs\brdrw20\brsp80 \widctlpar\sa300\qc\cf1\expndtw5\kerning28\f0\fs52 Classic\lang4105 \lang1033 Shell\lang4105\par
\pard\widctlpar\sa200\sl276\slmult1\cf2\expndtw15\kerning0\b\i\f1\fs24\lang1058\'c2\'e5\'f0\'f1\'e8\'ff\f0\lang4105 4.\lang1033 3\lang4105 .\lang1033 1\lang4105 \endash \f1\lang1049\'ee\'e1\'f9\'e8\'e9 \'e2\'fb\'ef\'f3\'f1\'ea\f0\lang4105\par
\pard\widctlpar\cf0\expndtw0\b0\i0\f2\fs22\par
\f3\lang1049\'c1\'eb\'e0\'e3\'ee\'e4\'e0\'f0\'e8\'ec \'e2\'e0\'f1 \'e7\'e0 \'f3\'f1\'f2\'e0\'ed\'ee\'e2\'ea\'f3 \cf3\b\f2\lang1033 Classic\lang4105 \lang1033 Shell\lang4105\'99\cf0\b0 . \lang1033 Classic\lang4105 \lang1033 Shell\f3\lang1049 \'e4\'ee\'e1\'e0\'e2\'eb\'ff\'e5\'f2 \'ed\'e5\'ea\'ee\'f2\'ee\'f0\'fb\'e5 \'ee\'f2\'f1\'f3\'f2\'f1\'f2\'e2\'f3\'fe\'f9\'e8\'e5 \'f4\'f3\'ed\'ea\'f6\'e8\'e8 \'e2 Windows 7\f2\lang1033 , \lang4105 Windows \lang1033 8, \lang4105 Windows \lang1033 8.1\f3\lang1049 \'e8 Windows \f2\lang1033 10\f3\lang1049 , \'ea\'e0\'ea \'ea\'eb\'e0\'f1\'f1\'e8\'f7\'e5\'f1\'ea\'ee\'e5 \'ec\'e5\'ed\'fe \'ef\'f3\'f1\'ea, \'ef\'e0\'ed\'e5\'eb\'e8 \'e8\'ed\'f1\'f2\'f0\'f3\'ec\'e5\'ed\'f2\'ee\'e2 \'ef\'f0\'ee\'e2\'ee\'e4\'ed\'e8\'ea\'e0 Windows \'e8 \'e4\'f0\'f3\'e3\'e8\'e5.\f2\lang4105\par
\par

2
Src/Localization/Spanish/OpenShellReadme.rtf
View File

@@ -4,8 +4,6 @@
{\*\generator Riched20 10.0.17134}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1
\pard\brdrb\brdrs\brdrw20\brsp80 \widctlpar\sa300\qc\cf1\expndtw5\kerning28\f0\fs52\lang3082 Open-Shell\par
\pard\widctlpar\sa200\sl276\slmult1\cf2\expndtw15\kerning0\b\i\fs24 Versi\'f3n 4.3.1 \endash lanzamiento general\par
\pard\widctlpar\cf0\expndtw0\b0\i0\f1\fs22\par
Gracias por instalar \cf3\b Open-Shell\'99\cf0\b0 . Agrega algunas caracter\'edsticas que faltan en Windows 7 y Windows 8 - como un men\'fa inicio cl\'e1sico, bot\'f3n inicio, una barra de herramientas para el Explorador de Windows y otras.\par
\par

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

12
Src/StartMenu/StartMenu.cpp
View File

@@ -121,7 +121,7 @@ class CStartHookWindow: public CWindowImpl<CStartHookWindow>
{
public:
DECLARE_WND_CLASS(L"Menu.CStartHookWindow")
DECLARE_WND_CLASS(L"OpenShellMenu.CStartHookWindow")
BEGIN_MSG_MAP( CStartHookWindow )
MESSAGE_HANDLER( WM_OPEN, OnOpen )
@@ -145,7 +145,7 @@ protected:
LRESULT CStartHookWindow::OnOpen( UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled )
{
if (g_TaskBar) ::PostMessage(g_TaskBar,RegisterWindowMessage(L"Menu.StartMenuMsg"),wParam,lParam);
if (g_TaskBar) ::PostMessage(g_TaskBar,RegisterWindowMessage(L"OpenShellMenu.StartMenuMsg"),wParam,lParam);
return 0;
}
@@ -477,7 +477,7 @@ int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrC
dll=LoadLibraryEx(path,NULL,LOAD_LIBRARY_AS_DATAFILE|LOAD_LIBRARY_AS_IMAGE_RESOURCE);
}
DllLoadTranslationResources(dll,NULL);
if (!DllSaveAdmx(COMPONENT_MENU,"Menu.admx","Menu.adml","MenuADMX.txt"))
if (!DllSaveAdmx(COMPONENT_MENU,"OpenShellStartMenu.admx","OpenShellStartMenu.adml","MenuADMX.txt"))
return 1;
if (!DllSaveAdmx(COMPONENT_SHARED,"OpenShell.admx","OpenShell.adml","OpenShellADMX.txt"))
return 1;
@@ -593,7 +593,7 @@ int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrC
bool bDefaultDesktop=(_wcsicmp(deskName,L"Default")==0);
wchar_t mutexName[1024];
Sprintf(mutexName,_countof(mutexName),L"Menu.Mutex.%s.%s",userName,deskName);
Sprintf(mutexName,_countof(mutexName),L"OpenShellMenu.Mutex.%s.%s",userName,deskName);
free(deskName);
if (open==CMD_NONE)
@@ -616,7 +616,7 @@ int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrC
AllowSetForegroundWindow(process);
HWND taskBar=FindTaskBar(process);
if (taskBar)
PostMessage(taskBar,RegisterWindowMessage(L"Menu.StartMenuMsg"),(open==CMD_TOGGLE_NEW)?MSG_TOGGLENEW:MSG_TOGGLE,0);
PostMessage(taskBar,RegisterWindowMessage(L"OpenShellMenu.StartMenuMsg"),(open==CMD_TOGGLE_NEW)?MSG_TOGGLENEW:MSG_TOGGLE,0);
else
PostMessage(progWin,WM_SYSCOMMAND,SC_TASKLIST,(open==CMD_TOGGLE_NEW)?'WSMK':'CSM');
}
@@ -624,7 +624,7 @@ int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrC
else if (open!=CMD_NONE)
{
AllowSetForegroundWindow(process);
HWND hwnd=FindWindow(L"Menu.CStartHookWindow",L"StartHookWindow");
HWND hwnd=FindWindow(L"OpenShellMenu.CStartHookWindow",L"StartHookWindow");
if (hwnd) PostMessage(hwnd,WM_OPEN,open,0);
}
if (open==MSG_EXIT && hMutex && WaitForSingleObject(hMutex,2000)==WAIT_OBJECT_0)

2
Src/StartMenu/StartMenu.vcxproj
View File

@@ -28,7 +28,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{87D5FE20-AF86-458A-9AA3-3131EB06179B}</ProjectGuid>
<RootNamespace>Menu</RootNamespace>
<RootNamespace>StartMenu</RootNamespace>
<Keyword>Win32Proj</Keyword>
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
</PropertyGroup>

8
Src/StartMenu/StartMenuDLL/ItemManager.cpp
View File

@@ -1527,7 +1527,7 @@ void CItemManager::UpdateNewPrograms( const POINT &balloonPos )
{
CRegKey regKey;
ULONGLONG val1, val2;
if (regKey.Open(HKEY_CURRENT_USER,L"Software\\OpenShell\\Menu",KEY_READ)==ERROR_SUCCESS)
if (regKey.Open(HKEY_CURRENT_USER,L"Software\\OpenShell\\StartMenu",KEY_READ)==ERROR_SUCCESS)
{
if (regKey.QueryQWORDValue(L"LastProgramsTime",val1)!=ERROR_SUCCESS)
val1=0;
@@ -1608,7 +1608,7 @@ void CItemManager::LoadOldItems( void )
{
m_OldItemInfos.clear();
CRegKey regItems;
if (regItems.Open(HKEY_CURRENT_USER,L"Software\\OpenShell\\Menu",KEY_READ)==ERROR_SUCCESS)
if (regItems.Open(HKEY_CURRENT_USER,L"Software\\OpenShell\\StartMenu",KEY_READ)==ERROR_SUCCESS)
{
ULONG size=0;
regItems.QueryBinaryValue(L"OldItems",NULL,&size);
@@ -1721,8 +1721,8 @@ void CItemManager::AddOldItems( const std::vector<unsigned> &hashes )
}
CRegKey regItems;
if (regItems.Open(HKEY_CURRENT_USER,L"Software\\OpenShell\\Menu")!=ERROR_SUCCESS)
regItems.Create(HKEY_CURRENT_USER,L"Software\\OpenShell\\Menu");
if (regItems.Open(HKEY_CURRENT_USER,L"Software\\OpenShell\\StartMenu")!=ERROR_SUCCESS)
regItems.Create(HKEY_CURRENT_USER,L"Software\\OpenShell\\StartMenu");
if (m_OldItemInfos.empty())
regItems.SetBinaryValue(L"OldItems",NULL,0);

10
Src/StartMenu/StartMenuDLL/MenuContainer.cpp
View File

@@ -4273,8 +4273,8 @@ void CMenuContainer::InitWindowInternal( bool bDontShrink, const POINT &corner,
ULONGLONG curTime;
GetSystemTimeAsFileTime((FILETIME*)&curTime);
CRegKey regKey;
if (regKey.Open(HKEY_CURRENT_USER,L"Software\\OpenShell\\Menu",KEY_WRITE)!=ERROR_SUCCESS)
regKey.Create(HKEY_CURRENT_USER,L"Software\\OpenShell\\Menu");
if (regKey.Open(HKEY_CURRENT_USER,L"Software\\OpenShell\\StartMenu",KEY_WRITE)!=ERROR_SUCCESS)
regKey.Create(HKEY_CURRENT_USER,L"Software\\OpenShell\\StartMenu");
if (m_pParent->m_Items[m_ParentIndex].id==MENU_PROGRAMS)
regKey.SetQWORDValue(L"LastProgramsTime",curTime);
@@ -7544,7 +7544,7 @@ HWND CMenuContainer::ToggleStartMenu( int taskbarId, bool bKeyboard, bool bAllPr
s_bWin7Style=GetSettingInt(L"MenuStyle")==MENU_WIN7;
if (!s_StartMenuMsg)
s_StartMenuMsg=RegisterWindowMessage(L"Menu.StartMenuMsg");
s_StartMenuMsg=RegisterWindowMessage(L"OpenShellMenu.StartMenuMsg");
s_StartMenuParams.uEdge=0xFFFFFFFF;
s_TaskBarId=taskbarId;
TaskbarInfo *taskBar=GetTaskbarInfo(taskbarId);
@@ -8728,8 +8728,8 @@ void CMenuContainer::SetMenuMode( TMenuMode mode, bool bKeyboard )
ULONGLONG curTime;
GetSystemTimeAsFileTime((FILETIME*)&curTime);
CRegKey regKey;
if (regKey.Open(HKEY_CURRENT_USER,L"Software\\OpenShell\\Menu",KEY_WRITE)!=ERROR_SUCCESS)
regKey.Create(HKEY_CURRENT_USER,L"Software\\OpenShell\\Menu");
if (regKey.Open(HKEY_CURRENT_USER,L"Software\\OpenShell\\StarMenu",KEY_WRITE)!=ERROR_SUCCESS)
regKey.Create(HKEY_CURRENT_USER,L"Software\\OpenShell\\StartMenu");
regKey.SetQWORDValue(L"LastProgramsTime",curTime);
if (s_OldMenuState.mode!=MODE_SEARCH)
m_pProgramsTree->SetFocus();

2
Src/StartMenu/StartMenuDLL/MenuContainer.h
View File

@@ -993,7 +993,7 @@ private:
static HRESULT __stdcall CreateAccessible( ComCallData *pData );
static HRESULT __stdcall ReleaseAccessible( ComCallData *pData );
// To control the placement of the start menu, send Menu.StartMenuMsg message right after the start menu is created but before it is displayed
// To control the placement of the start menu, send OpenShellMenu.StartMenuMsg message right after the start menu is created but before it is displayed
// The lParam must point to StartMenuParams
// monitorRect - the entire area available to the start menu (sub-menus will use it). It is usually the monitor area but can be less if the Desktop app is docked in Win8
// uEdge - the location of the taskbar - ABE_BOTTOM, ABE_LEFT, etc

4
Src/StartMenu/StartMenuDLL/ProgramsTree.cpp
View File

@@ -860,8 +860,8 @@ void CProgramsTree::AddMetroApps( std::vector<CTreeItem*> &items )
ULONGLONG curTime;
GetSystemTimeAsFileTime((FILETIME*)&curTime);
CRegKey regKey;
if (regKey.Open(HKEY_CURRENT_USER,L"Software\\OpenShell\\Menu",KEY_WRITE)!=ERROR_SUCCESS)
regKey.Create(HKEY_CURRENT_USER,L"Software\\OpenShell\\Menu");
if (regKey.Open(HKEY_CURRENT_USER,L"Software\\OpenShell\\StartMenu",KEY_WRITE)!=ERROR_SUCCESS)
regKey.Create(HKEY_CURRENT_USER,L"Software\\OpenShell\\StartMenu");
regKey.SetQWORDValue(L"LastAppsTime",curTime);
}

12
Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp
View File

@@ -564,13 +564,13 @@ static void FindTaskBar( void )
{
if (!g_TaskBar)
{
g_StartMenuMsg=RegisterWindowMessage(L"Menu.StartMenuMsg");
g_StartMenuMsg=RegisterWindowMessage(L"OpenShellMenu.StartMenuMsg");
FindTaskBar(GetCurrentProcessId());
if (g_TaskBar)
{
g_HotkeyShiftID=GlobalAddAtom(L"Menu.HotkeyShift");
g_HotkeyCSMID=GlobalAddAtom(L"Menu.HotkeyCSM");
g_HotkeyWSMID=GlobalAddAtom(L"Menu.HotkeyWSM");
g_HotkeyShiftID=GlobalAddAtom(L"OpenShellMenu.HotkeyShift");
g_HotkeyCSMID=GlobalAddAtom(L"OpenShellMenu.HotkeyCSM");
g_HotkeyWSMID=GlobalAddAtom(L"OpenShellMenu.HotkeyWSM");
EnableHotkeys(HOTKEYS_NORMAL);
srand(GetTickCount());
}
@@ -2896,7 +2896,7 @@ static void InitStartMenuDLL( void )
DWORD progThread=GetWindowThreadProcessId(g_ProgWin,NULL);
g_ProgHook=SetWindowsHookEx(WH_GETMESSAGE,HookProgManThread,NULL,progThread);
g_StartHook=SetWindowsHookEx(WH_GETMESSAGE,HookDesktopThread,NULL,GetCurrentThreadId());
HWND hwnd=FindWindow(L"Menu.CStartHookWindow",L"StartHookWindow");
HWND hwnd=FindWindow(L"OpenShellMenu.CStartHookWindow",L"StartHookWindow");
LoadLibrary(L"StartMenuDLL.dll"); // keep the DLL from unloading
if (hwnd) PostMessage(hwnd,WM_CLEAR,0,0); // tell the exe to unhook this hook
if (GetWinVersion()>=WIN_VER_WIN8)
@@ -3120,7 +3120,7 @@ static void CleanStartMenuDLL( void )
CMenuFader::ClearAll();
UnhookDropTarget();
EnableHotkeys(HOTKEYS_CLEAR);
HWND hwnd=FindWindow(L"Menu.CStartHookWindow",L"StartHookWindow");
HWND hwnd=FindWindow(L"OpenShellMenu.CStartHookWindow",L"StartHookWindow");
UnhookWindowsHookEx(g_ProgHook);
UnhookWindowsHookEx(g_StartHook);
if (g_AppManagerHook) UnhookWindowsHookEx(g_AppManagerHook);

2
Src/StartMenu/StartMenuDLL/StartMenuDLL.h
View File

@@ -81,7 +81,7 @@ extern HWND g_ProgWin;
extern HMONITOR g_WSMHMonitor;
extern int g_CurrentCSMTaskbar, g_CurrentWSMTaskbar;
enum TMenuMsgParam // wParam for the Menu.StartMenuMsg message
enum TMenuMsgParam // wParam for the OpenShellMenu.StartMenuMsg message
{
MSG_TOGGLE, // toggles the classic start menu
MSG_TOGGLENEW, // toggles the Windows start menu

4
Src/StartMenu/StartMenuHelper/StartMenuHelper.cpp
View File

@@ -162,7 +162,7 @@ typedef HRESULT (__stdcall *FDllGetClassObject)(REFCLSID,REFIID,LPVOID*);
static HMODULE g_ExplorerModule=NULL;
static void StartMenu( void )
static void StartStartMenu( void )
{
STARTUPINFO startupInfo={sizeof(STARTUPINFO)};
PROCESS_INFORMATION processInfo;
@@ -208,7 +208,7 @@ STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
{
LogToFile(STARTUP_LOG,L"StartMenuHelper: DllGetClassObject2");
if (GetSettingBool(L"AutoStart"))
StartMenu();
StartStartMenu();
FDllGetClassObject func=(FDllGetClassObject)GetProcAddress(g_ExplorerModule,"DllGetClassObject");
if (func)
res=func(g_ExplorerClsid,riid,ppv);

4
Src/Update/Update.cpp
View File

@@ -437,7 +437,7 @@ LRESULT CALLBACK SubclassBalloonProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
class COwnerWindow: public CWindowImpl<COwnerWindow>
{
public:
DECLARE_WND_CLASS_EX(L"Update.COwnerWindow",0,COLOR_MENU)
DECLARE_WND_CLASS_EX(L"OpenShellUpdate.COwnerWindow",0,COLOR_MENU)
// message handlers
BEGIN_MSG_MAP( COwnerWindow )
@@ -478,7 +478,7 @@ int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrC
GetUserObjectInformation(desktop,UOI_NAME,deskName,len,&len);
wchar_t mutexName[1024];
Sprintf(mutexName,_countof(mutexName),L"Update.Mutex.%s.%s",userName,deskName);
Sprintf(mutexName,_countof(mutexName),L"OpenShellUpdate.Mutex.%s.%s",userName,deskName);
free(deskName);
HANDLE hMutex=CreateMutex(NULL,TRUE,mutexName);