Forráskód Böngészése

Reorder 'handlers' to be in same order as their guids + add .xz support.

Martijn Laan 3 hónapja
szülő
commit
9b03bf214f
1 módosított fájl, 12 hozzáadás és 10 törlés
  1. 12 10
      Projects/Src/Compression.SevenZipDllDecoder.pas

+ 12 - 10
Projects/Src/Compression.SevenZipDllDecoder.pas

@@ -441,28 +441,30 @@ procedure ExtractArchiveRedir(const DisableFsRedir: Boolean;
   begin
   begin
     if SameText(Ext, '.zip') then
     if SameText(Ext, '.zip') then
       Result := CLSID_HandlerZip
       Result := CLSID_HandlerZip
-    else if SameText(Ext, '.7z') then
-      Result := CLSID_Handler7z
-    else if SameText(Ext, '.rar') then
-      Result := CLSID_HandlerRar
     else if SameText(Ext, '.bzip2') then
     else if SameText(Ext, '.bzip2') then
       Result := CLSID_HandlerBZip2
       Result := CLSID_HandlerBZip2
-    else if SameText(Ext, '.tar') then
-      Result := CLSID_HandlerTar
-    else if SameText(Ext, '.gzip') then
-      Result := CLSID_HandlerGzip
-    else if SameText(Ext, '.iso') then
-      Result := CLSID_HandlerIso
+    else if SameText(Ext, '.rar') then
+      Result := CLSID_HandlerRar
+    else if SameText(Ext, '.7z') then
+      Result := CLSID_Handler7z
     else if SameText(Ext, '.cab') then
     else if SameText(Ext, '.cab') then
       Result := CLSID_HandlerCab
       Result := CLSID_HandlerCab
     else if SameText(Ext, '.lzma') then
     else if SameText(Ext, '.lzma') then
       Result := CLSID_HandlerLzma
       Result := CLSID_HandlerLzma
+    else if SameText(Ext, '.xz') then
+      Result := CLSID_HandlerXz
     else if SameText(Ext, '.wim') then
     else if SameText(Ext, '.wim') then
       Result := CLSID_HandlerWim
       Result := CLSID_HandlerWim
+    else if SameText(Ext, '.iso') then
+      Result := CLSID_HandlerIso
     else if SameText(Ext, '.rpm') then
     else if SameText(Ext, '.rpm') then
       Result := CLSID_HandlerRpm
       Result := CLSID_HandlerRpm
     else if SameText(Ext, '.deb') then
     else if SameText(Ext, '.deb') then
       Result := CLSID_HandlerDeb
       Result := CLSID_HandlerDeb
+    else if SameText(Ext, '.tar') then
+      Result := CLSID_HandlerTar
+    else if SameText(Ext, '.gzip') then
+      Result := CLSID_HandlerGzip
     else
     else
       InternalError('ExtractArchive: Unknown ArchiveFileName extension');
       InternalError('ExtractArchive: Unknown ArchiveFileName extension');
   end;
   end;