Working on BeefInstall

BeefLibs/corlib/src/System/String.bf

@@ -1685,22 +1685,22 @@ namespace System
 			return EqualsHelper(a.Ptr, b.Ptr, a.mLength);
 		}
 
-		public bool StartsWith(String b, StringComparison comparisonType = StringComparison.Ordinal)
+		public bool StartsWith(StringView b, StringComparison comparisonType = StringComparison.Ordinal)
 		{
-			if (mLength < b.mLength)
+			if (mLength < b.[Friend]mLength)
 				return false;
 			if (comparisonType == StringComparison.OrdinalIgnoreCase)
 				return EqualsIgnoreCaseHelper(this.Ptr, b.Ptr, b.Length);
-			return EqualsHelper(this.Ptr, b.Ptr, b.mLength);
+			return EqualsHelper(this.Ptr, b.Ptr, b.[Friend]mLength);
 		}
 
-		public bool EndsWith(String b, StringComparison comparisonType = StringComparison.Ordinal)
+		public bool EndsWith(StringView b, StringComparison comparisonType = StringComparison.Ordinal)
 		{
-			if (mLength < b.mLength)
+			if (mLength < b.[Friend]mLength)
 				return false;
 			if (comparisonType == StringComparison.OrdinalIgnoreCase)
-				return EqualsIgnoreCaseHelper(Ptr + mLength - b.mLength, b.Ptr, b.mLength);
+				return EqualsIgnoreCaseHelper(Ptr + mLength - b.[Friend]mLength, b.Ptr, b.[Friend]mLength);
-			return EqualsHelper(this.Ptr + mLength - b.mLength, b.Ptr, b.mLength);
+			return EqualsHelper(this.Ptr + mLength - b.[Friend]mLength, b.Ptr, b.[Friend]mLength);
 		}
 
 		public bool EndsWith(char8 c)

BeefTools/BeefInstall/BeefProj.toml

@@ -3,3 +3,9 @@ FileVersion = 1
 [Project]
 Name = "BeefInstall"
 StartupObject = "BeefInstall.Program"
+
+[ProjectFolder]
+
+[[ProjectFolder.Items]]
+Type = "Source"
+Path = "../../IDE/src/util/Zip.bf"

BeefTools/BeefInstall/BeefSpace.toml

@@ -1,5 +1,6 @@
 FileVersion = 1
 Projects = {BeefInstall = {Path = "."}}
+Unlocked = ["corlib"]
 
 [Workspace]
 StartupProject = "BeefInstall"

BeefTools/BeefInstall/BeefSpace_User.toml

@@ -0,0 +1,136 @@
+FileVersion = 1
+LastConfig = "Debug"
+LastPlatform = "Win64"
+RecentFilesList = ["c:\\Beef\\BeefTools\\BeefInstall\\src\\Program.bf", "c:\\Beef\\IDE\\src\\util\\Zip.bf", "c:\\beef\\BeefLibs\\corlib\\src\\System\\String.bf"]
+
+[MainWindow]
+X = 148
+Y = 85
+Width = 1724
+Height = 1830
+
+[MainDockingFrame]
+Type = "DockingFrame"
+SplitType = 2
+
+[[MainDockingFrame.DockedWidgets]]
+RequestedWidth = 350.0
+RequestedHeight = 200.0
+SizePriority = 200.0
+Type = "DockingFrame"
+SplitType = 1
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets]]
+RequestedWidth = 200.0
+RequestedHeight = 200.0
+Type = "TabbedView"
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets.Tabs]]
+Active = true
+TabLabel = "Workspace"
+TabWidth = 115.0
+Type = "ProjectPanel"
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets]]
+IsFillWidget = true
+Permanent = true
+RequestedWidth = 150.0
+RequestedHeight = 150.0
+SizePriority = 150.0
+DefaultDocumentsTabbedView = true
+Type = "TabbedView"
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets.Tabs]]
+TabLabel = "String.bf"
+TabWidth = 89.0
+Type = "SourceViewPanel"
+FilePath = "c:\\beef\\BeefLibs\\corlib\\src\\System\\String.bf"
+CursorPos = 41778
+VertPos = 24600.0
+ProjectName = "corlib"
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets.Tabs]]
+TabLabel = "Zip.bf"
+TabWidth = 63.0
+Type = "SourceViewPanel"
+FilePath = "c:\\Beef\\IDE\\src\\util\\Zip.bf"
+CursorPos = 3000
+VertPos = 540.0
+ProjectName = "BeefInstall"
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets.Tabs]]
+Active = true
+TabLabel = "Program.bf"
+TabWidth = 96.0
+Type = "SourceViewPanel"
+FilePath = "c:\\Beef\\BeefTools\\BeefInstall\\src\\Program.bf"
+CursorPos = 1398
+ProjectName = "BeefInstall"
+
+[[MainDockingFrame.DockedWidgets]]
+RequestedWidth = 250.0
+RequestedHeight = 250.0
+Type = "DockingFrame"
+SplitType = 1
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets]]
+RequestedWidth = 250.0
+RequestedHeight = 250.0
+SizePriority = 0.5
+Type = "TabbedView"
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets.Tabs]]
+TabLabel = "Memory"
+TabWidth = 99.0
+Type = "MemoryPanel"
+AutoResize = "Auto_Mul8"
+RequestedWidth = 300.0
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets.Tabs]]
+TabLabel = "Watch"
+TabWidth = 86.0
+Type = "WatchPanel"
+Columns = [{Width = 200.0}, {Width = 200.0}, {Width = 200.0}]
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets.Tabs]]
+Active = true
+TabLabel = "Auto"
+TabWidth = 77.0
+Type = "AutoWatchPanel"
+Columns = [{Width = 200.0}, {Width = 200.0}, {Width = 200.0}]
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets]]
+RequestedWidth = 250.0
+RequestedHeight = 250.0
+SizePriority = 0.5
+Type = "TabbedView"
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets.Tabs]]
+TabLabel = "Find Results"
+TabWidth = 119.0
+Type = "FindResultsPanel"
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets.Tabs]]
+TabLabel = "Threads"
+TabWidth = 97.0
+Type = "ThreadPanel"
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets.Tabs]]
+TabLabel = "Call Stack"
+TabWidth = 105.0
+Type = "CallStackPanel"
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets.Tabs]]
+TabLabel = "Immediate"
+TabWidth = 111.0
+Type = "ImmediatePanel"
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets.Tabs]]
+Active = true
+TabLabel = "Output"
+TabWidth = 90.0
+Type = "OutputPanel"
+
+[DebuggerDisplayTypes.""]
+IntDisplayType = "Default"
+MmDisplayType = "Default"

BeefTools/BeefInstall/src/Program.bf

@@ -1,4 +1,6 @@
 using System;
+using IDE.Util;
+using System.IO;
 
 namespace BeefInstall
 {
@@ -34,8 +36,49 @@ namespace BeefInstall
 			}
 		}
 
+		Result<void> ExtractTo(ZipFile zipFile, StringView destDir, StringView subStr)
+		{
+			String fileName = scope .();
+			String destPath = scope .();
+
+			for (int i < zipFile.GetNumFiles())
+			{
+				ZipFile.Entry entry = scope .();
+				if (zipFile.SelectEntry(i, entry) case .Err)
+					continue;
+
+				fileName.Clear();
+				entry.GetFileName(fileName);
+
+				if (!fileName.StartsWith(subStr))
+					continue;
+
+				destPath.Clear();
+				destPath.Append(destDir);
+				destPath.Append('/');
+				destPath.Append(fileName);
+
+				if (entry.IsDirectory)
+				{
+					if (Directory.CreateDirectory(destPath) case .Err)
+						return .Err;
+				}
+				else
+				{
+					if (entry.ExtractToFile(destPath) case .Err)
+						return .Err;
+				}
+			}
+
+			return .Ok;
+		}
+
 		void Run()
 		{
+			ZipFile zipFile = scope .();
+			zipFile.Open(@"c:\\temp\\build_1827.zip");
+			ExtractTo(zipFile, @"c:\temp\unzip", .());
+
 			CabFile cabFile = scope .();
 			cabFile.Init();
 			cabFile.Copy();

IDE/BeefProj.toml

@@ -27,7 +27,7 @@ TargetDirectory = "$(WorkspaceDir)/dist"
 TargetName = "BeefIDE_d"
 OtherLinkFlags = "$(LinkFlags) Comdlg32.lib kernel32.lib user32.lib advapi32.lib shell32.lib IDEHelper64_d.lib BeefySysLib64_d.lib"
 CLibType = "Dynamic"
-DebugCommandArguments = "-proddir=C:\\Beef\\IDE"
+DebugCommandArguments = "-proddir=C:\\Beef\\BeefTools\\BeefInstall"
 DebugWorkingDirectory = "c:\\Beef\\IDE\\Tests\\EmptyTest"
 EnvironmentVars = ["_NO_DEBUG_HEAP=1"]
 

IDE/BeefSpace_User.toml

@@ -0,0 +1,151 @@
+FileVersion = 1
+LastConfig = "Debug"
+LastPlatform = "Win64"
+RecentFilesList = ["c:\\beef\\ide\\src\\util\\Zip.bf", "c:\\beef\\ide\\src\\ui\\AutoComplete.bf"]
+
+[MainWindow]
+X = 679
+Y = 504
+Width = 2487
+Height = 1554
+
+[MainDockingFrame]
+Type = "DockingFrame"
+SplitType = 2
+
+[[MainDockingFrame.DockedWidgets]]
+RequestedWidth = 350.0
+RequestedHeight = 200.0
+SizePriority = 200.0
+Type = "DockingFrame"
+SplitType = 1
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets]]
+RequestedWidth = 200.0
+RequestedHeight = 200.0
+Type = "TabbedView"
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets.Tabs]]
+Active = true
+TabLabel = "Workspace"
+TabWidth = 115.0
+Type = "ProjectPanel"
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets]]
+IsFillWidget = true
+Permanent = true
+RequestedWidth = 150.0
+RequestedHeight = 150.0
+SizePriority = 150.0
+DefaultDocumentsTabbedView = true
+Type = "TabbedView"
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets.Tabs]]
+Active = true
+TabLabel = "Zip.bf"
+TabWidth = 73.0
+Type = "SourceViewPanel"
+FilePath = "c:\\beef\\ide\\src\\util\\Zip.bf"
+CursorPos = 2802
+VertPos = 780.0
+ProjectName = "IDE"
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets.Tabs]]
+TabLabel = "AutoComplete.bf"
+TabWidth = 138.0
+Type = "SourceViewPanel"
+FilePath = "c:\\beef\\ide\\src\\ui\\AutoComplete.bf"
+CursorPos = 3588
+VertPos = 2205.0
+ProjectName = "IDE"
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets.Tabs]]
+TabLabel = "Disassembly"
+TabWidth = 122.0
+Type = "DisassemblyPanel"
+
+[[MainDockingFrame.DockedWidgets]]
+RequestedWidth = 250.0
+RequestedHeight = 553.0
+Type = "DockingFrame"
+SplitType = 1
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets]]
+RequestedWidth = 250.0
+RequestedHeight = 250.0
+SizePriority = 0.443346
+Type = "TabbedView"
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets.Tabs]]
+TabLabel = "Profile"
+TabWidth = 87.0
+Type = "ProfilePanel"
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets.Tabs]]
+TabLabel = "Breakpoints"
+TabWidth = 118.0
+Type = "BreakpointPanel"
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets.Tabs]]
+TabLabel = "Memory"
+TabWidth = 99.0
+Type = "MemoryPanel"
+AutoResize = "Auto_Mul8"
+RequestedWidth = 104.0
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets.Tabs]]
+Active = true
+TabLabel = "Watch"
+TabWidth = 86.0
+Type = "WatchPanel"
+Columns = [{Width = 306.0}, {Width = 675.0}, {Width = 200.0}]
+Items = [""]
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets.Tabs]]
+TabLabel = "Auto"
+TabWidth = 77.0
+Type = "AutoWatchPanel"
+Columns = [{Width = 200.0}, {Width = 442.0}, {Width = 200.0}]
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets]]
+RequestedWidth = 910.0
+RequestedHeight = 793.0
+SizePriority = 0.203422
+Type = "TabbedView"
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets.Tabs]]
+Active = true
+TabLabel = "Immediate"
+TabWidth = 111.0
+Type = "ImmediatePanel"
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets]]
+RequestedWidth = 250.0
+RequestedHeight = 250.0
+SizePriority = 0.353232
+Type = "TabbedView"
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets.Tabs]]
+TabLabel = "Find Results"
+TabWidth = 119.0
+Type = "FindResultsPanel"
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets.Tabs]]
+TabLabel = "Threads"
+TabWidth = 97.0
+Type = "ThreadPanel"
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets.Tabs]]
+TabLabel = "Call Stack"
+TabWidth = 105.0
+Type = "CallStackPanel"
+
+[[MainDockingFrame.DockedWidgets.DockedWidgets.Tabs]]
+Active = true
+TabLabel = "Output"
+TabWidth = 90.0
+Type = "OutputPanel"
+
+[DebuggerDisplayTypes.""]
+IntDisplayType = "Default"
+MmDisplayType = "Default"

IDE/src/ui/AutoComplete.bf

@@ -241,6 +241,8 @@ namespace IDE.ui
             {
 				if (gApp.mRunningTestScript)
 					return;
+				if (mWidgetWindow == null)
+					return;
 
                 WidgetWindow widgetWindow = (WidgetWindow)evt.mSender;
                 if (!(widgetWindow.mRootWidget is AutoCompleteContent))

IDE/src/util/Zip.bf

@@ -42,18 +42,85 @@ using System.Diagnostics;
 
 namespace IDE.Util
 {
-	class Zip
+	class ZipFile
 	{
-		FileStream mFile ~ delete _;
+		public class Entry
-
-		public Result<void> Open(String fileName)
 		{
-			mFile = new FileStream();
+			ZipFile mZipFile;
-			if (mFile.Open(fileName, .Read) case .Err)
+			MiniZ.ZipArchiveFileStat mFileStat;
+			int32 mFileIdx;
+
+			public bool IsDirectory
 			{
-				DeleteAndNullify!(mFile);
+				get
+				{
+					return MiniZ.ZipReaderIsFileADirectory(&mZipFile.[Friend]mFile, mFileIdx);
+				}
+			}
+
+			public Result<void> ExtractToFile(StringView filePath)
+			{
+				if (!MiniZ.ZipReaderExtractToFile(&mZipFile.[Friend]mFile, mFileIdx, scope String(filePath, .NullTerminate), .None))
+					return .Err;
+				return .Ok;
+			}
+
+			int GetStrLen(char8* ptr, int max)
+			{
+				int i = 0;
+				for (; i < max; i++)
+				{
+					if (ptr[i] == 0)
+						break;
+				}
+				return i;
+			}
+
+			public Result<void> GetFileName(String outFileName)
+			{
+				outFileName.Append(&mFileStat.mFilename, GetStrLen(&mFileStat.mFilename, mFileStat.mFilename.Count));
+				return .Ok;
+			}
+
+			public Result<void> GetComment(String outComment)
+			{
+				outComment.Append(&mFileStat.mComment, GetStrLen(&mFileStat.mComment, mFileStat.mComment.Count));
+				return .Ok;
+			}
+		}
+
+		MiniZ.ZipArchive mFile;
+		bool mInitialized;
+
+		public ~this()
+		{
+			if (mInitialized)
+				MiniZ.ZipReaderEnd(&mFile);
+		}
+
+		public Result<void> Open(StringView fileName)
+		{
+			Debug.Assert(!mInitialized);
+			if (!MiniZ.ZipReaderInitFile(&mFile, scope String(fileName, .NullTerminate), .None))
+				return .Err;
+			mInitialized = true;
+			return .Ok;
+		}
+
+		public int GetNumFiles()
+		{
+			return MiniZ.ZipReaderGetNumFiles(&mFile);
+		}
+
+		public Result<void> SelectEntry(int idx, Entry outEntryInfo)
+		{
+			if (!MiniZ.ZipReaderFileStat(&mFile, (.)idx, &outEntryInfo.[Friend]mFileStat))
+			{
+				outEntryInfo.[Friend]mZipFile = null;
 				return .Err;
 			}
+			outEntryInfo.[Friend]mFileIdx = (.)idx;
+			outEntryInfo.[Friend]mZipFile = this;
 			return .Ok;
 		}
 	}
@@ -192,10 +259,11 @@ namespace IDE.Util
 
 		enum ZipFlags
 		{
-			ZIP_FLAG_CASE_SENSITIVE = 0x0100,
+			None = 0,
-			ZIP_FLAG_IGNORE_PATH = 0x0200,
+			CaseSensitive = 0x0100,
-			ZIP_FLAG_COMPRESSED_DATA = 0x0400,
+			IgnorePath = 0x0200,
-			ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY = 0x0800
+			CompressedData = 0x0400,
+			DoNotSortCentralDirectory = 0x0800
 		}
 
 		[CLink, StdCall]
@@ -2906,7 +2974,7 @@ namespace IDE.Util
 			int64 cur_file_ofs;
 			uint8* p;
 			uint32[4096 / sizeof(uint32)] buf_u32; uint8* pBuf = (uint8*)&buf_u32;
-			bool sort_central_dir = !flags.HasFlag(.ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY);
+			bool sort_central_dir = !flags.HasFlag(.DoNotSortCentralDirectory);
 			// Basic sanity checks - reject files which are too small, and check the first 4 bytes of the file to make sure a local header is there.
 			if (pZip.m_archive_size < ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE)
 				return false;
@@ -3101,7 +3169,7 @@ namespace IDE.Util
 			return (m_bit_flag & 1) != 0;
 		}
 
-		static bool zip_reader_is_file_a_directory(ZipArchive* pZip, int32 file_index)
+		public static bool ZipReaderIsFileADirectory(ZipArchive* pZip, int32 file_index)
 		{
 			uint32 filename_len, external_attr;
 			uint8* p = ZipReaderGetCdh(pZip, file_index);
@@ -3179,7 +3247,7 @@ namespace IDE.Util
 		static bool zip_reader_string_equal(char8* pA, char8* pB, int32 len, ZipFlags flags)
 		{
 			int32 i;
-			if (flags.HasFlag(.ZIP_FLAG_CASE_SENSITIVE))
+			if (flags.HasFlag(.CaseSensitive))
 				return 0 == Internal.MemCmp(pA, pB, len);
 			for (i = 0; i < len; ++i)
 				if (pA[i].ToLower != pB[i].ToLower)
@@ -3235,7 +3303,7 @@ namespace IDE.Util
 			int32 file_index; int32 name_len, comment_len;
 			if ((pZip == null) || (pZip.m_pState == null) || (pName == null) || (pZip.m_zip_mode != .Reading))
 				return -1;
-			if (((!flags.HasFlag(.ZIP_FLAG_IGNORE_PATH) && !flags.HasFlag(.ZIP_FLAG_CASE_SENSITIVE))) && (pComment == null) && (pZip.m_pState.m_sorted_central_dir_offsets.m_size != 0))
+			if (((!flags.HasFlag(.IgnorePath) && !flags.HasFlag(.CaseSensitive))) && (pComment == null) && (pZip.m_pState.m_sorted_central_dir_offsets.m_size != 0))
 				return zip_reader_locate_file_binary_search(pZip, pName);
 			name_len = Internal.CStrLen(pName); if (name_len > 0xFFFF) return -1;
 			comment_len = (pComment != null) ? Internal.CStrLen(pComment) : 0; if (comment_len > 0xFFFF) return -1;
@@ -3253,7 +3321,7 @@ namespace IDE.Util
 					if ((file_comment_len != comment_len) || (!zip_reader_string_equal(pComment, pFile_comment, file_comment_len, flags)))
 						continue;
 				}
-				if ((flags.HasFlag(.ZIP_FLAG_IGNORE_PATH)) && (filename_len != 0))
+				if ((flags.HasFlag(.IgnorePath)) && (filename_len != 0))
 				{
 					int32 ofs = filename_len - 1;
 					repeat
@@ -3292,7 +3360,7 @@ namespace IDE.Util
 
 			// Entry is a subdirectory (I've seen old zips with dir entries which have compressed deflate data which inflates to 0 bytes, but these entries claim to uncompress to 512 bytes in the headers).
 			// I'm torn how to handle this case - should it fail instead?
-			if (zip_reader_is_file_a_directory(pZip, file_index))
+			if (ZipReaderIsFileADirectory(pZip, file_index))
 				return true;
 
 			// Encryption and patch files are not supported.
@@ -3300,11 +3368,11 @@ namespace IDE.Util
 				return false;
 
 			// This function only supports stored and deflate.
-			if ((!flags.HasFlag(.ZIP_FLAG_COMPRESSED_DATA)) && (file_stat.mMethod != 0) && (file_stat.mMethod != DEFLATED))
+			if ((!flags.HasFlag(.CompressedData)) && (file_stat.mMethod != 0) && (file_stat.mMethod != DEFLATED))
 				return false;
 
 			// Ensure supplied output buffer is large enough.
-			needed_size = (int64)((flags.HasFlag(.ZIP_FLAG_COMPRESSED_DATA)) ? file_stat.mCompSize : file_stat.mUncompSize);
+			needed_size = (int64)((flags.HasFlag(.CompressedData)) ? file_stat.mCompSize : file_stat.mUncompSize);
 			if (buf_size < needed_size)
 				return false;
 
@@ -3319,12 +3387,12 @@ namespace IDE.Util
 			if ((cur_file_ofs + (int64)file_stat.mCompSize) > pZip.m_archive_size)
 				return false;
 
-			if ((flags.HasFlag(.ZIP_FLAG_COMPRESSED_DATA)) || (file_stat.mMethod == 0))
+			if ((flags.HasFlag(.CompressedData)) || (file_stat.mMethod == 0))
 			{
 			  // The file is stored or the caller has requested the compressed data.
 				if (pZip.m_pRead(pZip.m_pIO_opaque, cur_file_ofs, pBuf, (int)needed_size) != needed_size)
 					return false;
-				return (flags.HasFlag(.ZIP_FLAG_COMPRESSED_DATA)) || (crc32(CRC32_INIT, (uint8*)pBuf, (int)file_stat.mUncompSize) == file_stat.mCrc32);
+				return (flags.HasFlag(.CompressedData)) || (crc32(CRC32_INIT, (uint8*)pBuf, (int)file_stat.mUncompSize) == file_stat.mCrc32);
 			}
 
 			// Decompress the file either directly from memory or from a file input buffer.
@@ -3428,7 +3496,7 @@ namespace IDE.Util
 			comp_size = ReadLE32!(p + ZIP_CDH_COMPRESSED_SIZE_OFS);
 			uncomp_size = ReadLE32!(p + ZIP_CDH_DECOMPRESSED_SIZE_OFS);
 
-			alloc_size = (flags.HasFlag(.ZIP_FLAG_COMPRESSED_DATA)) ? comp_size : uncomp_size;
+			alloc_size = (flags.HasFlag(.CompressedData)) ? comp_size : uncomp_size;
 			if (alloc_size > 0x7FFFFFFF)
 				return null;
 			if (null == (pBuf = pZip.m_pAlloc(pZip.m_pAlloc_opaque, 1, (int)alloc_size)))
@@ -3472,7 +3540,7 @@ namespace IDE.Util
 
 			// Entry is a subdirectory (I've seen old zips with dir entries which have compressed deflate data which inflates to 0 bytes, but these entries claim to uncompress to 512 bytes in the headers).
 			// I'm torn how to handle this case - should it fail instead?
-			if (zip_reader_is_file_a_directory(pZip, file_index))
+			if (ZipReaderIsFileADirectory(pZip, file_index))
 				return true;
 
 			// Encryption and patch files are not supported.
@@ -3480,7 +3548,7 @@ namespace IDE.Util
 				return false;
 
 			// This function only supports stored and deflate.
-			if ((!(flags.HasFlag(.ZIP_FLAG_COMPRESSED_DATA))) && (file_stat.mMethod != 0) && (file_stat.mMethod != DEFLATED))
+			if ((!(flags.HasFlag(.CompressedData))) && (file_stat.mMethod != 0) && (file_stat.mMethod != DEFLATED))
 				return false;
 
 			// Read and parse the local directory entry.
@@ -3510,7 +3578,7 @@ namespace IDE.Util
 				comp_remaining = file_stat.mCompSize;
 			}
 
-			if ((flags.HasFlag(.ZIP_FLAG_COMPRESSED_DATA)) || (file_stat.mMethod == 0))
+			if ((flags.HasFlag(.CompressedData)) || (file_stat.mMethod == 0))
 			{
 			  // The file is stored or the caller has requested the compressed data.
 				if (pZip.m_pState.m_pMem != null)
@@ -3519,7 +3587,7 @@ namespace IDE.Util
 						return false;
 					if (pCallback(pOpaque, out_buf_ofs, pRead_buf, (int)file_stat.mCompSize) != file_stat.mCompSize)
 						status = .Failed;
-					else if (!(flags.HasFlag(.ZIP_FLAG_COMPRESSED_DATA)))
+					else if (!(flags.HasFlag(.CompressedData)))
 						file_crc32 = (uint32)crc32(file_crc32, (uint8*)pRead_buf, (int)file_stat.mCompSize);
 					cur_file_ofs += file_stat.mCompSize;
 					out_buf_ofs += file_stat.mCompSize;
@@ -3536,7 +3604,7 @@ namespace IDE.Util
 							break;
 						}
 
-						if (!(flags.HasFlag(.ZIP_FLAG_COMPRESSED_DATA)))
+						if (!(flags.HasFlag(.CompressedData)))
 							file_crc32 = (uint32)crc32(file_crc32, (uint8*)pRead_buf, (int)read_buf_avail);
 
 						if (pCallback(pOpaque, out_buf_ofs, pRead_buf, (int)read_buf_avail) != read_buf_avail)
@@ -3599,7 +3667,7 @@ namespace IDE.Util
 				}
 			}
 
-			if ((status == .Done) && (!(flags.HasFlag(.ZIP_FLAG_COMPRESSED_DATA))))
+			if ((status == .Done) && (!(flags.HasFlag(.CompressedData))))
 			{
 			  // Make sure the entire file was decompressed, and check its CRC.
 				if ((out_buf_ofs != file_stat.mUncompSize) || (file_crc32 != file_stat.mCrc32))
@@ -3990,7 +4058,7 @@ namespace IDE.Util
 			if ((int32)level_and_flags < 0)
 				level_and_flags = (ZipFlags)CompressionLevel.DEFAULT_LEVEL;
 			level = (CompressionLevel)((int32)level_and_flags & 0xF);
-			store_data_uncompressed = ((level == 0) || (level_and_flags.HasFlag(.ZIP_FLAG_COMPRESSED_DATA)));
+			store_data_uncompressed = ((level == 0) || (level_and_flags.HasFlag(.CompressedData)));
 
 			if ((pZip == null) || (pZip.m_pState != null) || (pZip.m_zip_mode != .Writing) || ((buf_size != 0) && (pBuf == null)) ||
 				(pArchive_name == null) || ((comment_size != 0) && (pComment == null)) || (pZip.m_total_files == 0xFFFF) || (level > .UBER_COMPRESSION))
@@ -3998,7 +4066,7 @@ namespace IDE.Util
 
 			pState = pZip.m_pState;
 
-			if ((!(level_and_flags.HasFlag(.ZIP_FLAG_COMPRESSED_DATA))) && (uncomp_size != 0))
+			if ((!(level_and_flags.HasFlag(.CompressedData))) && (uncomp_size != 0))
 				return false;
 		  // No zip64 support yet
 			if ((buf_size > 0xFFFFFFFF) || (uncomp_size > 0xFFFFFFFF))
@@ -4056,7 +4124,7 @@ namespace IDE.Util
 			}
 			cur_archive_file_ofs += archive_name_size;
 
-			if (!(level_and_flags.HasFlag(.ZIP_FLAG_COMPRESSED_DATA)))
+			if (!(level_and_flags.HasFlag(.CompressedData)))
 			{
 				uncomp_crc32 = (uint32)crc32(CRC32_INIT, (uint8*)pBuf, buf_size);
 				uncomp_size = buf_size;
@@ -4078,7 +4146,7 @@ namespace IDE.Util
 				cur_archive_file_ofs += buf_size;
 				comp_size = buf_size;
 
-				if (level_and_flags.HasFlag(.ZIP_FLAG_COMPRESSED_DATA))
+				if (level_and_flags.HasFlag(.CompressedData))
 					method = DEFLATED;
 			}
 			else if (buf_size != 0)
@@ -4142,7 +4210,7 @@ namespace IDE.Util
 
 			if ((pZip == null) || (pZip.m_pState == null) || (pZip.m_zip_mode != .Writing) || (pArchive_name == null) || ((comment_size != 0) && (pComment == null)) || (level > .UBER_COMPRESSION))
 				return false;
-			if (level_and_flags.HasFlag(.ZIP_FLAG_COMPRESSED_DATA))
+			if (level_and_flags.HasFlag(.CompressedData))
 				return false;
 			if (!zip_writer_validate_archive_name(pArchive_name))
 				return false;
@@ -4568,7 +4636,7 @@ namespace IDE.Util
 			else
 			{
 			  // Append to an existing archive.
-				if (!ZipReaderInitFile(&zip_archive, pZip_filename, level_and_flags | .ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY))
+				if (!ZipReaderInitFile(&zip_archive, pZip_filename, level_and_flags | .DoNotSortCentralDirectory))
 					return false;
 				if (!zip_writer_init_from_reader(&zip_archive, pZip_filename))
 				{
@@ -4603,7 +4671,7 @@ namespace IDE.Util
 				return null;
 
 			zip_archive = default;
-			if (!ZipReaderInitFile(&zip_archive, pZip_filename, flags | .ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY))
+			if (!ZipReaderInitFile(&zip_archive, pZip_filename, flags | .DoNotSortCentralDirectory))
 				return null;
 
 			if ((file_index = zip_reader_locate_file(&zip_archive, pArchive_name, null, flags)) >= 0)