9.219.21

1 files changed, 16 insertions, 31 deletions

diff --git a/CPP/7zip/UI/FileManager/RegistryAssociations.h b/CPP/7zip/UI/FileManager/RegistryAssociations.h
index 5390b9db..0be8244e 100755
--- a/CPP/7zip/UI/FileManager/RegistryAssociations.h
+++ b/CPP/7zip/UI/FileManager/RegistryAssociations.h
@@ -1,46 +1,31 @@
 // RegistryAssociations.h
 
-#ifndef __REGISTRYASSOCIATIONS_H
-#define __REGISTRYASSOCIATIONS_H
+#ifndef __REGISTRY_ASSOCIATIONS_H
+#define __REGISTRY_ASSOCIATIONS_H
 
 #include "Common/MyString.h"
 
-namespace NRegistryAssociations {
+namespace NRegistryAssoc {
 
-  /*
-  struct CExtInfo
+  struct CShellExtInfo
   {
-    UString Ext;
-    UStringVector Plugins;
-    // bool Enabled;
-  };
-  bool ReadInternalAssociation(const wchar_t *ext, CExtInfo &extInfo);
-  void ReadInternalAssociations(CObjectVector<CExtInfo> &items);
-  void WriteInternalAssociations(const CObjectVector<CExtInfo> &items);
-  */
+    CSysString ProgramKey;
+    UString IconPath;
+    int IconIndex;
 
-  bool CheckShellExtensionInfo(const CSysString &extension, UString &iconPath, int &iconIndex);
+    bool ReadFromRegistry(HKEY hkey, const CSysString &ext);
+    bool IsIt7Zip() const;
+  };
 
-  // void ReadCompressionInfo(NZipSettings::NCompression::CInfo &anInfo,
-  void DeleteShellExtensionInfo(const CSysString &extension);
+  LONG DeleteShellExtensionInfo(HKEY hkey, const CSysString &ext);
 
-  void AddShellExtensionInfo(const CSysString &extension,
+  LONG AddShellExtensionInfo(HKEY hkey,
+      const CSysString &ext,
       const UString &programTitle,
       const UString &programOpenCommand,
-      const UString &iconPath, int iconIndex,
-      const void *shellNewData, int shellNewDataSize);
-
-
-  ///////////////////////////
-  // ContextMenu
-  /*
-  bool CheckContextMenuHandler();
-  void AddContextMenuHandler();
-  void DeleteContextMenuHandler();
-  */
-
+      const UString &iconPath, int iconIndex
+      // , const void *shellNewData, int shellNewDataSize
+      );
 }
 
-// bool GetProgramDirPrefix(CSysString &aFolder);
-
 #endif