Skip to content

Commit

Permalink
Important bug fix.
Browse files Browse the repository at this point in the history
  • Loading branch information
OtakuNekoP committed Jan 2, 2017
1 parent c57ffd5 commit fc64014
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 23 deletions.
Binary file modified sunxi-fex-tools-gui4win/.vs/sunxi-fex-tools-gui4win/v14/.suo
Binary file not shown.
8 changes: 4 additions & 4 deletions sunxi-fex-tools-gui4win/sunxi-fex-tools-gui4win/Form1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ private void TransFex_Click(object sender, EventArgs e)
{
if (File.Exists(PathBin.Text))
{
Bin2fexCmd = Bin2fex + PathBin.Text + " " + Path.GetDirectoryName(PathBin.Text) + "\\" + Path.GetFileNameWithoutExtension(PathBin.Text) + ".fex";
Bin2fexCmd = Bin2fex + "\"" + PathBin.Text + "\" \"" + Path.GetDirectoryName(PathBin.Text) + "\\" + Path.GetFileNameWithoutExtension(PathBin.Text) + ".fex\"";
try
{
Process proc = Process.Start(Fexc, Bin2fexCmd);
Expand All @@ -62,9 +62,9 @@ private void TransFex_Click(object sender, EventArgs e)

private void TransBin_Click(object sender, EventArgs e)
{
if (File.Exists(PathBin.Text))
if (File.Exists(PathFex.Text))
{
Fex2binCmd = Fex2bin + PathFex.Text + " " + Path.GetDirectoryName(PathFex.Text) + "\\" + Path.GetFileNameWithoutExtension(PathFex.Text) + ".bin";
Fex2binCmd = Fex2bin + "\"" + PathFex.Text + "\" \"" + Path.GetDirectoryName(PathFex.Text) + "\\" + Path.GetFileNameWithoutExtension(PathFex.Text) + ".bin\"";
try
{
Process proc = Process.Start(Fexc, Fex2binCmd);
Expand All @@ -83,7 +83,7 @@ private void TransBin_Click(object sender, EventArgs e)
}
else
{
MessageBox.Show(Resource1.Text_MsgBox_TransBin_fex2binSuccess);
MessageBox.Show(Resource1.Text_MsgBox_TransBin_FexNotFound);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值,
// 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.1.2")]
[assembly: AssemblyFileVersion("1.0.1.2")]
[assembly: AssemblyVersion("1.0.1.3")]
[assembly: AssemblyFileVersion("1.0.1.3")]

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
<data name="Text_MsgBox_About" xml:space="preserve">
<value>About Allwinner Config Transform Tools

Version v1.012
Version v1.013

License:
GPLv2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
<data name="Text_MsgBox_About" xml:space="preserve">
<value>关于 Allwinner 配置档转换工具

版本 v1.012
版本 v1.013

License:
GPLv2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
<assemblyIdentity name="sunxi-fex-tools-gui4win.application" version="1.0.1.2" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
<assemblyIdentity name="sunxi-fex-tools-gui4win.application" version="1.0.1.3" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
<description asmv2:publisher="sunxi-fex-tools-gui4win" asmv2:product="sunxi-fex-tools-gui4win" xmlns="urn:schemas-microsoft-com:asm.v1" />
<deployment install="true" mapFileExtensions="true" />
<compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
<framework targetVersion="4.5.2" profile="Full" supportedRuntime="4.0.30319" />
</compatibleFrameworks>
<dependency>
<dependentAssembly dependencyType="install" codebase="sunxi-fex-tools-gui4win.exe.manifest" size="6057">
<assemblyIdentity name="sunxi-fex-tools-gui4win.exe" version="1.0.1.2" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
<assemblyIdentity name="sunxi-fex-tools-gui4win.exe" version="1.0.1.3" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>5pemwaIx46cYjJsqK0hSwnUWs+JPu+mXhPEW1XBCzYg=</dsig:DigestValue>
<dsig:DigestValue>kgwqS8jmErGliDV4xXuySySROD8O3MxhuhWrkZmlhBw=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
<asmv1:assemblyIdentity name="sunxi-fex-tools-gui4win.exe" version="1.0.1.2" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
<asmv1:assemblyIdentity name="sunxi-fex-tools-gui4win.exe" version="1.0.1.3" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
<description asmv2:iconFile="bananalogo32.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
<application />
<entryPoint>
<assemblyIdentity name="sunxi-fex-tools-gui4win" version="1.0.1.2" language="neutral" processorArchitecture="msil" />
<assemblyIdentity name="sunxi-fex-tools-gui4win" version="1.0.1.3" language="neutral" processorArchitecture="msil" />
<commandLine file="sunxi-fex-tools-gui4win.exe" parameters="" />
</entryPoint>
<trustInfo>
Expand Down Expand Up @@ -44,49 +44,49 @@
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="sunxi-fex-tools-gui4win.exe" size="38400">
<assemblyIdentity name="sunxi-fex-tools-gui4win" version="1.0.1.2" language="neutral" processorArchitecture="msil" />
<assemblyIdentity name="sunxi-fex-tools-gui4win" version="1.0.1.3" language="neutral" processorArchitecture="msil" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>63/Fk3yAHAPGd6yX1LDpItlardZOe3mH+j8YOYOaVw0=</dsig:DigestValue>
<dsig:DigestValue>sybLpbCZmYiSAA5sIGqUL7biGo2bfWsKKK0/jlQ/104=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="en\sunxi-fex-tools-gui4win.resources.dll" size="8704">
<assemblyIdentity name="sunxi-fex-tools-gui4win.resources" version="1.0.1.2" language="en" processorArchitecture="msil" />
<assemblyIdentity name="sunxi-fex-tools-gui4win.resources" version="1.0.1.3" language="en" processorArchitecture="msil" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>JezPboZZXWeggCpUdiJMV4mmStmGK1d26Ux0LZ0xa6o=</dsig:DigestValue>
<dsig:DigestValue>d8W0Q5YDy1pUC/JDqHopOF2T7q8/UgiH7izDqDHDUb8=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="en-US\sunxi-fex-tools-gui4win.resources.dll" size="10240">
<assemblyIdentity name="sunxi-fex-tools-gui4win.resources" version="1.0.1.2" language="en-US" processorArchitecture="msil" />
<assemblyIdentity name="sunxi-fex-tools-gui4win.resources" version="1.0.1.3" language="en-US" processorArchitecture="msil" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>bFgduU6/jME8TAM8cewWkMaVKqHHlwq5gK6sFVMwsCc=</dsig:DigestValue>
<dsig:DigestValue>9ukN71h/sLIhRqy7BH1gVlbY+iTpq7pN3WjNjfMZvfQ=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="zh-CN\sunxi-fex-tools-gui4win.resources.dll" size="8704">
<assemblyIdentity name="sunxi-fex-tools-gui4win.resources" version="1.0.1.2" language="zh-CN" processorArchitecture="msil" />
<assemblyIdentity name="sunxi-fex-tools-gui4win.resources" version="1.0.1.3" language="zh-CN" processorArchitecture="msil" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>PM84+tZICKXxpY9he70eeQY0gIUgp5LHpEZxGebdQgE=</dsig:DigestValue>
<dsig:DigestValue>g3XaCPbGa7LYkRWf1BRrXQ1HWwEFIgEyQ2s71ZSRrPw=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>2</ApplicationRevision>
<ApplicationRevision>3</ApplicationRevision>
<ApplicationVersion>1.0.1.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>
Expand Down

0 comments on commit fc64014

Please sign in to comment.