WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-09-23 06:53:43 +00:00
Code Issues Projects Releases Wiki Activity

Improve PICT compatibility, add batch mode to gpr2gpa

Browse Source
This commit is contained in:
elasota
2020-05-17 17:54:58 -04:00
parent 35308e41f3
commit 153213e079
19 changed files with 870 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
unpacktool/unpacktool.cpp
View File

@@ -22,6 +22,7 @@
#include "CompactProLZHRLEDecompressor.h"
#include "CSInputBuffer.h"
#include "WindowsUnicodeToolShim.h"
#include <string.h>
@@ -92,84 +93,6 @@ StuffItParser g_stuffItParser;
StuffIt5Parser g_stuffIt5Parser;
CompactProParser g_compactProParser;
std::string ConvertWStringToUTF8(const wchar_t *str)
{
size_t strLength = wcslen(str);
std::string result;
for (size_t i = 0; i < strLength; )
{
size_t charsDigested = 0;
uint32_t codePoint = 0;
uint8_t asUTF8[4];
if (!PortabilityLayer::UTF16Processor::DecodeCodePoint(reinterpret_cast<const uint16_t*>(str) + i, strLength - i, charsDigested, codePoint))
return "";
i += charsDigested;
size_t bytesEmitted = 0;
PortabilityLayer::UTF8Processor::EncodeCodePoint(asUTF8, bytesEmitted, codePoint);
result.append(reinterpret_cast<const char*>(asUTF8), bytesEmitted);
}
return result;
}
std::wstring ConvertUTF8ToWString(const char *str)
{
size_t strLength = strlen(str);
std::wstring result;
for (size_t i = 0; i < strLength; )
{
size_t charsDigested = 0;
uint32_t codePoint = 0;
uint16_t asUTF16[4];
if (!PortabilityLayer::UTF8Processor::DecodeCodePoint(reinterpret_cast<const uint8_t*>(str) + i, strLength - i, charsDigested, codePoint))
return L"";
i += charsDigested;
size_t codePointsEmitted = 0;
PortabilityLayer::UTF16Processor::EncodeCodePoint(asUTF16, codePointsEmitted, codePoint);
result.append(reinterpret_cast<const wchar_t*>(asUTF16), codePointsEmitted);
}
return result;
}
FILE *fopen_utf8(const char *path, const char *options)
{
std::wstring pathUTF16 = ConvertUTF8ToWString(path);
std::wstring optionsUTF16 = ConvertUTF8ToWString(options);
return _wfopen(pathUTF16.c_str(), optionsUTF16.c_str());
}
int mkdir_utf8(const char *path)
{
std::wstring pathUTF16 = ConvertUTF8ToWString(path);
return _wmkdir(pathUTF16.c_str());
}
void TerminateDirectoryPath(std::string &path)
{
const size_t length = path.length();
if (length == 0)
path.append("\\");
else
{
const char lastChar = path[path.length() - 1];
if (lastChar != '\\' && lastChar != '/')
path.append("\\");
}
}
std::string LegalizeWindowsFileName(const std::string &path)
{
const size_t length = path.length();
@@ -441,7 +364,7 @@ int ExtractItem(int depth, const ArchiveItem &item, const std::string &dirPath,
for (int i = 0; i < depth; i++)
printf(" ");
fputws(ConvertUTF8ToWString(path.data()).c_str(), stdout);
fputs_utf8(path.c_str(), stdout);
printf("\n");
path = LegalizeWindowsFileName(path);
@@ -479,7 +402,7 @@ int RecursiveExtractFiles(int depth, ArchiveItemList *itemList, const std::strin
return 0;
}
int unpackMain(int argc, const char **argv)
int toolMain(int argc, const char **argv)
{
if (argc != 3)
{
@@ -537,30 +460,3 @@ int unpackMain(int argc, const char **argv)
return returnCode;
}
int main(int argc, const char **argv)
{
LPWSTR *szArglist;
int nArgs;
int i;
szArglist = CommandLineToArgvW(GetCommandLineW(), &nArgs);
std::vector<std::string> utf8ArgStrings;
std::vector<const char *> utf8Args;
utf8ArgStrings.resize(nArgs);
utf8Args.resize(nArgs);
for (int i = 0; i < nArgs; i++)
{
utf8ArgStrings[i] = ConvertWStringToUTF8(szArglist[i]);
utf8Args[i] = utf8ArgStrings[i].c_str();
}
const char **args = nullptr;
if (nArgs)
args = &utf8Args[0];
return unpackMain(nArgs, args);
}

7
unpacktool/unpacktool.vcxproj
View File

@@ -61,24 +61,28 @@
<Import Project="..\PortabilityLayer.props" />
<Import Project="..\Common.props" />
<Import Project="..\MacRomanConversion.props" />
<Import Project="..\WindowsUnicodeToolShim.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\PortabilityLayer.props" />
<Import Project="..\Common.props" />
<Import Project="..\MacRomanConversion.props" />
<Import Project="..\WindowsUnicodeToolShim.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\PortabilityLayer.props" />
<Import Project="..\Common.props" />
<Import Project="..\MacRomanConversion.props" />
<Import Project="..\WindowsUnicodeToolShim.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\PortabilityLayer.props" />
<Import Project="..\Common.props" />
<Import Project="..\MacRomanConversion.props" />
<Import Project="..\WindowsUnicodeToolShim.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
@@ -186,6 +190,9 @@
<ProjectReference Include="..\PortabilityLayer\PortabilityLayer.vcxproj">
<Project>{6ec62b0f-9353-40a4-a510-3788f1368b33}</Project>
</ProjectReference>
<ProjectReference Include="..\WindowsUnicodeToolShim\WindowsUnicodeToolShim.vcxproj">
<Project>{15009625-1120-405e-8bba-69a16cd6713d}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">