SetupHelper: Try to terminate ClassicShell Start Menu (to make upgrade a bit easier)

During upgrade from ClassicShell we'll try to terminate
ClassicStartMenu.exe as well. So that installer won't complain about files
being in use.
This commit is contained in:
ge0rdi
2018-08-18 21:42:50 +02:00
committed by ge0rdi
parent 45ab50e022
commit a16729129a

View File

@@ -8,14 +8,12 @@
#include <atlstr.h> #include <atlstr.h>
#include "ResourceHelper.h" #include "ResourceHelper.h"
HINSTANCE g_hInstance;
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
int ExitStartMenu( void ) int ExitStartMenu(const wchar_t* regPath, const wchar_t* exeName, const wchar_t* updaterClass)
{ {
HKEY hKey=NULL; HKEY hKey=NULL;
if (RegCreateKeyEx(HKEY_LOCAL_MACHINE,L"SOFTWARE\\OpenShell\\OpenShell",0,NULL,REG_OPTION_NON_VOLATILE,KEY_READ|KEY_QUERY_VALUE|KEY_WOW64_64KEY,NULL,&hKey,NULL)==ERROR_SUCCESS) if (RegCreateKeyEx(HKEY_LOCAL_MACHINE,regPath,0,NULL,REG_OPTION_NON_VOLATILE,KEY_READ|KEY_QUERY_VALUE|KEY_WOW64_64KEY,NULL,&hKey,NULL)==ERROR_SUCCESS)
{ {
DWORD type=0; DWORD type=0;
wchar_t path[_MAX_PATH]; wchar_t path[_MAX_PATH];
@@ -25,7 +23,7 @@ int ExitStartMenu( void )
STARTUPINFO startupInfo={sizeof(startupInfo)}; STARTUPINFO startupInfo={sizeof(startupInfo)};
PROCESS_INFORMATION processInfo; PROCESS_INFORMATION processInfo;
memset(&processInfo,0,sizeof(processInfo)); memset(&processInfo,0,sizeof(processInfo));
wcscat_s(path,L"StartMenu.exe"); wcscat_s(path,exeName);
HANDLE h=CreateFile(path,GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL); HANDLE h=CreateFile(path,GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
if (h!=INVALID_HANDLE_VALUE) if (h!=INVALID_HANDLE_VALUE)
{ {
@@ -41,12 +39,23 @@ int ExitStartMenu( void )
} }
RegCloseKey(hKey); RegCloseKey(hKey);
} }
HWND updateOwner=FindWindow(L"OpenShellUpdate.COwnerWindow",NULL); HWND updateOwner=FindWindow(updaterClass,NULL);
if (updateOwner) if (updateOwner)
PostMessage(updateOwner,WM_CLEAR,0,0); PostMessage(updateOwner,WM_CLEAR,0,0);
return 0; return 0;
} }
int ExitStartMenu()
{
// terminate Open-Shell Start Menu in clean way
ExitStartMenu(L"SOFTWARE\\OpenShell\\OpenShell", L"StartMenu.exe", L"OpenShellUpdate.COwnerWindow");
// try to terminate also ClassicShell Start Menu (to make upgrade a bit easier)
ExitStartMenu(L"SOFTWARE\\IvoSoft\\ClassicShell", L"ClassicStartMenu.exe", L"ClassicShellUpdate.COwnerWindow");
return 0;
}
int FixVersion( void ) int FixVersion( void )
{ {
HKEY hKey=NULL; HKEY hKey=NULL;
@@ -74,8 +83,6 @@ int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrC
wchar_t *const *params=CommandLineToArgvW(lpstrCmdLine,&count); wchar_t *const *params=CommandLineToArgvW(lpstrCmdLine,&count);
if (!params) return 1; if (!params) return 1;
g_hInstance=hInstance;
for (;count>0;count--,params++) for (;count>0;count--,params++)
{ {
if (_wcsicmp(params[0],L"exitSM")==0) if (_wcsicmp(params[0],L"exitSM")==0)