From f0aae9db815561d15a71a90d1ec50446664bcea6 Mon Sep 17 00:00:00 2001 From: Lloyd Kinsella Date: Sat, 9 Jul 2016 18:02:38 +0100 Subject: [PATCH] Started menu resource support. Also added extra type checks to the resource classes, will now return null if not the correct type. --- .../Graphics/BitmapResource.cs | 4 +- .../Graphics/CursorGroupResource.cs | 3 + .../Graphics/CursorResource.cs | 3 + .../Graphics/IconGroupResource.cs | 3 + .../Graphics/IconResource.cs | 3 + .../Menus/MenuResource.cs | 163 ++++++++++++++++++ .../StringTableResource.cs | 3 + .../Version/VersionResource.cs | 3 + .../Workshell.PE.Resources.csproj | 1 + 9 files changed, 185 insertions(+), 1 deletion(-) create mode 100644 Src/Workshell.PE.Resources/Menus/MenuResource.cs diff --git a/Src/Workshell.PE.Resources/Graphics/BitmapResource.cs b/Src/Workshell.PE.Resources/Graphics/BitmapResource.cs index 3fb1fa0..4a5e1ef 100644 --- a/Src/Workshell.PE.Resources/Graphics/BitmapResource.cs +++ b/Src/Workshell.PE.Resources/Graphics/BitmapResource.cs @@ -73,8 +73,10 @@ public static BitmapResource Load(Resource resource, uint language) if (!resource.Languages.Contains(language)) return null; - byte[] data = resource.GetBytes(language); + if (resource.Type.Id != ResourceType.RT_BITMAP) + return null; + byte[] data = resource.GetBytes(language); BitmapResource result = new PE.BitmapResource(resource, language, data); return result; diff --git a/Src/Workshell.PE.Resources/Graphics/CursorGroupResource.cs b/Src/Workshell.PE.Resources/Graphics/CursorGroupResource.cs index 709c180..1d3e26e 100644 --- a/Src/Workshell.PE.Resources/Graphics/CursorGroupResource.cs +++ b/Src/Workshell.PE.Resources/Graphics/CursorGroupResource.cs @@ -136,6 +136,9 @@ public static CursorGroupResource Load(Resource resource, uint language) if (!resource.Languages.Contains(language)) return null; + if (resource.Type.Id != ResourceType.RT_GROUP_CURSOR) + return null; + byte[] data = resource.GetBytes(language); MemoryStream mem = resource.Type.Resources.Image.MemoryStreamProvider.GetStream(data); diff --git a/Src/Workshell.PE.Resources/Graphics/CursorResource.cs b/Src/Workshell.PE.Resources/Graphics/CursorResource.cs index cf64531..0ec6850 100644 --- a/Src/Workshell.PE.Resources/Graphics/CursorResource.cs +++ b/Src/Workshell.PE.Resources/Graphics/CursorResource.cs @@ -75,6 +75,9 @@ public static CursorResource Load(Resource resource, uint language) if (!resource.Languages.Contains(language)) return null; + if (resource.Type.Id != ResourceType.RT_CURSOR) + return null; + byte[] data = resource.GetBytes(language); MemoryStream mem = resource.Type.Resources.Image.MemoryStreamProvider.GetStream(data); diff --git a/Src/Workshell.PE.Resources/Graphics/IconGroupResource.cs b/Src/Workshell.PE.Resources/Graphics/IconGroupResource.cs index b5e1b1a..82160e0 100644 --- a/Src/Workshell.PE.Resources/Graphics/IconGroupResource.cs +++ b/Src/Workshell.PE.Resources/Graphics/IconGroupResource.cs @@ -149,6 +149,9 @@ public static IconGroupResource Load(Resource resource, uint language) if (!resource.Languages.Contains(language)) return null; + if (resource.Type.Id != ResourceType.RT_GROUP_ICON) + return null; + byte[] data = resource.GetBytes(language); MemoryStream mem = resource.Type.Resources.Image.MemoryStreamProvider.GetStream(data); diff --git a/Src/Workshell.PE.Resources/Graphics/IconResource.cs b/Src/Workshell.PE.Resources/Graphics/IconResource.cs index 4fd0604..ef92dae 100644 --- a/Src/Workshell.PE.Resources/Graphics/IconResource.cs +++ b/Src/Workshell.PE.Resources/Graphics/IconResource.cs @@ -79,6 +79,9 @@ public static IconResource Load(Resource resource, uint language) if (!resource.Languages.Contains(language)) return null; + if (resource.Type.Id != ResourceType.RT_ICON) + return null; + byte[] data = resource.GetBytes(language); MemoryStream mem = resource.Type.Resources.Image.MemoryStreamProvider.GetStream(data); diff --git a/Src/Workshell.PE.Resources/Menus/MenuResource.cs b/Src/Workshell.PE.Resources/Menus/MenuResource.cs new file mode 100644 index 0000000..004ffad --- /dev/null +++ b/Src/Workshell.PE.Resources/Menus/MenuResource.cs @@ -0,0 +1,163 @@ +#region License +// Copyright(c) 2016, Workshell Ltd +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are met: +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// * Neither the name of Workshell Ltd nor the names of its contributors +// may be used to endorse or promote products +// derived from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +// DISCLAIMED.IN NO EVENT SHALL WORKSHELL BE LIABLE FOR ANY +// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#endregion + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Drawing; +using System.Drawing.Imaging; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +using Workshell.PE.Extensions; +using Workshell.PE.Native; + +namespace Workshell.PE +{ + + public enum MenuSaveFormat + { + Raw, + Resource + } + + public sealed class MenuResource + { + + private Resource resource; + private uint language_id; + + internal MenuResource(Resource sourceResource, uint languageId, byte[] data) + { + resource = sourceResource; + language_id = languageId; + + MemoryStream mem = resource.Type.Resources.Image.MemoryStreamProvider.GetStream(data); + + using (mem) + { + + } + } + + #region Static Methods + + public static MenuResource Load(Resource resource) + { + return Load(resource, Resource.DEFAULT_LANGUAGE); + } + + public static MenuResource Load(Resource resource, uint language) + { + if (!resource.Languages.Contains(language)) + return null; + + if (resource.Type.Id != ResourceType.RT_MENU) + return null; + + byte[] data = resource.GetBytes(language); + MenuResource result = new MenuResource(resource, language, data); + + return result; + } + + #endregion + + #region Methods + + public void Save(string fileName) + { + Save(fileName, MenuSaveFormat.Raw); + } + + public void Save(Stream stream) + { + Save(stream, MenuSaveFormat.Raw); + } + + public void Save(string fileName, MenuSaveFormat format) + { + using (FileStream file = new FileStream(fileName, FileMode.Create, FileAccess.Write, FileShare.None)) + { + Save(file, format); + file.Flush(); + } + } + + public void Save(Stream stream, MenuSaveFormat format) + { + switch (format) + { + case MenuSaveFormat.Raw: + SaveRaw(stream); + break; + case MenuSaveFormat.Resource: + SaveResource(stream); + break; + } + } + + private void SaveRaw(Stream stream) + { + byte[] data = resource.GetBytes(language_id); + + stream.Write(data, 0, data.Length); + } + + private void SaveResource(Stream stream) + { + throw new NotImplementedException(); + } + + #endregion + + #region Properties + + public Resource Resource + { + get + { + return resource; + } + } + + public uint Language + { + get + { + return language_id; + } + } + + #endregion + + } + +} diff --git a/Src/Workshell.PE.Resources/StringTableResource.cs b/Src/Workshell.PE.Resources/StringTableResource.cs index a3ea8bb..bd42677 100644 --- a/Src/Workshell.PE.Resources/StringTableResource.cs +++ b/Src/Workshell.PE.Resources/StringTableResource.cs @@ -183,6 +183,9 @@ public static StringTableResource Load(Resource resource, uint language) if (!resource.Languages.Contains(language)) return null; + if (resource.Type.Id != ResourceType.RT_STRING) + return null; + byte[] data = resource.GetBytes(language); StringTableResource result = new StringTableResource(resource, language, data); diff --git a/Src/Workshell.PE.Resources/Version/VersionResource.cs b/Src/Workshell.PE.Resources/Version/VersionResource.cs index 2e98b4c..81e7957 100644 --- a/Src/Workshell.PE.Resources/Version/VersionResource.cs +++ b/Src/Workshell.PE.Resources/Version/VersionResource.cs @@ -99,6 +99,9 @@ public static VersionResource Load(Resource resource, uint language) if (!resource.Languages.Contains(language)) return null; + if (resource.Type.Id != ResourceType.RT_VERSION) + return null; + byte[] data = resource.GetBytes(language); VersionResource result = new VersionResource(resource, language, data); diff --git a/Src/Workshell.PE.Resources/Workshell.PE.Resources.csproj b/Src/Workshell.PE.Resources/Workshell.PE.Resources.csproj index 9c812a3..02792d3 100644 --- a/Src/Workshell.PE.Resources/Workshell.PE.Resources.csproj +++ b/Src/Workshell.PE.Resources/Workshell.PE.Resources.csproj @@ -48,6 +48,7 @@ +