diff --git a/src/shared/utils.pas b/src/shared/utils.pas
index 16006052e826e21e09f2f0cdfd1cc3247f095864..f4b9c8971cc3c898cc45e20adbcdec80964bf043 100644 (file)
--- a/src/shared/utils.pas
+++ b/src/shared/utils.pas
// adds ".wad" extension if filename doesn't have one of ".wad", ".pk3", ".zip"
function addWadExtension (const fn: AnsiString): AnsiString;
+// check wad signature
+function isWadData (data: Pointer; len: LongWord): Boolean;
+
// convert number to strig with nice commas
function int64ToStrComma (i: Int64): AnsiString;
if not hasWadExtension(result) then result := result+'.wad';
end;
+function isWadData (data: Pointer; len: LongWord): Boolean;
+ var p: PChar;
+begin
+ p := PChar(data);
+ Result :=
+ (* ZIP *)
+ ((len > 3) and (p[0] = 'P') and (p[1] = 'K') and (p[2] = #03) and (p[3] = #04)) or
+ ((len > 3) and (p[0] = 'P') and (p[1] = 'K') and (p[2] = #05) and (p[3] = #06)) or
+ (* PACK *)
+ ((len > 3) and (p[0] = 'P') and (p[1] = 'A') and (p[2] = 'C') and (p[3] = 'K')) or
+ ((len > 3) and (p[0] = 'S') and (p[1] = 'P') and (p[2] = 'A') and (p[3] = 'K')) or
+ (* DFWAD *)
+ ((len > 5) and (p[0] = 'D') and (p[1] = 'F') and (p[2] = 'W') and (p[3] = 'A') and (p[4] = 'D') and (p[5] = #01))
+end;
+
function isWadPath (const fn: AnsiString): Boolean;
var
end;
-const fileExtensions: array [0..6] of AnsiString = ('.wad', '.dfzip', '.dfwad', '.pk3', '.pak', '.zip', '.dfz');
+const fileExtensions: array [0..6] of AnsiString = ('.dfz', '.wad', '.dfwad', '.pk3', '.pak', '.zip', '.dfzip');
function findDiskWad (fname: AnsiString): AnsiString;
var
function openDiskFileRO (pathname: AnsiString): TStream;
begin
- if not findFileCI(pathname) then raise Exception.Create('can''t open file "'+pathname+'"');
+ if not findFileCI(pathname) then raise EFileNotFoundException.Create('can''t open file "'+pathname+'"');
result := TFileStream.Create(pathname, fmOpenRead or {fmShareDenyWrite}fmShareDenyNone);
end;