port to MSVC .NET 2005 beta 2

git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@198 57ff6487-cd31-0410-9ec3-f628ee90f5f0

1 files changed, 3 insertions, 2 deletions

diff --git a/test.cpp b/test.cpp
index 92e591a..e733c33 100644
--- a/test.cpp
+++ b/test.cpp
@@ -171,7 +171,8 @@ int main(int argc, char *argv[])
 		{
 			HMODULE hModule = LoadLibrary(argv[2]);
 			PGetPowerUpSelfTestStatus pGetPowerUpSelfTestStatus = (PGetPowerUpSelfTestStatus)GetProcAddress(hModule, "?GetPowerUpSelfTestStatus@CryptoPP@@YA?AW4PowerUpSelfTestStatus@1@XZ");
-			PGetActualMacAndLocation pGetActualMacAndLocation = (PGetActualMacAndLocation)GetProcAddress(hModule, "?GetActualMacAndLocation@CryptoPP@@YAPBEAAI0@Z");
+			PGetActualMacAndLocation pGetActualMacAndLocation = (PGetActualMacAndLocation)GetProcAddress(hModule, 
+				sizeof(byte *)==4 ? "?GetActualMacAndLocation@CryptoPP@@YAPBEAAI0@Z" : "?GetActualMacAndLocation@CryptoPP@@YAPEBEAEAI0@Z");
 
 			PowerUpSelfTestStatus status = pGetPowerUpSelfTestStatus();
 			if (status == POWER_UP_SELF_TEST_PASSED)
@@ -330,7 +331,7 @@ void FIPS140_GenerateRandomFiles()
 SecByteBlock HexDecodeString(const char *hex)
 {
 	StringSource ss(hex, true, new HexDecoder);
-	SecByteBlock result(ss.MaxRetrievable());
+	SecByteBlock result((size_t)ss.MaxRetrievable());
 	ss.Get(result, result.size());
 	return result;
 }