1
0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-17 02:51:27 +00:00

Update1 for MSVC10

Capitalize the ref macro in hsTypes.h due to a name collision.
This commit is contained in:
Skoader
2012-04-22 12:22:32 +10:00
parent 9db1361535
commit 626da5ae70
42 changed files with 234 additions and 234 deletions

View File

@ -1549,7 +1549,7 @@ static void AsyncLookupCallback (
unsigned addrCount,
const NetAddress addrs[]
) {
ref(param);
REF(param);
if (!addrCount) {
ReportNetError(kNetProtocolCli2Auth, kNetErrNameLookupFailed);
@ -2004,8 +2004,8 @@ static bool Recv_KickedOff (
unsigned bytes,
void * param
) {
ref(bytes);
ref(param);
REF(bytes);
REF(param);
const Auth2Cli_KickedOff & msg = *(const Auth2Cli_KickedOff *)buffer;
@ -2537,7 +2537,7 @@ bool PingRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const Auth2Cli_PingReply & reply = *(const Auth2Cli_PingReply *)msg;
@ -2600,7 +2600,7 @@ bool AccountExistsRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const Auth2Cli_AccountExistsReply & reply = *(const Auth2Cli_AccountExistsReply *)msg;
@ -2709,7 +2709,7 @@ bool LoginRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
dword msgId = (dword)*msg;
switch (msgId) {
@ -2798,7 +2798,7 @@ bool AgeRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const Auth2Cli_AgeReply & reply = *(const Auth2Cli_AgeReply *) msg;
m_gameSrvNode = reply.gameSrvNode;
m_ageMcpId = reply.ageMcpId;
@ -2871,7 +2871,7 @@ bool AccountCreateRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const Auth2Cli_AcctCreateReply & reply = *(const Auth2Cli_AcctCreateReply *) msg;
m_result = reply.result;
@ -2943,7 +2943,7 @@ bool AccountCreateFromKeyRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const Auth2Cli_AcctCreateFromKeyReply & reply = *(const Auth2Cli_AcctCreateFromKeyReply *) msg;
m_result = reply.result;
@ -3011,7 +3011,7 @@ bool PlayerCreateRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const Auth2Cli_PlayerCreateReply & reply = *(const Auth2Cli_PlayerCreateReply *) msg;
if (!IS_NET_ERROR(reply.result)) {
m_playerInfo.playerInt = reply.playerInt;
@ -3178,7 +3178,7 @@ bool SetPlayerRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const Auth2Cli_AcctSetPlayerReply & reply = *(const Auth2Cli_AcctSetPlayerReply *) msg;
m_result = reply.result;
m_state = kTransStateComplete;
@ -3240,7 +3240,7 @@ bool AccountChangePasswordRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const Auth2Cli_AcctChangePasswordReply & reply = *(const Auth2Cli_AcctChangePasswordReply *) msg;
m_result = reply.result;
@ -3296,7 +3296,7 @@ bool GetPublicAgeListTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const Auth2Cli_PublicAgeList & reply = *(const Auth2Cli_PublicAgeList *) msg;
if (IS_NET_SUCCESS(reply.result))
@ -3358,7 +3358,7 @@ bool AccountSetRolesRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const Auth2Cli_AcctSetRolesReply & reply = *(const Auth2Cli_AcctSetRolesReply *) msg;
m_result = reply.result;
@ -3416,7 +3416,7 @@ bool AccountSetBillingTypeRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const Auth2Cli_AcctSetBillingTypeReply & reply = *(const Auth2Cli_AcctSetBillingTypeReply *) msg;
m_result = reply.result;
@ -3471,7 +3471,7 @@ bool AccountActivateRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const Auth2Cli_AcctActivateReply & reply = *(const Auth2Cli_AcctActivateReply *) msg;
m_result = reply.result;
@ -3526,7 +3526,7 @@ bool FileListRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const Auth2Cli_FileListReply & reply = *(const Auth2Cli_FileListReply *) msg;
dword wcharCount = reply.wcharCount;
@ -3642,7 +3642,7 @@ bool FileDownloadRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const Auth2Cli_FileDownloadChunk & reply = *(const Auth2Cli_FileDownloadChunk *) msg;
if (IS_NET_ERROR(reply.result)) {
@ -3977,7 +3977,7 @@ bool VaultFetchNodeTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const Auth2Cli_VaultNodeFetched & reply = *(const Auth2Cli_VaultNodeFetched *) msg;
@ -4055,7 +4055,7 @@ bool VaultFindNodeTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const Auth2Cli_VaultNodeFindReply & reply = *(const Auth2Cli_VaultNodeFindReply *) msg;
@ -4125,7 +4125,7 @@ bool VaultCreateNodeTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const Auth2Cli_VaultNodeCreated & reply = *(const Auth2Cli_VaultNodeCreated *) msg;
@ -4195,7 +4195,7 @@ bool VaultSaveNodeTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const Auth2Cli_VaultSaveNodeReply & reply = *(const Auth2Cli_VaultSaveNodeReply *) msg;
@ -4260,7 +4260,7 @@ bool VaultAddNodeTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const Auth2Cli_VaultAddNodeReply & reply = *(const Auth2Cli_VaultAddNodeReply *) msg;
@ -4322,7 +4322,7 @@ bool VaultRemoveNodeTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const Auth2Cli_VaultRemoveNodeReply & reply = *(const Auth2Cli_VaultRemoveNodeReply *) msg;
@ -4395,7 +4395,7 @@ bool SetPlayerBanStatusRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const Auth2Cli_SetPlayerBanStatusReply & reply = *(const Auth2Cli_SetPlayerBanStatusReply *) msg;
m_result = reply.result;
@ -4453,7 +4453,7 @@ bool ChangePlayerNameRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const Auth2Cli_ChangePlayerNameReply & reply = *(const Auth2Cli_ChangePlayerNameReply *) msg;
m_result = reply.result;
@ -4515,7 +4515,7 @@ bool SendFriendInviteTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const Auth2Cli_SendFriendInviteReply & reply = *(const Auth2Cli_SendFriendInviteReply *) msg;
m_result = reply.result;
@ -4606,7 +4606,7 @@ bool ScoreCreateTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const Auth2Cli_ScoreCreateReply & reply = *(const Auth2Cli_ScoreCreateReply *) msg;
m_scoreId = reply.scoreId;
@ -4666,7 +4666,7 @@ bool ScoreDeleteTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const Auth2Cli_ScoreDeleteReply & reply = *(const Auth2Cli_ScoreDeleteReply *) msg;
m_result = reply.result;
@ -4733,7 +4733,7 @@ bool ScoreGetScoresTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const Auth2Cli_ScoreGetScoresReply & reply = *(const Auth2Cli_ScoreGetScoresReply *) msg;
if (reply.scoreCount > 0) {
@ -4809,7 +4809,7 @@ bool ScoreAddPointsTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const Auth2Cli_ScoreAddPointsReply & reply = *(const Auth2Cli_ScoreAddPointsReply *) msg;
m_result = reply.result;
@ -4872,7 +4872,7 @@ bool ScoreTransferPointsTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const Auth2Cli_ScoreTransferPointsReply & reply = *(const Auth2Cli_ScoreTransferPointsReply *) msg;
m_result = reply.result;
@ -4932,7 +4932,7 @@ bool ScoreSetPointsTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const Auth2Cli_ScoreSetPointsReply & reply = *(const Auth2Cli_ScoreSetPointsReply *) msg;
m_result = reply.result;
@ -5013,7 +5013,7 @@ bool ScoreGetRanksTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const Auth2Cli_ScoreGetRanksReply & reply = *(const Auth2Cli_ScoreGetRanksReply *) msg;
if (reply.rankCount > 0) {
@ -5709,7 +5709,7 @@ unsigned NetCliAuthVaultNodeSave (
void NetCliAuthVaultNodeDelete (
unsigned nodeId
) {
ref(nodeId);
REF(nodeId);
hsAssert(false, "eric, implement me");
}
@ -5842,7 +5842,7 @@ void NetCliAuthSetRecvBufferHandler (
void NetCliAuthSendCCRPetition (
const wchar * petitionText
) {
ref(petitionText);
REF(petitionText);
hsAssert(false, "eric, implement me.");
}

View File

@ -187,7 +187,7 @@ static CliCsConn * GetConnIncRef_CS (const char tag[]) {
//============================================================================
static CliCsConn * GetConnIncRef (const char tag[]) {
ref(GetConnIncRef);
REF(GetConnIncRef);
CliCsConn * conn;
s_critsect.Enter();
@ -420,7 +420,7 @@ static void AsyncLookupCallback (
unsigned addrCount,
const NetAddress addrs[]
) {
ref(name);
REF(name);
if (!addrCount) {
ReportNetError(kNetProtocolCli2Auth, kNetErrNameLookupFailed);
@ -697,7 +697,7 @@ bool LoginRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const Csr2Cli_LoginReply & reply = *(const Csr2Cli_LoginReply *) msg;

View File

@ -563,7 +563,7 @@ static void AsyncLookupCallback (
unsigned addrCount,
const NetAddress addrs[]
) {
ref(param);
REF(param);
if (!addrCount) {
ReportNetError(kNetProtocolCli2File, kNetErrNameLookupFailed);
@ -793,7 +793,7 @@ void CliFileConn::Dispatch (const Cli2File_MsgHeader * msg) {
bool CliFileConn::Recv_PingReply (
const File2Cli_PingReply * msg
) {
ref(msg);
REF(msg);
return true;
}
@ -874,7 +874,7 @@ bool BuildIdRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const File2Cli_BuildIdReply & reply = *(const File2Cli_BuildIdReply *) msg;
if (IS_NET_ERROR(reply.result)) {
@ -960,7 +960,7 @@ bool ManifestRequestTrans::Recv (
) {
m_timeoutAtMs = TimeGetMs() + NetTransGetTimeoutMs(); // Reset the timeout counter
ref(bytes);
REF(bytes);
const File2Cli_ManifestReply & reply = *(const File2Cli_ManifestReply *) msg;
dword numFiles = reply.numFiles;
@ -1173,7 +1173,7 @@ bool DownloadRequestTrans::Recv (
) {
m_timeoutAtMs = TimeGetMs() + NetTransGetTimeoutMs(); // Reset the timeout counter
ref(bytes);
REF(bytes);
const File2Cli_FileDownloadReply & reply = *(const File2Cli_FileDownloadReply *) msg;
dword byteCount = reply.byteCount;

View File

@ -430,9 +430,9 @@ static bool Recv_PingReply (
unsigned bytes,
void * param
) {
ref(msg);
ref(bytes);
ref(param);
REF(msg);
REF(bytes);
REF(param);
return true;
}
@ -442,8 +442,8 @@ static bool Recv_JoinAgeReply (
unsigned bytes,
void * param
) {
ref(bytes);
ref(param);
REF(bytes);
REF(param);
const Game2Cli_JoinAgeReply & reply = *(const Game2Cli_JoinAgeReply *)msg;
if (sizeof(reply) != bytes)
@ -460,8 +460,8 @@ static bool Recv_PropagateBuffer (
unsigned bytes,
void * param
) {
ref(bytes);
ref(param);
REF(bytes);
REF(param);
const Game2Cli_PropagateBuffer & reply = *(const Game2Cli_PropagateBuffer *)msg;
@ -481,8 +481,8 @@ static bool Recv_GameMgrMsg (
unsigned bytes,
void * param
) {
ref(bytes);
ref(param);
REF(bytes);
REF(param);
const Game2Cli_GameMgrMsg & reply = *(const Game2Cli_GameMgrMsg *)msg;
@ -571,7 +571,7 @@ bool JoinAgeRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const Game2Cli_JoinAgeReply & reply = *(const Game2Cli_JoinAgeReply *) msg;
m_result = reply.result;

View File

@ -488,7 +488,7 @@ static void AsyncLookupCallback (
unsigned addrCount,
const NetAddress addrs[]
) {
ref(param);
REF(param);
if (!addrCount) {
ReportNetError(kNetProtocolCli2GateKeeper, kNetErrNameLookupFailed);
@ -818,7 +818,7 @@ bool PingRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const GateKeeper2Cli_PingReply & reply = *(const GateKeeper2Cli_PingReply *)msg;
@ -882,7 +882,7 @@ bool FileSrvIpAddressRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const GateKeeper2Cli_FileSrvIpAddressReply & reply = *(const GateKeeper2Cli_FileSrvIpAddressReply *)msg;
@ -942,7 +942,7 @@ bool AuthSrvIpAddressRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
ref(bytes);
REF(bytes);
const GateKeeper2Cli_AuthSrvIpAddressReply & reply = *(const GateKeeper2Cli_AuthSrvIpAddressReply *)msg;