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

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)
{