fix

wnxd · Nov 22, 2015 · bd2fe24 · bd2fe24
1 parent 5c0e6ee
commit bd2fe24
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/donet2ec/donet2ec.cpp b/donet2ec/donet2ec.cpp
@@ -16,7 +16,7 @@ using namespace System::Runtime::InteropServices;
 #define CStr2String(cstr) Marshal::PtrToStringAnsi((IntPtr)((void*)cstr.c_str()))
 #define String2LPSTR(str) (char*)(void*)Marshal::StringToHGlobalAnsi(str)
 
-#define KRNLN "krnln\d09f2340818511d396f6aaf844c7e325\r3\r9\r系统核心支持库"
+#define KRNLN "krnln\rd09f2340818511d396f6aaf844c7e325\r3\r9\r系统核心支持库"
 
 const int null = NULL;
 const int not = -1;

diff --git a/donet2ec/efs.h b/donet2ec/efs.h
@@ -3,9 +3,6 @@
 
 using namespace std;
 
-#define KRNLN "d09f2340818511d396f6aaf844c7e325"
-#define E_NET LI_LIB_GUID_STR
-
 enum ECode_Head : byte
 {
 	Call = 0x6A,
@@ -308,7 +305,6 @@ struct ESection_AuxiliaryInfo2
 	vector<ESection_TagStatus> Tags;
 };
 
-const int E5_4 = MAKELONG(4, 5);
 const byte Magic1[4] = { 'C', 'N', 'W', 'T' };
 const byte Magic2[4] = { 'E', 'P', 'R', 'G' };
 const byte Magic_Section[4] = { 0x19, 0x73, 0x11, 0x15 };

diff --git a/e.net/e.net.cpp b/e.net/e.net.cpp
@@ -246,13 +246,13 @@ EMethodData^ GetItemValue(IDictionary<ELib_Method^, EMethodData^>^ dictionary, E
 	return nullptr;
 }
 
-String^ FindLibrary(vector<string> libraries, string guid, short& i)
+String^ FindLibrary(vector<string> libraries, string name, short& i)
 {
 	size_t len = libraries.size();
 	for (i = 0; i < len; i++)
 	{
 		vector<string> arr = split(libraries[i], "\r");
-		if (arr[1] == guid) return CStr2String(libraries[i]);
+		if (arr[0] == name) return CStr2String(libraries[i]);
 	}
 	return nullptr;
 }

diff --git a/e.net/efs.h b/e.net/efs.h
@@ -3,9 +3,6 @@
 
 using namespace std;
 
-#define KRNLN "d09f2340818511d396f6aaf844c7e325"
-#define E_NET LI_LIB_GUID_STR
-
 enum ECode_Head : byte
 {
 	Call = 0x6A,
@@ -328,12 +325,13 @@ struct ESection_AuxiliaryInfo2
 	vector<ESection_TagStatus> Tags;
 };
 
-const int E5_4 = MAKELONG(4, 5);
 const byte Magic1[4] = { 'C', 'N', 'W', 'T' };
 const byte Magic2[4] = { 'E', 'P', 'R', 'G' };
 const byte Magic_Section[4] = { 0x19, 0x73, 0x11, 0x15 };
 const byte KEY[4] = { 25, 115, 0, 7 };
 
+#define KRNLN "krnln"
+#define E_NET "e_net"
 #define ETAG2UINT(etag) (UINT)MAKELONG(etag.ID, MAKEWORD(etag.Type1, etag.Type2))
 
 void Decode_Str(byte data[], const byte key[]);