Convert to VC2013 project, begin translating

This commit is contained in:
oldmud0 2015-11-11 21:37:37 -06:00
parent b744ceaa3a
commit f954827a14
15 changed files with 3206 additions and 2926 deletions

20
Backup/LilithPort.sln Normal file
View file

@ -0,0 +1,20 @@

Microsoft Visual Studio Solution File, Format Version 10.00
# Visual C++ Express 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LilithPort", "LilithPort\LilithPort.vcproj", "{9057AFAF-D9A2-4F09-8D35-C39084BA2A87}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{9057AFAF-D9A2-4F09-8D35-C39084BA2A87}.Debug|Win32.ActiveCfg = Debug|Win32
{9057AFAF-D9A2-4F09-8D35-C39084BA2A87}.Debug|Win32.Build.0 = Debug|Win32
{9057AFAF-D9A2-4F09-8D35-C39084BA2A87}.Release|Win32.ActiveCfg = Release|Win32
{9057AFAF-D9A2-4F09-8D35-C39084BA2A87}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

View file

@ -1,7 +1,9 @@

Microsoft Visual Studio Solution File, Format Version 10.00
# Visual C++ Express 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LilithPort", "LilithPort\LilithPort.vcproj", "{9057AFAF-D9A2-4F09-8D35-C39084BA2A87}"
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.40629.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LilithPort", "LilithPort\LilithPort.vcxproj", "{9057AFAF-D9A2-4F09-8D35-C39084BA2A87}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution

View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="shift_jis"?>
<?xml version="1.0" encoding="utf-8"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"

View file

@ -0,0 +1,158 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{9057AFAF-D9A2-4F09-8D35-C39084BA2A87}</ProjectGuid>
<RootNamespace>LilithPort</RootNamespace>
<Keyword>ManagedCProj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<CLRSupport>Pure</CLRSupport>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<CLRSupport>Pure</CLRSupport>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<AdditionalDependencies />
<EnableUAC>false</EnableUAC>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AssemblyDebug>true</AssemblyDebug>
<SubSystem>Windows</SubSystem>
<EntryPointSymbol>main</EntryPointSymbol>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<AdditionalDependencies />
<EnableUAC>false</EnableUAC>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<EntryPointSymbol>main</EntryPointSymbol>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<Reference Include="System">
<CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</Reference>
<Reference Include="System.Data">
<CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</Reference>
<Reference Include="System.Drawing">
<CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</Reference>
<Reference Include="System.Windows.Forms">
<CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</Reference>
<Reference Include="System.Xml">
<CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</Reference>
</ItemGroup>
<ItemGroup>
<ClCompile Include="AssemblyInfo.cpp" />
<ClCompile Include="LilithPort.cpp" />
<ClCompile Include="MainForm.cpp" />
<ClCompile Include="OptionForm.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="MainForm.h">
<FileType>CppForm</FileType>
</ClInclude>
<ClInclude Include="OptionForm.h">
<FileType>CppForm</FileType>
</ClInclude>
<ClInclude Include="resource.h" />
<ClInclude Include="StartupForm.h">
<FileType>CppForm</FileType>
</ClInclude>
<ClInclude Include="stdafx.h" />
</ItemGroup>
<ItemGroup>
<Image Include="app.ico" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="app.rc" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="MainForm.resX">
<DependentUpon>MainForm.h</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="OptionForm.resx">
<DependentUpon>OptionForm.h</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="StartupForm.resx">
<DependentUpon>StartupForm.h</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

View file

@ -0,0 +1,72 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
</Filter>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="AssemblyInfo.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="LilithPort.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="MainForm.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="OptionForm.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="MainForm.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="OptionForm.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="StartupForm.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="stdafx.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="resource.h">
<Filter>Resource Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="app.ico">
<Filter>Resource Files</Filter>
</Image>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="app.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="MainForm.resX">
<Filter>Resource Files</Filter>
</EmbeddedResource>
<EmbeddedResource Include="OptionForm.resx">
<Filter>Resource Files</Filter>
</EmbeddedResource>
<EmbeddedResource Include="StartupForm.resx">
<Filter>Resource Files</Filter>
</EmbeddedResource>
</ItemGroup>
</Project>

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -112,33 +112,33 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="ReloadListToolStripMenuItem.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ReloadListToolStripMenuItem.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="contextMenuStripMember.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<metadata name="contextMenuStripMember.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>127, 17</value>
</metadata>
<metadata name="contextMenuStripLog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<metadata name="contextMenuStripLog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>277, 17</value>
</metadata>
<metadata name="openFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<metadata name="openFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>439, 17</value>
</metadata>
<metadata name="toolTipMember.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<metadata name="toolTipMember.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>571, 17</value>
</metadata>
<metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>713, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAQAMAAAAAAAAAAAAAAAAAAAAA

View file

@ -10,12 +10,12 @@ void OptionForm::SaveOption(bool apply){
try{
FileVersionInfo^ info = FileVersionInfo::GetVersionInfo(textBoxGameExe->Text);
if(info->FileDescription != "格闘ツクール2nd." && info->FileDescription != "2D格闘ツクール95"){
if(info->FileDescription != L"格闘ツクール2nd." && info->FileDescription != L"2D格闘ツクール95"){
throw gcnew Exception;
}
}
catch(Exception^){
textBoxGameExe->Text = gcnew String("格闘ツクールの実行ファイルではありません");
textBoxGameExe->Text = gcnew String(L"Invalid or non-Fighter Maker 95/2002 executable file.");
}
IntPtr mp;
@ -179,23 +179,23 @@ bool OptionForm::CheckTextProfileName(String^ buf){
return true;
}
if(buf->Length == 0){
mes = "プロファイル名が空欄です。";
mes = L"Please enter a name for your profile.";
}
if(buf->Contains(",") || buf->Contains("[") || buf->Contains("]")){
mes = "プロファイル名に使用できない文字(, [ ])が含まれています。";
mes = L"Profile names cannot contain the following characters: \n, [ ]";
}
for(int i=0; i < Profile::SystemSection->Length; i++){
if(buf == Profile::SystemSection[i]){
mes = "そのプロファイル名は使用できません。";
mes = L"This profile name cannot be used.";
}
}
for(int i=0; i < Profile::ProfileList->Count; i++){
if(buf == Profile::ProfileList[i]){
mes = "そのプロファイル名は既に存在します。";
mes = L"This profile name is already in use.";
}
}
if(mes != nullptr){
MessageBox::Show(mes, "プロファイル保存", MessageBoxButtons::OK, MessageBoxIcon::Exclamation);
MessageBox::Show(mes, L"Profile saved!", MessageBoxButtons::OK, MessageBoxIcon::Information);
return true;
}
return false;

File diff suppressed because it is too large Load diff

View file

@ -112,21 +112,21 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="openFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<metadata name="openFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="folderBrowserDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<metadata name="folderBrowserDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>149, 17</value>
</metadata>
<metadata name="colorDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<metadata name="colorDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>310, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAQAMAAAAAAAAAAAAAAAAAAAAA

View file

@ -441,7 +441,7 @@ namespace LilithPort {
// サーバ名チェック
if(textBoxServerName->Text->Length == 0){
MessageBox::Show("サーバ名を入力してください。\n\nSERVERモードで起動するには、\nサーバ名を入力する必要があります。", "SERVERモードエラー", MessageBoxButtons::OK, MessageBoxIcon::Exclamation);
MessageBox::Show(L"サーバ名を入力してください。\n\nSERVERモードで起動するには、\nサーバ名を入力する必要があります。", L"SERVERモードエラー", MessageBoxButtons::OK, MessageBoxIcon::Exclamation);
return;
}
mp = Runtime::InteropServices::Marshal::StringToHGlobalAuto(textBoxServerName->Text);
@ -449,7 +449,7 @@ namespace LilithPort {
Runtime::InteropServices::Marshal::FreeHGlobal(mp);
p2 = _tcschr(p1, _T(','));
if (p2 != NULL){
MessageBox::Show("サーバ名に使用できない文字(,)があります。\nサーバ名を確認してください。", "SERVERモードエラー", MessageBoxButtons::OK, MessageBoxIcon::Exclamation);
MessageBox::Show(L"サーバ名に使用できない文字(,)があります。\nサーバ名を確認してください。", L"SERVERモードエラー", MessageBoxButtons::OK, MessageBoxIcon::Exclamation);
return;
}
}
@ -472,14 +472,14 @@ namespace LilithPort {
// IPチェック
if(MTOPTION.CONNECTION_TYPE == CT_HOST || MTOPTION.CONNECTION_TYPE == CT_CLIENT) {
if(textBoxIP->Text->Length == 0){
MessageBox::Show("接続先アドレスを入力してください。\n\nHOST, CLIENTモードで起動するには、\n接続先のアドレスを入力する必要があります。", "HOST, CLIENTモードエラー", MessageBoxButtons::OK, MessageBoxIcon::Exclamation);
MessageBox::Show(L"接続先アドレスを入力してください。\n\nHOST, CLIENTモードで起動するには、\n接続先のアドレスを入力する必要があります。", L"HOST, CLIENTモードエラー", MessageBoxButtons::OK, MessageBoxIcon::Exclamation);
return;
}
mp = Runtime::InteropServices::Marshal::StringToHGlobalAuto(textBoxIP->Text);
_tcscpy_s(p1, static_cast<PTCHAR>(mp.ToPointer()));
p2 = _tcschr(p1, _T(','));
if (p2 != NULL){
MessageBox::Show("接続先アドレスに使用できない文字(,)があります。\n接続先アドレスを確認してください。", "HOST, CLIENTモードエラー", MessageBoxButtons::OK, MessageBoxIcon::Exclamation);
MessageBox::Show(L"接続先アドレスに使用できない文字(,)があります。\n接続先アドレスを確認してください。", L"HOST, CLIENTモードエラー", MessageBoxButtons::OK, MessageBoxIcon::Exclamation);
return;
}
}
@ -493,7 +493,7 @@ namespace LilithPort {
textBoxName->Text = gcnew String(MTOPTION.NAME);
if(textBoxName->Text->Length == 0){
textBoxName->Text = gcnew String("名無しさん");
textBoxName->Text = gcnew String(L"名無しさん");
}
}

BIN
LilithPort/app.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 894 B

View file

@ -1,3 +1,3 @@
//{{NO_DEPENDENCIES}}
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by app.rc

View file

@ -10,7 +10,7 @@ using namespace System::Collections;
// 落ちる前にエラー内容をロギング
void WriteErrorLog(String^ text, String^ caption)
{
IO::StreamWriter^ sw = gcnew IO::StreamWriter(gcnew String(MTOPTION.PATH) + "error.log", true, Encoding::Default);
IO::StreamWriter^ sw = gcnew IO::StreamWriter(gcnew String(MTOPTION.PATH) + L"error.log", true, Encoding::Default);
try{
sw->WriteLine("-------------------------------------------------------------------------------");
sw->WriteLine("{0} {1} [{2}]", DateTime::Now.ToLongDateString(), DateTime::Now.ToLongTimeString(), caption);
@ -35,7 +35,7 @@ void ApplicationThreadException(Object^ sender, Threading::ThreadExceptionEventA
MTINFO.ERRORED = true;
if(!MTINFO.SERVER_MODE){
MessageBox::Show("突然ですがLilithPort終了のお知らせです。", "緊急事態発生");
MessageBox::Show(L"An error occurred, and LilithPort must exit.\nThe exception has been written to a text file.\n"+e->Exception->ToString(), L"Unhandled thread exception");
}
Application::Exit();
@ -48,7 +48,7 @@ void ApplicationUnhandledException(Object^ sender, UnhandledExceptionEventArgs^
MTINFO.ERRORED = true;
if(!MTINFO.SERVER_MODE){
MessageBox::Show("突然ですがLilithPort終了のお知らせです。", "例外が飛んできました");
MessageBox::Show(L"An error occurred, and LilithPort must exit.\nThe exception has been written to a text file.\n" + safe_cast<Exception^>(e->ExceptionObject)->ToString(), L"Unhandled exception");
}
Application::Exit();
@ -96,7 +96,7 @@ void LoadMTOption()
GetPrivateProfileString(iniSystem, _T("SeekSound"), _T("seek.wav"), MTOPTION.SEEK_SOUND, _MAX_PATH, ini);
GetPrivateProfileString(iniSystem, _T("KeywordSound"), _T("name.wav"), MTOPTION.KEYWORD_SOUND, _MAX_PATH, ini);
GetPrivateProfileString(iniSystem, _T("Keyword"), _T(""), MTOPTION.KEYWORD, MAX_KEYWORD, ini);
GetPrivateProfileString(iniSystem, _T("Name"), _T("名無しさん"), MTOPTION.NAME, MAX_NAME, ini);
GetPrivateProfileString(iniSystem, _T("Name"), _T("NamelessDude"), MTOPTION.NAME, MAX_NAME, ini);
GetPrivateProfileString(iniSystem, _T("Comment"), _T(""), MTOPTION.COMMENT, MAX_NAME, ini);
MTOPTION.CONNECTION_TYPE = GetPrivateProfileInt(iniSystem, _T("ConnectType"), 0, ini);
MTOPTION.PORT = GetPrivateProfileInt(iniSystem, _T("Port"), 7500, ini);
@ -172,7 +172,7 @@ void LoadMTOption()
}
}
catch(Exception^){
MessageBox::Show("ブックマーク情報の読み込みに失敗しました。\n", "ブックマーク読み込み", MessageBoxButtons::OK, MessageBoxIcon::Exclamation);
MessageBox::Show(L"Could not read bookmark information.\n", L"Bookmarks", MessageBoxButtons::OK, MessageBoxIcon::Exclamation);
}
// プロファイルリスト読み込み
@ -380,9 +380,9 @@ void SaveMTOption()
String^ bufProfileList;
for(int i=0; i < Profile::ProfileList->Count; i++){
if(i > 0){
bufProfileList = String::Format("{0},{1}", bufProfileList, Profile::ProfileList[i]);
bufProfileList = String::Format(L"{0},{1}", bufProfileList, Profile::ProfileList[i]);
}else{
bufProfileList = String::Format("{0}{1}", bufProfileList, Profile::ProfileList[i]);
bufProfileList = String::Format(L"{0}{1}", bufProfileList, Profile::ProfileList[i]);
}
}
mp = Runtime::InteropServices::Marshal::StringToHGlobalAuto(bufProfileList);
@ -492,9 +492,9 @@ void SaveProfileOption(){
String^ bufProfileList;
for(int i=0; i < Profile::ProfileList->Count; i++){
if(i > 0){
bufProfileList = String::Format("{0},{1}", bufProfileList, Profile::ProfileList[i]);
bufProfileList = String::Format(L"{0},{1}", bufProfileList, Profile::ProfileList[i]);
}else{
bufProfileList = String::Format("{0}{1}", bufProfileList, Profile::ProfileList[i]);
bufProfileList = String::Format(L"{0}{1}", bufProfileList, Profile::ProfileList[i]);
}
}
mp = Runtime::InteropServices::Marshal::StringToHGlobalAuto(bufProfileList);
@ -675,10 +675,10 @@ String^ EncryptionIP(String^ ip)
ipString = Int64(Net::IPAddress::Parse(ip)->Address).ToString();
}
catch (ArgumentNullException^) {
return "変換失敗。IPぬるぽエラー";
return L"変換失敗。IPぬるぽエラー";
}
catch (FormatException^) {
return "変換失敗。IP形式エラー";
return L"変換失敗。IP形式エラー";
}
array<Byte> ^binaryData = gcnew array<Byte>(11);
@ -689,10 +689,10 @@ String^ EncryptionIP(String^ ip)
ipBase64 = Convert::ToBase64String(binaryData);
}
catch (ArgumentNullException^) {
return "変換失敗。Base64ぬるぽエラー";
return L"変換失敗。Base64ぬるぽエラー";
}
catch (FormatException^) {
return "変換失敗。Base64形式エラー";
return L"変換失敗。Base64形式エラー";
}
return ipBase64;
}
@ -700,8 +700,8 @@ String^ EncryptionIP(String^ ip)
String^ MTEncryptionIP(String^ ip)
{
String^ result, ^buf, ^part;
String^ dic = "そぞただちぢっつづてでとどなにぬねのはばabcdefghijklmnopqrstuvwxyz"
"ABCDEFGHIJKLMNOPQRSTUVWXYGぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜ";
String^ dic = L"そぞただちぢっつづてでとどなにぬねのはばabcdefghijklmnopqrstuvwxyz"
L"ABCDEFGHIJKLMNOPQRSTUVWXYGぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜ";
try{
// 10桁+シード
@ -719,7 +719,7 @@ String^ MTEncryptionIP(String^ ip)
return result;
}
catch(Exception^){
return "IPアドレスのMTSP変換に失敗しました。";
return L"IPアドレスのMTSP変換に失敗しました。";
}
}
@ -752,17 +752,17 @@ _int64 MTDecryptionIP(String^ cipher_ip)
String^ buf;
TCHAR part;
int index;
String^ dic = "そぞただちぢっつづてでとどなにぬねのはばabcdefghijklmnopqrstuvwxyz"
"ABCDEFGHIJKLMNOPQRSTUVWXYGぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜ";
String^ dic = L"そぞただちぢっつづてでとどなにぬねのはばabcdefghijklmnopqrstuvwxyz"
L"ABCDEFGHIJKLMNOPQRSTUVWXYGぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜ";
try{
for(int i=0; i < cipher_ip->Length; i++){
part = cipher_ip->default[i];
index = dic->IndexOf(part);
if(index < 10){
buf = String::Format("{0}0{1}", buf, index);
buf = String::Format(L"{0}0{1}", buf, index);
}else{
buf = String::Format("{0}{1}", buf, index);
buf = String::Format(L"{0}{1}", buf, index);
}
}
return ((Convert::ToInt64(buf) ^ 0xe5c06811) - 0xa68c8b5);