ZeroDream/CodeWalker
2
0
Fork 0
mirror of https://mirror.ghproxy.com/https://github.com/dexyfex/CodeWalker synced 2024-11-26 08:52:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bug fix for binary search always searching both directions

Browse Source
This commit is contained in:
dexyfex 2017-12-29 00:47:42 +11:00
parent f5ce1ab4ad
commit c5a3dc258b
3 changed files with 54 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BinarySearchForm.cs
View File

@ -493,14 +493,15 @@ namespace CodeWalker
byte b2 = searchbytes2[hitlen2]; byte b2 = searchbytes2[hitlen2];
if (b == b1) hitlen1++; else hitlen1 = 0; if (b == b1) hitlen1++; else hitlen1 = 0;
if (b == b2) hitlen2++; else hitlen2 = 0;
if (hitlen1 == bytelen) if (hitlen1 == bytelen)
{ {
RpfSearchAddResult(new RpfSearchResult(fentry, (i - bytelen), bytelen)); RpfSearchAddResult(new RpfSearchResult(fentry, (i - bytelen), bytelen));
resultcount++; resultcount++;
hitlen1 = 0; hitlen1 = 0;
} }
if (bothdirs)
{
if (b == b2) hitlen2++; else hitlen2 = 0;
if (hitlen2 == bytelen) if (hitlen2 == bytelen)
{ {
RpfSearchAddResult(new RpfSearchResult(fentry, (i - bytelen), bytelen)); RpfSearchAddResult(new RpfSearchResult(fentry, (i - bytelen), bytelen));
@ -510,6 +511,7 @@ namespace CodeWalker
} }
} }
} }
}
var totdur = DateTime.Now - starttime; var totdur = DateTime.Now - starttime;
UpdateStatus(totdur.ToString(@"hh\:mm\:ss") + " - Search complete. " + resultcount.ToString() + " results found."); UpdateStatus(totdur.ToString(@"hh\:mm\:ss") + " - Search complete. " + resultcount.ToString() + " results found.");

6
BrowseForm.cs
View File

@ -1124,14 +1124,15 @@ namespace CodeWalker
byte b2 = searchbytes2[hitlen2]; byte b2 = searchbytes2[hitlen2];
if (b == b1) hitlen1++; else hitlen1 = 0; if (b == b1) hitlen1++; else hitlen1 = 0;
if (b == b2) hitlen2++; else hitlen2 = 0;
if (hitlen1 == bytelen) if (hitlen1 == bytelen)
{ {
AddSearchResult(new SearchResult(fentry, (i - bytelen), bytelen)); AddSearchResult(new SearchResult(fentry, (i - bytelen), bytelen));
resultcount++; resultcount++;
hitlen1 = 0; hitlen1 = 0;
} }
if (bothdirs)
{
if (b == b2) hitlen2++; else hitlen2 = 0;
if (hitlen2 == bytelen) if (hitlen2 == bytelen)
{ {
AddSearchResult(new SearchResult(fentry, (i - bytelen), bytelen)); AddSearchResult(new SearchResult(fentry, (i - bytelen), bytelen));
@ -1141,6 +1142,7 @@ namespace CodeWalker
} }
} }
} }
}
var totdur = DateTime.Now - starttime; var totdur = DateTime.Now - starttime;
UpdateStatus(totdur.ToString(@"hh\:mm\:ss") + " - Search complete. " + resultcount.ToString() + " results found."); UpdateStatus(totdur.ToString(@"hh\:mm\:ss") + " - Search complete. " + resultcount.ToString() + " results found.");

38
GameFiles/FileTypes/AwcFile.cs
View File

@ -64,6 +64,44 @@ namespace CodeWalker.GameFiles
break; break;
} }
/* francium - Today at 6:11 PM
IDA decompiler code from a function that seems to be called around audio loading if not ADAT:
if ( a3 )
{
v3 = *a1;
v4 = -a2;
v5 = (unsigned int)(-a2 - 1);
v6 = 0x9E3779B9 * (52 / -a2 + 6);
do
{
LODWORD(v7) = -a2 - 1;
v8 = (v6 >> 2) & 3;
if ( -a2 != 1 )
{
v9 = (unsigned int)v5;
v10 = &a1[v5];
do
{
v7 = (unsigned int)(v7 - 1);
v11 = v9--;
*v10 -= ((v6 ^ v3) + (a1[v7] ^ *(_DWORD *)(a3 + 4 * (v8 ^ (unsigned __int64)(v11 & 3))) ^ 0x7B3A207F)) ^ ((4 * v3 ^ (a1[v7] >> 5)) + ((v3 >> 3) ^ 16 * a1[v7]));
v3 = *v10;
--v10;
}
while ( (_DWORD)v7 );
}
result = (v6 ^ v3) + (a1[v4 - 1] ^ *(_DWORD *)(a3 + 4 * (v8 ^ (unsigned __int64)(v7 & 3))) ^ 0x7B3A207F);
*a1 -= result ^ ((4 * v3 ^ (a1[v4 - 1] >> 5)) + ((v3 >> 3) ^ 16 * a1[v4 - 1]));
v3 = *a1;
v6 += 0x61C88647;
}
while ( v6 );
}
*/
using (MemoryStream ms = new MemoryStream(data)) using (MemoryStream ms = new MemoryStream(data))
{ {
DataReader r = new DataReader(ms, endianess); DataReader r = new DataReader(ms, endianess);