Mk2Rev1

various bugfixes and such.
also bookmarks, temp song loaderm and undo overhaul with near complete multiplayer, but menu items disabled. i really wish i could split this into multiple commits, but i don't know how to work unreal.

Plugins/ZipUtility-ue4/ThirdParty/7zpp/Include/7zpp.h

@@ -0,0 +1,46 @@
+#pragma once
+
+#include "ListCallback.h"
+#include "ProgressCallback.h"
+
+#include "PreWindowsApi.h"
+#include "AllowWindowsPlatformTypes.h"
+#include "AllowWindowsPlatformAtomics.h"
+
+#pragma warning(push)
+#pragma warning(disable: 4191)
+#pragma warning(disable: 4996)
+
+#ifndef DeleteFile
+#define DeleteFile DeleteFileW
+#endif
+#ifndef MoveFile
+#define MoveFile MoveFileW
+#endif
+
+#ifndef LoadString
+#define LoadString LoadStringW
+#endif
+
+#ifndef GetMessage
+#define GetMessage GetMessageW
+#endif
+
+#include <atlbase.h>
+#include <sphelper.h>
+
+#undef DeleteFile
+#undef MoveFile
+
+#include "SevenZipCompressor.h"
+#include "SevenZipExtractor.h"
+#include "SevenZipLister.h"
+
+#include "HideWindowsPlatformAtomics.h"
+#include "HideWindowsPlatformTypes.h"
+#include "PostWindowsApi.h"
+#pragma warning(pop)
+
+// Version of this library
+#define SEVENZIP_VERSION L"0.2.0-20160117.1"
+#define SEVENZIP_BRANCH L"master"

Plugins/ZipUtility-ue4/ThirdParty/7zpp/Include/CompressionFormat.h

@@ -0,0 +1,31 @@
+#pragma once
+
+
+#include "Enum.h"
+
+
+namespace SevenZip
+{
+	struct CompressionFormat
+	{
+		enum _Enum
+		{
+			Unknown,
+			SevenZip,
+			Zip,
+			GZip,
+			BZip2,
+			Rar,
+			Tar,
+			Iso,
+			Cab,
+			Lzma,
+			Lzma86
+		};
+	
+		typedef intl::EnumerationDefinitionNoStrings _Definition;
+		typedef intl::EnumerationValue< _Enum, _Definition, Unknown > _Value;
+	};
+	
+	typedef CompressionFormat::_Value CompressionFormatEnum;
+}

Plugins/ZipUtility-ue4/ThirdParty/7zpp/Include/CompressionLevel.h

@@ -0,0 +1,23 @@
+#pragma once
+
+
+#include "Enum.h"
+
+
+namespace SevenZip
+{
+	struct CompressionLevel
+	{
+		enum _Enum
+		{
+			None,
+			Fast,
+			Normal
+		};
+	
+		typedef intl::EnumerationDefinitionNoStrings _Definition;
+		typedef intl::EnumerationValue< _Enum, _Definition, Normal > _Value;
+	};
+	
+	typedef CompressionLevel::_Value CompressionLevelEnum;
+}

Plugins/ZipUtility-ue4/ThirdParty/7zpp/Include/Enum.h

@@ -0,0 +1,193 @@
+#pragma once
+
+
+//
+// ###### To create an enum call MyType with string support: ######
+//
+//// MyType.h
+//struct MyType
+//{
+//	enum _Enum
+//	{
+//		Unknown,
+//		Foo,
+//		Bar
+//	};
+//
+//	struct _Definition : public EnumerationDefinition< _Enum, _Definition > { static StringValue Strings[]; };
+//	typedef EnumerationValue< _Enum, _Definition, Unknown > _Value;
+//};
+//
+//typedef MyType::_Value MyTypeEnum;
+//
+//
+//// MyType.cpp
+//#include "MyType.h"
+//
+//MyType::_Definition::StringValue MyType::_Definition::Strings[] =
+//{
+//	{ MyType::Foo, _T( "Foo" ) },
+//	{ MyType::Bar, _T( "Bar" ) },
+//	{ MyType::Unknown, NULL }
+//};
+//
+//
+// ###### To create an enum call MyType without string support: ######
+//
+//// MyType.h
+//struct MyType
+//{
+//	enum _Enum
+//	{
+//		Unknown,
+//		Foo,
+//		Bar
+//	};
+//
+//	typedef EnumerationDefinitionNoStrings _Definition;
+//	typedef EnumerationValue< _Enum, _Definition, Unknown > _Value;
+//};
+//
+//typedef MyType::_Value MyTypeEnum;
+//
+
+
+namespace SevenZip
+{
+namespace intl
+{
+	template < typename TEnum, class DerivedDef >
+	struct EnumerationDefinition
+	{
+		struct StringValue
+		{
+			TEnum			value;
+			const TCHAR*	string;
+		};
+
+		static TEnum Parse( const TString& string, const TEnum defaultValue )
+		{
+			const StringValue* it = DerivedDef::Strings;
+			for (; it->string != NULL; ++it )
+			{
+				if ( string.Compare( it->string ) == 0 )
+				{
+					return it->value;
+				}
+			}
+			return defaultValue;
+		}
+
+		static TString Format( const TEnum& value )
+		{
+			const StringValue* it = DerivedDef::Strings;
+			for (; it->string != NULL; ++it )
+			{
+				if ( value == it->value )
+				{
+					return it->string;
+				}
+			}
+			return TString();
+		}
+	};
+
+
+	struct EnumerationDefinitionNoStrings {};
+
+
+	template < typename TEnum, class TEnumClass, TEnum DefaultValue >
+	class EnumerationValue
+	{
+	private:
+
+		typedef typename EnumerationValue< TEnum, TEnumClass, DefaultValue > ThisClass;
+
+		TEnum m_value;
+
+	public:
+
+		typedef typename TEnum Enum;
+
+		EnumerationValue():
+			m_value( DefaultValue )
+		{}
+
+		EnumerationValue( const TEnum& value ):
+			m_value( value )
+		{}
+
+		static ThisClass Parse( const TString& string )
+		{
+			return ThisClass( TEnumClass::Parse( string, DefaultValue ) );
+		}
+
+		const TEnum& GetValue() const
+		{
+			return m_value;
+		}
+
+		TString GetString() const
+		{
+			return TEnumClass::Format( m_value );
+		}
+	
+		operator TEnum() const
+		{
+			return m_value;
+		}
+	
+		ThisClass& operator=( const TEnum& value )
+		{
+			m_value = value;
+			return *this;
+		}
+
+		bool operator==( const ThisClass& that ) const
+		{
+			return that.m_value == m_value;
+		}
+
+		bool operator!=( const ThisClass& that ) const
+		{
+			return !operator==( that );
+		}
+
+		bool operator==( const TEnum& value ) const
+		{
+			return value == m_value;
+		}
+
+		bool operator!=( const TEnum& value ) const
+		{
+			return !operator==( value );
+		}
+
+		bool operator< ( const ThisClass& that ) const
+		{
+			return m_value < that.m_value;
+		}
+
+		// Bit field members
+		void AddFlag( const TEnum& value )
+		{
+			*reinterpret_cast< int* >( &m_value ) |= static_cast< int >( value );
+		}
+
+		void RemoveFlag( const TEnum& value )
+		{
+			*reinterpret_cast< int* >( &m_value ) &= ~static_cast< int >( value );
+		}
+
+		bool HasFlag( const TEnum& value ) const
+		{
+			return ( m_value & value ) == value;
+		}
+
+		bool HasAnyFlag( const TEnum& valueCombo ) const
+		{
+			return ( m_value & valueCombo ) != 0;
+		}
+	};
+}
+}

Plugins/ZipUtility-ue4/ThirdParty/7zpp/Include/FileInfo.h

@@ -0,0 +1,24 @@
+#pragma once
+
+
+namespace SevenZip
+{
+namespace intl
+{
+	struct FileInfo
+	{
+		TString		FileName;
+		FILETIME	LastWriteTime;
+		FILETIME	CreationTime;
+		FILETIME	LastAccessTime;
+		ULONGLONG	Size;
+		UINT		Attributes;
+		bool		IsDirectory;
+	};
+
+	struct FilePathInfo : public FileInfo
+	{
+		TString		FilePath;
+	};
+}
+}

Plugins/ZipUtility-ue4/ThirdParty/7zpp/Include/ListCallback.h

@@ -0,0 +1,23 @@
+#pragma once
+
+
+#include "SevenZipLibrary.h"
+#include "CompressionFormat.h"
+
+
+namespace SevenZip
+{
+	class ListCallback
+	{
+	public:
+		/*
+		Called for each file found in the archive. Size in bytes.
+		*/
+		virtual void OnFileFound(const TString& archivePath, const TString& filePath, int size) {}
+
+		/*
+		Called when all the files have been listed
+		*/
+		virtual void OnListingDone(const TString& archivePath) {}
+	};
+}

Plugins/ZipUtility-ue4/ThirdParty/7zpp/Include/ProgressCallback.h

@@ -0,0 +1,40 @@
+#pragma once
+
+
+#include "SevenZipLibrary.h"
+#include "CompressionFormat.h"
+
+
+namespace SevenZip
+{
+	class ProgressCallback
+	{
+	public:
+
+		/*
+		Called at beginning
+		*/
+		virtual void OnStartWithTotal(const TString& archivePath, unsigned __int64 totalBytes) = 0;
+
+		/*
+		Called Whenever progress has updated with a bytes complete
+		*/
+		virtual void OnProgress(const TString& archivePath, unsigned __int64 bytesCompleted) = 0;
+
+
+		/*
+		Called When progress has reached 100%
+		*/
+		virtual void OnDone(const TString& archivePath) = 0;
+
+		/*
+		Called When single file progress has reached 100%, returns the filepath that completed
+		*/
+		virtual void OnFileDone(const TString& archivePath, const TString& filePath, unsigned __int64 bytesCompleted) = 0;
+
+		/*
+		Called to determine if it's time to abort the zip operation. Return true to abort the current operation.
+		*/
+		virtual bool OnCheckBreak() = 0;
+	};
+}

Plugins/ZipUtility-ue4/ThirdParty/7zpp/Include/SevenString.h

@@ -0,0 +1,15 @@
+#pragma once
+
+
+#include <tchar.h>
+#include <string>
+
+
+namespace SevenZip
+{
+#ifdef _UNICODE
+	typedef std::wstring TString;
+#else
+	typedef std::string TString;
+#endif
+}

Plugins/ZipUtility-ue4/ThirdParty/7zpp/Include/SevenZipArchive.h

@@ -0,0 +1,48 @@
+#pragma once
+
+#include "SevenZipLibrary.h"
+#include <atlbase.h>
+#include "FileInfo.h"
+#include "CompressionFormat.h"
+#include "CompressionLevel.h"
+
+namespace SevenZip
+{
+	class SevenZipArchive
+	{
+	public:
+		SevenZipArchive(const SevenZipLibrary& library, const TString& archivePath);
+		virtual ~SevenZipArchive();
+
+		virtual bool ReadInArchiveMetadata();
+
+		virtual void SetCompressionFormat(const CompressionFormatEnum& format);
+		virtual CompressionFormatEnum GetCompressionFormat();
+
+		virtual void SetCompressionLevel(const CompressionLevelEnum& level);
+		virtual CompressionLevelEnum GetCompressionLevel();
+
+		virtual bool DetectCompressionFormat();
+
+		virtual size_t GetNumberOfItems();
+		virtual std::vector<TString> GetItemsNames();
+		virtual std::vector<size_t>  GetOrigSizes();
+
+	protected:
+		bool m_ReadMetadata = false;
+		bool m_OverrideCompressionFormat = false;
+		const SevenZipLibrary& m_library;
+		TString m_archivePath;
+		CompressionFormatEnum m_compressionFormat;
+		CompressionLevelEnum m_compressionLevel;
+		size_t m_numberofitems = 0;
+		std::vector<TString> m_itemnames;
+		std::vector<size_t> m_origsizes;
+
+	private:
+		bool pri_GetNumberOfItems();
+		bool pri_GetItemsNames();
+		bool pri_DetectCompressionFormat(CompressionFormatEnum & format);
+		bool pri_DetectCompressionFormat();
+	};
+}

Plugins/ZipUtility-ue4/ThirdParty/7zpp/Include/SevenZipCompressor.h

@@ -0,0 +1,43 @@
+#pragma once
+
+
+#include <vector>
+#include <atlbase.h>
+#include "SevenZipLibrary.h"
+#include "SevenZipArchive.h"
+#include "FileInfo.h"
+#include "CompressionFormat.h"
+#include "CompressionLevel.h"
+#include "ProgressCallback.h"
+
+
+namespace SevenZip
+{
+	class SevenZipCompressor : public SevenZipArchive
+	{
+	public:
+
+		SevenZipCompressor( const SevenZipLibrary& library, const TString& archivePath );
+		virtual ~SevenZipCompressor();
+
+		// Includes the last directory as the root in the archive, e.g. specifying "C:\Temp\MyFolder"
+		// makes "MyFolder" the single root item in archive with the files within it included.
+		virtual bool CompressDirectory( const TString& directory, ProgressCallback* callback, bool includeSubdirs = true);
+
+		// Excludes the last directory as the root in the archive, its contents are at root instead. E.g.
+		// specifying "C:\Temp\MyFolder" make the files in "MyFolder" the root items in the archive.
+		virtual bool CompressFiles( const TString& directory, const TString& searchFilter, ProgressCallback* callback, bool includeSubdirs = true );
+		virtual bool CompressAllFiles( const TString& directory, ProgressCallback* callback, bool includeSubdirs = true );
+
+		// Compress just this single file as the root item in the archive.
+		virtual bool CompressFile( const TString& filePath, ProgressCallback* callback);
+
+	private:
+		TString m_outputPath;					//the final compression result compression path. Used for tracking in callbacks
+		CComPtr< IStream > OpenArchiveStream();
+		bool FindAndCompressFiles(	const TString& directory, const TString& searchPattern, 
+									const TString& pathPrefix, bool recursion, ProgressCallback* callback);
+		bool CompressFilesToArchive(const TString& pathPrefix, const std::vector< intl::FilePathInfo >& filePaths, ProgressCallback* callback);
+		bool SetCompressionProperties( IUnknown* outArchive );
+	};
+}

Plugins/ZipUtility-ue4/ThirdParty/7zpp/Include/SevenZipException.h

@@ -0,0 +1,30 @@
+#pragma once
+
+
+#include <exception>
+#include "SevenString.h"
+#include "AllowWindowsPlatformTypes.h"
+
+namespace SevenZip
+{
+	TString StrFmt(const TCHAR* format, ...);
+	TString GetWinErrMsg(const TString& contextMessage, DWORD lastError);
+	TString GetCOMErrMsg(const TString& contextMessage, HRESULT lastError);
+
+	class SevenZipException
+	{
+	protected:
+
+		TString m_message;
+
+	public:
+
+		SevenZipException();
+		SevenZipException(const TString& message);
+		virtual ~SevenZipException();
+
+		const TString& GetMessage() const;
+	};
+}
+
+#include "HideWindowsPlatformTypes.h"

Plugins/ZipUtility-ue4/ThirdParty/7zpp/Include/SevenZipExtractor.h

@@ -0,0 +1,25 @@
+#pragma once
+
+
+#include "SevenZipLibrary.h"
+#include "SevenZipArchive.h"
+#include "CompressionFormat.h"
+#include "ProgressCallback.h"
+
+
+namespace SevenZip
+{
+	class SevenZipExtractor : public SevenZipArchive
+	{
+	public:
+
+		SevenZipExtractor( const SevenZipLibrary& library, const TString& archivePath );
+		virtual ~SevenZipExtractor();
+
+		virtual bool ExtractArchive(const TString& directory, ProgressCallback* callback);
+		virtual bool ExtractFilesFromArchive(const unsigned int* fileIndices, const unsigned int numberFiles, const TString& directory, ProgressCallback* callback);
+	private:
+
+		bool ExtractFilesFromArchive(const CComPtr< IStream >& archiveStream, const unsigned int* fileIndices, const unsigned int numberFiles, const TString& directory, ProgressCallback* callback);
+	};
+}

Plugins/ZipUtility-ue4/ThirdParty/7zpp/Include/SevenZipLibrary.h

@@ -0,0 +1,28 @@
+#pragma once
+
+#include "SevenZipException.h"
+#include "CompressionFormat.h"
+
+namespace SevenZip
+{
+	class SevenZipLibrary
+	{
+	private:
+
+		typedef UINT32 (WINAPI * CreateObjectFunc)( const GUID* clsID, const GUID* interfaceID, void** outObject );
+
+		HMODULE				m_dll;
+		CreateObjectFunc	m_func;
+
+	public:
+
+		SevenZipLibrary();
+		~SevenZipLibrary();
+
+		bool Load();
+		bool Load( const TString& libraryPath );
+		void Free();
+
+		bool CreateObject( const GUID& clsID, const GUID& interfaceID, void** outObject ) const;
+	};
+}

Plugins/ZipUtility-ue4/ThirdParty/7zpp/Include/SevenZipLister.h

@@ -0,0 +1,24 @@
+#pragma once
+
+#include "SevenZipLibrary.h"
+#include "SevenZipArchive.h"
+#include "CompressionFormat.h"
+#include "ListCallback.h"
+
+
+namespace SevenZip
+{
+	class SevenZipLister : public SevenZipArchive
+	{
+	public:
+		TString m_archivePath;
+
+		SevenZipLister( const SevenZipLibrary& library, const TString& archivePath );
+		virtual ~SevenZipLister();
+
+		virtual bool ListArchive(ListCallback* callback);
+
+	private:
+		bool ListArchive(const CComPtr< IStream >& archiveStream, ListCallback* callback);
+	};
+}