Update to 7-Zip 17.00 Beta

This commit is contained in:
Tino Reichardt
2017-04-30 14:14:14 +02:00
parent 54389d6e2f
commit aa5ba75da0
451 changed files with 15746 additions and 8574 deletions
+11 -15
View File
@@ -25,14 +25,14 @@
#include "ContextMenu.h"
static LPCTSTR k_ShellExtName = TEXT("7-Zip-ZStandard Shell Extension");
static LPCTSTR k_Approved = TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved");
static LPCTSTR const k_ShellExtName = TEXT("7-Zip-ZStandard Shell Extension");
static LPCTSTR const k_Approved = TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved");
// {23170F69-40C1-278A-1000-000100020000}
#ifdef NEED_7ZIP_GUID
static LPCTSTR k_Clsid = TEXT("{23170F69-40C1-278A-1000-000100020001}");
static LPCTSTR const k_Clsid = TEXT("{23170F69-40C1-278A-1000-000100020001}");
#else
static LPCTSTR k_Clsid = TEXT("{23170F69-0803-278A-1000-000100020001}");
static LPCTSTR const k_Clsid = TEXT("{23170F69-0803-278A-1000-000100020001}");
#endif
DEFINE_GUID(CLSID_CZipContextMenu,
@@ -159,9 +159,8 @@ static BOOL RegisterServer()
return FALSE;
const UString modulePathU = fs2us(modulePath);
CSysString clsidString = k_Clsid;
CSysString s = TEXT("CLSID\\");
s += clsidString;
CSysString s ("CLSID\\");
s += k_Clsid;
{
NRegistry::CKey key;
@@ -181,7 +180,7 @@ static BOOL RegisterServer()
{
NRegistry::CKey key;
if (key.Create(HKEY_LOCAL_MACHINE, k_Approved, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE) == NOERROR)
key.SetValue(clsidString, k_ShellExtName);
key.SetValue(k_Clsid, k_ShellExtName);
}
return TRUE;
@@ -194,13 +193,10 @@ STDAPI DllRegisterServer(void)
static BOOL UnregisterServer()
{
const CSysString clsidString = k_Clsid;
CSysString s = TEXT("CLSID\\");
s += clsidString;
CSysString s2 = s;
s2.AddAscii("\\InprocServer32");
CSysString s ("CLSID\\");
s += k_Clsid;
RegDeleteKey(HKEY_CLASSES_ROOT, s2);
RegDeleteKey(HKEY_CLASSES_ROOT, s + TEXT("\\InprocServer32"));
RegDeleteKey(HKEY_CLASSES_ROOT, s);
#if !defined(_WIN64) && !defined(UNDER_CE)
@@ -210,7 +206,7 @@ static BOOL UnregisterServer()
HKEY hKey;
if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, k_Approved, 0, KEY_SET_VALUE, &hKey) == NOERROR)
{
RegDeleteValue(hKey, clsidString);
RegDeleteValue(hKey, k_Clsid);
RegCloseKey(hKey);
}
}