From 626da5ae70a1567d129ac47be3e574286b55ee93 Mon Sep 17 00:00:00 2001 From: Skoader Date: Sun, 22 Apr 2012 12:22:32 +1000 Subject: [PATCH] Update1 for MSVC10 Capitalize the ref macro in hsTypes.h due to a name collision. --- .../Plasma/Apps/plClientPatcher/UruPlayer.cpp | 12 ++-- .../Plasma/Apps/plUruLauncher/SelfPatcher.cpp | 12 ++-- .../Plasma20/Sources/Plasma/CoreLib/hsTypes.h | 4 +- .../Sources/Plasma/CoreLibExe/hsExeError.cpp | 10 +-- .../Sources/Plasma/CoreLibExe/hsExeMalloc.cpp | 34 ++++----- .../pfGameMgr/BlueSpiral/pfGmBlueSpiral.cpp | 10 +-- .../ClimbingWall/pfGmClimbingWall.cpp | 12 ++-- .../FeatureLib/pfGameMgr/Heek/pfGmHeek.cpp | 22 +++--- .../pfGameMgr/Marker/pfGmMarker.cpp | 24 +++---- .../pfGameMgr/TicTacToe/pfGmTicTacToe.cpp | 6 +- .../pfGameMgr/VarSync/pfGmVarSync.cpp | 10 +-- .../Plasma/FeatureLib/pfGameMgr/pfGameMgr.cpp | 12 ++-- .../pnAsyncCoreExe/Private/Nt/pnAceNt.cpp | 4 +- .../Private/Nt/pnAceNtSocket.cpp | 12 ++-- .../Private/W9x/pnAceW9xSocket.cpp | 20 +++--- .../Private/W9x/pnAceW9xThread.cpp | 2 +- .../Private/Win32/pnAceW32Thread.cpp | 4 +- .../NucleusLib/pnAsyncCoreExe/pnAceCore.cpp | 10 +-- .../NucleusLib/pnAsyncCoreExe/pnAceLog.cpp | 18 ++--- .../NucleusLib/pnIni/Private/pnIniCore.cpp | 4 +- .../pnIniExe/Private/Win32/pnW32IniChange.cpp | 2 +- .../Plasma/NucleusLib/pnNetCli/pnNcCli.cpp | 8 +-- .../pnNetProtocol/Private/pnNpCommon.cpp | 4 +- .../NucleusLib/pnSimpleNet/pnSimpleNet.cpp | 2 +- .../pnUtils/Private/Win32/pnUtW32Addr.cpp | 2 +- .../NucleusLib/pnUtils/Private/pnUtArray.cpp | 2 +- .../NucleusLib/pnUtils/Private/pnUtArray.h | 12 ++-- .../NucleusLib/pnUtils/Private/pnUtBase64.cpp | 4 +- .../NucleusLib/pnUtils/Private/pnUtCmd.cpp | 10 +-- .../NucleusLib/pnUtils/Private/pnUtCrypt.cpp | 10 +-- .../NucleusLib/pnUtils/Private/pnUtEndian.h | 18 ++--- .../NucleusLib/pnUtils/Private/pnUtHash.h | 6 +- .../NucleusLib/pnUtils/Private/pnUtList.h | 8 +-- .../NucleusLib/pnUtils/Private/pnUtRef.h | 10 +-- .../pnUtils/Private/pnUtSpareList.cpp | 4 +- .../NucleusLib/pnUtils/Private/pnUtUuid.h | 4 +- .../plNetClientComm/plNetClientComm.cpp | 4 +- .../plNetGameLib/Private/plNglAuth.cpp | 72 +++++++++---------- .../plNetGameLib/Private/plNglCsr.cpp | 6 +- .../plNetGameLib/Private/plNglFile.cpp | 10 +-- .../plNetGameLib/Private/plNglGame.cpp | 20 +++--- .../plNetGameLib/Private/plNglGateKeeper.cpp | 8 +-- 42 files changed, 234 insertions(+), 234 deletions(-) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp index e6becaa6..d82618d2 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp @@ -386,9 +386,9 @@ static void DownloadCallback ( ) { s_numConnectFailures = 0; - ref(result); - ref(param); - ref(filename); + REF(result); + REF(param); + REF(filename); ManifestFile *mf = (ManifestFile *)param; if (IS_NET_ERROR(result) && s_running && !s_patchError) { @@ -732,7 +732,7 @@ static void ThinManifestCallback ( ){ s_numConnectFailures = 0; - ref(group); + REF(group); plLauncherInfo * info = (plLauncherInfo *) param; char text[256]; @@ -831,7 +831,7 @@ static void FileSrvIpAddressCallback ( void * param, const wchar addr[] ) { - ref(param); + REF(param); NetCliGateKeeperDisconnect(); @@ -960,7 +960,7 @@ void UruPrepProc (void * param) { void PlayerStopProc (void * param) { s_running = false; plLauncherInfo *info = (plLauncherInfo *) param; - ref(param); + //TerminateProcess(s_pi.hProcess, kExitCodeTerminated); info->stopCallback(kStatusOk, nil); } diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plUruLauncher/SelfPatcher.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plUruLauncher/SelfPatcher.cpp index 40526f94..8c2f46cf 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plUruLauncher/SelfPatcher.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plUruLauncher/SelfPatcher.cpp @@ -87,7 +87,7 @@ static wchar s_newPatcherFile[MAX_PATH]; //============================================================================ static void NetErrorHandler (ENetProtocol protocol, ENetError error) { - ref(protocol); + REF(protocol); LogMsg(kLogError, L"NetErr: %s", NetErrorToString(error)); if (IS_NET_SUCCESS(s_patchResult)) s_patchResult = error; @@ -109,8 +109,8 @@ static void DownloadCallback ( const wchar filename[], hsStream * writer ) { - ref(param); - ref(filename); + REF(param); + REF(filename); if(IS_NET_ERROR(result)) { switch (result) { @@ -158,8 +158,8 @@ static void ManifestCallback ( const NetCliFileManifestEntry manifest[], unsigned entryCount ) { - ref(param); - ref(group); + REF(param); + REF(group); if(IS_NET_ERROR(result)) { switch (result) { @@ -208,7 +208,7 @@ static void FileSrvIpAddressCallback ( void * param, const wchar addr[] ) { - ref(param); + REF(param); NetCliGateKeeperDisconnect(); diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLib/hsTypes.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLib/hsTypes.h index f520b938..c0c8d184 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLib/hsTypes.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLib/hsTypes.h @@ -310,12 +310,12 @@ typedef hsColor32 hsRGBAColor32; /**************************************************************************** * -* ref +* REF * References a variable to prevent compiler warnings * ***/ -#define ref(a) ((void *)&(a)) +#define REF(a) ((void *)&(a)) /**************************************************************************** diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLibExe/hsExeError.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLibExe/hsExeError.cpp index 5f4e58b4..01b80c84 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLibExe/hsExeError.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLibExe/hsExeError.cpp @@ -79,8 +79,8 @@ AUTO_INIT_FUNC(hsExeErrorInit) { //============================================================================ static void DoAssert (int line, const char file[], const char msg[]) { - ref(line); - ref(file); + REF(line); + REF(file); ErrorMinimizeAppWindow(); @@ -252,8 +252,8 @@ void DebugMsgV (const char fmt[], va_list args) { #else - ref(fmt); - ref(args); + REF(fmt); + REF(args); #endif } @@ -269,7 +269,7 @@ void __cdecl DebugMsg (const char fmt[], ...) { #else - ref(fmt); + REF(fmt); #endif } diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLibExe/hsExeMalloc.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLibExe/hsExeMalloc.cpp index 4eb29ab6..8e5e3cbf 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLibExe/hsExeMalloc.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLibExe/hsExeMalloc.cpp @@ -295,7 +295,7 @@ static void __cdecl ReportMem (EMemFile file, bool showDialog, const char fmt[], //============================================================================ #ifdef MEM_DEBUG static void __cdecl MemDumpCallback (void * mem, void * param) { - ref(MemDumpCallback); + REF(MemDumpCallback); const _CrtMemBlockHeader * pHead = pHdr(mem); MemDumpParam * dumpParam = (MemDumpParam *) param; @@ -337,7 +337,7 @@ static void __cdecl OnExitMemDumpCallback (void * mem, size_t) { //=========================================================================== #ifdef MEM_DEBUG static void __cdecl CheckLeaksOnExit () { - ref(CheckLeaksOnExit); + REF(CheckLeaksOnExit); if (!ErrorGetOption(kErrOptDisableMemLeakChecking)) { MemDumpParam param; param.file = kMemLeaks; @@ -357,17 +357,17 @@ static int __cdecl CrtAllocHook ( const unsigned char * szFileName, int nLine ) { - ref(method); - ref(pUserData); - ref(nSize); - ref(nBlockUse); - ref(lRequest); - ref(szFileName); - ref(nLine); + REF(method); + REF(pUserData); + REF(nSize); + REF(nBlockUse); + REF(lRequest); + REF(szFileName); + REF(nLine); if (nBlockUse == _NORMAL_BLOCK) { int xx = 0; - ref(xx); + REF(xx); } return 1; @@ -434,7 +434,7 @@ void MemValidateNow () { //============================================================================ void MemSetValidation (unsigned on) { - ref(on); + REF(on); #ifdef MEM_DEBUG #endif // MEM_DEBUG @@ -459,7 +459,7 @@ void MemPopDisableTracking () { //============================================================================ void MemSetColor (unsigned short color) { - ref(color); + REF(color); #ifdef MEM_DEBUG s_memColor = color & 0xFFFF; @@ -469,8 +469,8 @@ void MemSetColor (unsigned short color) { //=========================================================================== void * MemAlloc (unsigned bytes, unsigned flags, const char file[], int line) { - ref(file); - ref(line); + REF(file); + REF(line); #ifdef MEM_DEBUG unsigned block; @@ -520,7 +520,7 @@ void * MemAlloc (unsigned bytes, unsigned flags, const char file[], int line) { //============================================================================ void MemFree (void * ptr, unsigned flags) { - ref(flags); + REF(flags); if (!ptr) return; @@ -535,8 +535,8 @@ void MemFree (void * ptr, unsigned flags) { //=========================================================================== void * MemRealloc (void * ptr, unsigned bytes, unsigned flags, const char file[], int line) { - ref(file); - ref(line); + REF(file); + REF(line); #ifdef HS_DEBUGGING unsigned oldBytes = ptr ? MemSize(ptr) : 0; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/BlueSpiral/pfGmBlueSpiral.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/BlueSpiral/pfGmBlueSpiral.cpp index 9f5b8abf..26a734a0 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/BlueSpiral/pfGmBlueSpiral.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/BlueSpiral/pfGmBlueSpiral.cpp @@ -150,7 +150,7 @@ void IBlueSpiral::OnOwnerChange (const Srv2Cli_Game_OwnerChange & msg) { //============================================================================ void IBlueSpiral::RecvClothOrder (const Srv2Cli_BlueSpiral_ClothOrder & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); @@ -159,7 +159,7 @@ void IBlueSpiral::RecvClothOrder (const Srv2Cli_BlueSpiral_ClothOrder & msg, voi //============================================================================ void IBlueSpiral::RecvSuccessfulHit (const Srv2Cli_BlueSpiral_SuccessfulHit & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); @@ -168,7 +168,7 @@ void IBlueSpiral::RecvSuccessfulHit (const Srv2Cli_BlueSpiral_SuccessfulHit & ms //============================================================================ void IBlueSpiral::RecvGameWon (const Srv2Cli_BlueSpiral_GameWon & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); @@ -177,7 +177,7 @@ void IBlueSpiral::RecvGameWon (const Srv2Cli_BlueSpiral_GameWon & msg, void * pa //============================================================================ void IBlueSpiral::RecvGameOver (const Srv2Cli_BlueSpiral_GameOver & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); @@ -186,7 +186,7 @@ void IBlueSpiral::RecvGameOver (const Srv2Cli_BlueSpiral_GameOver & msg, void * //============================================================================ void IBlueSpiral::RecvGameStarted (const Srv2Cli_BlueSpiral_GameStarted & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/ClimbingWall/pfGmClimbingWall.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/ClimbingWall/pfGmClimbingWall.cpp index 9e319a3e..5ec85c5d 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/ClimbingWall/pfGmClimbingWall.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/ClimbingWall/pfGmClimbingWall.cpp @@ -151,7 +151,7 @@ void IClimbingWall::OnOwnerChange (const Srv2Cli_Game_OwnerChange & msg) { //============================================================================ void IClimbingWall::RecvNumBlockersChanged (const Srv2Cli_ClimbingWall_NumBlockersChanged & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); @@ -160,7 +160,7 @@ void IClimbingWall::RecvNumBlockersChanged (const Srv2Cli_ClimbingWall_NumBlocke //============================================================================ void IClimbingWall::RecvReady (const Srv2Cli_ClimbingWall_Ready & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); @@ -169,7 +169,7 @@ void IClimbingWall::RecvReady (const Srv2Cli_ClimbingWall_Ready & msg, void * pa //============================================================================ void IClimbingWall::RecvBlockersChanged (const Srv2Cli_ClimbingWall_BlockersChanged & msg, void * param) { - ref (param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); @@ -178,7 +178,7 @@ void IClimbingWall::RecvBlockersChanged (const Srv2Cli_ClimbingWall_BlockersChan //============================================================================ void IClimbingWall::RecvPlayerEntered (const Srv2Cli_ClimbingWall_PlayerEntered & msg, void * param) { - ref (param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); @@ -187,7 +187,7 @@ void IClimbingWall::RecvPlayerEntered (const Srv2Cli_ClimbingWall_PlayerEntered //============================================================================ void IClimbingWall::RecvSuitMachineLocked (const Srv2Cli_ClimbingWall_SuitMachineLocked & msg, void * param) { - ref (param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); @@ -196,7 +196,7 @@ void IClimbingWall::RecvSuitMachineLocked (const Srv2Cli_ClimbingWall_SuitMachin //============================================================================ void IClimbingWall::RecvGameOver (const Srv2Cli_ClimbingWall_GameOver & msg, void * param) { - ref (param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/Heek/pfGmHeek.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/Heek/pfGmHeek.cpp index 33a92b5f..d1de8967 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/Heek/pfGmHeek.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/Heek/pfGmHeek.cpp @@ -151,7 +151,7 @@ void IHeek::OnOwnerChange (const Srv2Cli_Game_OwnerChange & msg) { //============================================================================ void IHeek::RecvPlayGame (const Srv2Cli_Heek_PlayGame & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -159,7 +159,7 @@ void IHeek::RecvPlayGame (const Srv2Cli_Heek_PlayGame & msg, void * param) { //============================================================================ void IHeek::RecvGoodbye (const Srv2Cli_Heek_Goodbye & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -167,7 +167,7 @@ void IHeek::RecvGoodbye (const Srv2Cli_Heek_Goodbye & msg, void * param) { //============================================================================ void IHeek::RecvWelcome (const Srv2Cli_Heek_Welcome & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -175,7 +175,7 @@ void IHeek::RecvWelcome (const Srv2Cli_Heek_Welcome & msg, void * param) { //============================================================================ void IHeek::RecvDrop (const Srv2Cli_Heek_Drop & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -183,7 +183,7 @@ void IHeek::RecvDrop (const Srv2Cli_Heek_Drop & msg, void * param) { //============================================================================ void IHeek::RecvSetup (const Srv2Cli_Heek_Setup & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -191,7 +191,7 @@ void IHeek::RecvSetup (const Srv2Cli_Heek_Setup & msg, void * param) { //============================================================================ void IHeek::RecvLightState (const Srv2Cli_Heek_LightState & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -199,7 +199,7 @@ void IHeek::RecvLightState (const Srv2Cli_Heek_LightState & msg, void * param) { //============================================================================ void IHeek::RecvInterfaceState (const Srv2Cli_Heek_InterfaceState & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -207,7 +207,7 @@ void IHeek::RecvInterfaceState (const Srv2Cli_Heek_InterfaceState & msg, void * //============================================================================ void IHeek::RecvCountdownState (const Srv2Cli_Heek_CountdownState & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -215,7 +215,7 @@ void IHeek::RecvCountdownState (const Srv2Cli_Heek_CountdownState & msg, void * //============================================================================ void IHeek::RecvWinLose (const Srv2Cli_Heek_WinLose & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -223,7 +223,7 @@ void IHeek::RecvWinLose (const Srv2Cli_Heek_WinLose & msg, void * param) { //============================================================================ void IHeek::RecvGameWin (const Srv2Cli_Heek_GameWin & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -231,7 +231,7 @@ void IHeek::RecvGameWin (const Srv2Cli_Heek_GameWin & msg, void * param) { //============================================================================ void IHeek::RecvPointUpdate (const Srv2Cli_Heek_PointUpdate & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/Marker/pfGmMarker.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/Marker/pfGmMarker.cpp index d98c224c..f3b5b27d 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/Marker/pfGmMarker.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/Marker/pfGmMarker.cpp @@ -175,7 +175,7 @@ void IMarker::RecvTeamAssigned (const Srv2Cli_Marker_TeamAssigned & msg, void * //============================================================================ void IMarker::RecvGameType (const Srv2Cli_Marker_GameType & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); @@ -184,7 +184,7 @@ void IMarker::RecvGameType (const Srv2Cli_Marker_GameType & msg, void * param) { //============================================================================ void IMarker::RecvGameStarted (const Srv2Cli_Marker_GameStarted & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); @@ -193,7 +193,7 @@ void IMarker::RecvGameStarted (const Srv2Cli_Marker_GameStarted & msg, void * pa //============================================================================ void IMarker::RecvGamePaused (const Srv2Cli_Marker_GamePaused & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); @@ -202,7 +202,7 @@ void IMarker::RecvGamePaused (const Srv2Cli_Marker_GamePaused & msg, void * para //============================================================================ void IMarker::RecvGameReset (const Srv2Cli_Marker_GameReset & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); @@ -211,7 +211,7 @@ void IMarker::RecvGameReset (const Srv2Cli_Marker_GameReset & msg, void * param) //============================================================================ void IMarker::RecvGameOver (const Srv2Cli_Marker_GameOver & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); @@ -220,7 +220,7 @@ void IMarker::RecvGameOver (const Srv2Cli_Marker_GameOver & msg, void * param) { //============================================================================ void IMarker::RecvGameNameChanged (const Srv2Cli_Marker_GameNameChanged & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); @@ -229,7 +229,7 @@ void IMarker::RecvGameNameChanged (const Srv2Cli_Marker_GameNameChanged & msg, v //============================================================================ void IMarker::RecvTimeLimitChanged (const Srv2Cli_Marker_TimeLimitChanged & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); @@ -238,7 +238,7 @@ void IMarker::RecvTimeLimitChanged (const Srv2Cli_Marker_TimeLimitChanged & msg, //============================================================================ void IMarker::RecvGameDeleted (const Srv2Cli_Marker_GameDeleted & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); @@ -250,7 +250,7 @@ void IMarker::RecvGameDeleted (const Srv2Cli_Marker_GameDeleted & msg, void * pa //============================================================================ void IMarker::RecvMarkerAdded (const Srv2Cli_Marker_MarkerAdded & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); @@ -259,7 +259,7 @@ void IMarker::RecvMarkerAdded (const Srv2Cli_Marker_MarkerAdded & msg, void * pa //============================================================================ void IMarker::RecvMarkerDeleted (const Srv2Cli_Marker_MarkerDeleted & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); @@ -268,7 +268,7 @@ void IMarker::RecvMarkerDeleted (const Srv2Cli_Marker_MarkerDeleted & msg, void //============================================================================ void IMarker::RecvMarkerNameChanged (const Srv2Cli_Marker_MarkerNameChanged & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); @@ -277,7 +277,7 @@ void IMarker::RecvMarkerNameChanged (const Srv2Cli_Marker_MarkerNameChanged & ms //============================================================================ void IMarker::RecvMarkerCaptured (const Srv2Cli_Marker_MarkerCaptured & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/TicTacToe/pfGmTicTacToe.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/TicTacToe/pfGmTicTacToe.cpp index ec99edf3..61083f0c 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/TicTacToe/pfGmTicTacToe.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/TicTacToe/pfGmTicTacToe.cpp @@ -153,7 +153,7 @@ void ITicTacToe::OnOwnerChange (const Srv2Cli_Game_OwnerChange & msg) { //============================================================================ void ITicTacToe::RecvGameStarted (const Srv2Cli_TTT_GameStarted & msg, void * param) { - ref(param); + REF(param); // player that goes first is shown as X's. if (msg.yourTurn) { @@ -172,7 +172,7 @@ void ITicTacToe::RecvGameStarted (const Srv2Cli_TTT_GameStarted & msg, void * pa //============================================================================ void ITicTacToe::RecvGameOver (const Srv2Cli_TTT_GameOver & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); @@ -183,7 +183,7 @@ void ITicTacToe::RecvGameOver (const Srv2Cli_TTT_GameOver & msg, void * param) { //============================================================================ void ITicTacToe::RecvMoveMade (const Srv2Cli_TTT_MoveMade & msg, void * param) { - ref(param); + REF(param); // Update the board with the appropriate piece if (msg.playerId == NetCommGetPlayer()->playerInt) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/VarSync/pfGmVarSync.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/VarSync/pfGmVarSync.cpp index 0d95c6a3..8ca92bd7 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/VarSync/pfGmVarSync.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/VarSync/pfGmVarSync.cpp @@ -150,7 +150,7 @@ void IVarSync::OnOwnerChange (const Srv2Cli_Game_OwnerChange & msg) { //============================================================================ void IVarSync::RecvStringVarChanged (const Srv2Cli_VarSync_StringVarChanged & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); @@ -159,7 +159,7 @@ void IVarSync::RecvStringVarChanged (const Srv2Cli_VarSync_StringVarChanged & ms //============================================================================ void IVarSync::RecvNumericVarChanged (const Srv2Cli_VarSync_NumericVarChanged & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); @@ -168,7 +168,7 @@ void IVarSync::RecvNumericVarChanged (const Srv2Cli_VarSync_NumericVarChanged & //============================================================================ void IVarSync::RecvAllVarsSent (const Srv2Cli_VarSync_AllVarsSent & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); @@ -177,7 +177,7 @@ void IVarSync::RecvAllVarsSent (const Srv2Cli_VarSync_AllVarsSent & msg, void * //============================================================================ void IVarSync::RecvStringVarCreated (const Srv2Cli_VarSync_StringVarCreated & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); @@ -186,7 +186,7 @@ void IVarSync::RecvStringVarCreated (const Srv2Cli_VarSync_StringVarCreated & ms //============================================================================ void IVarSync::RecvNumericVarCreated (const Srv2Cli_VarSync_NumericVarCreated & msg, void * param) { - ref(param); + REF(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/pfGameMgr.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/pfGameMgr.cpp index 7a7f7e22..15b1ccc4 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/pfGameMgr.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/pfGameMgr.cpp @@ -205,7 +205,7 @@ void IGameMgr::RecvGameInstance (const Srv2Cli_GameMgr_GameInstance & msg, void //============================================================================ void IGameMgr::RecvInviteReceived (const Srv2Cli_GameMgr_InviteReceived & msg, void * param) { - ref(param); + REF(param); pfGameMgrMsg * gameMgrMsg = NEWZERO(pfGameMgrMsg); gameMgrMsg->Set(msg); @@ -216,7 +216,7 @@ void IGameMgr::RecvInviteReceived (const Srv2Cli_GameMgr_InviteReceived & msg, v //============================================================================ void IGameMgr::RecvInviteRevoked (const Srv2Cli_GameMgr_InviteRevoked & msg, void * param) { - ref(param); + REF(param); pfGameMgrMsg * gameMgrMsg = NEWZERO(pfGameMgrMsg); gameMgrMsg->Set(msg); @@ -587,7 +587,7 @@ void IGameCli::Recv (GameMsgHeader * msg, void * param) { //============================================================================ void IGameCli::RecvPlayerJoined (const Srv2Cli_Game_PlayerJoined & msg, void * param) { - ref(param); + REF(param); ++playerCount; gameCli->OnPlayerJoined(msg); @@ -595,7 +595,7 @@ void IGameCli::RecvPlayerJoined (const Srv2Cli_Game_PlayerJoined & msg, void * p //============================================================================ void IGameCli::RecvPlayerLeft (const Srv2Cli_Game_PlayerLeft & msg, void * param) { - ref(param); + REF(param); --playerCount; gameCli->OnPlayerLeft(msg); @@ -603,14 +603,14 @@ void IGameCli::RecvPlayerLeft (const Srv2Cli_Game_PlayerLeft & msg, void * param //============================================================================ void IGameCli::RecvInviteFailed (const Srv2Cli_Game_InviteFailed & msg, void * param) { - ref(param); + REF(param); gameCli->OnInviteFailed(msg); } //============================================================================ void IGameCli::RecvOwnerChange (const Srv2Cli_Game_OwnerChange & msg, void * param) { - ref(param); + REF(param); gameCli->OnOwnerChange(msg); } diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNt.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNt.cpp index 3162f8ee..f17dde4b 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNt.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNt.cpp @@ -244,7 +244,7 @@ static void INtOpDispatch ( //=========================================================================== static unsigned THREADCALL NtWorkerThreadProc (AsyncThread * thread) { - ref(thread); + REF(thread); ThreadDenyBlock(); @@ -340,7 +340,7 @@ void INtConnCompleteOperation (NtObject * ntObj) { return; DWORD err = GetLastError(); - ref(err); + REF(err); switch (ntObj->ioType) { case kNtFile: INtFileDelete((NtFile *) ntObj); diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNtSocket.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNtSocket.cpp index 5965d841..b2856313 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNtSocket.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNtSocket.cpp @@ -806,10 +806,10 @@ static void __cdecl DumpInvalidData ( const char fmt[], ... ) { - ref(filename); - ref(bytes); - ref(data); - ref(fmt); + REF(filename); + REF(bytes); + REF(data); + REF(fmt); wchar path[MAX_PATH]; PathGetProgramDirectory(path, arrsize(path)); @@ -947,7 +947,7 @@ void INtSockDelete ( sock->notifyProc = nil; notifyProc((AsyncSocket) sock, kNotifySocketDisconnect, nil, &sock->userState); DWORD err = GetLastError(); - ref(err); + REF(err); } else { // Since the no application notification procedure was @@ -1016,7 +1016,7 @@ void INtSocketOpCompleteSocketRead ( if (sock->connType == kConnTypeCliToAuth) { int x = 0; - ref(x); + REF(x); } if (!SocketDispatchRead(sock)) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/W9x/pnAceW9xSocket.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/W9x/pnAceW9xSocket.cpp index 64b19721..459554fa 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/W9x/pnAceW9xSocket.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/W9x/pnAceW9xSocket.cpp @@ -1008,8 +1008,8 @@ void W9xSocketConnect ( unsigned localPort ) { // Not supported for W9X - ref(connectMs); - ref(localPort); + REF(connectMs); + REF(localPort); // If necessary, startup the window and message queue HWND window = StartupWindow(); @@ -1155,8 +1155,8 @@ unsigned W9xSocketStartListening ( const NetAddress & listenAddr, FAsyncNotifySocketProc notifyProc ) { - ref(listenAddr); - ref(notifyProc); + REF(listenAddr); + REF(notifyProc); return 0; } @@ -1166,8 +1166,8 @@ void W9xSocketStopListening ( const NetAddress & listenAddr, FAsyncNotifySocketProc notifyProc ) { - ref(listenAddr); - ref(notifyProc); + REF(listenAddr); + REF(notifyProc); } //=========================================================================== @@ -1190,8 +1190,8 @@ void W9xSocketSetNotifyProc ( AsyncSocket sock, FAsyncNotifySocketProc notifyProc ) { - ref(sock); - ref(notifyProc); + REF(sock); + REF(notifyProc); // This provider does not allow changing the notification procedure FATAL("SocketSetNotifyProc"); @@ -1204,8 +1204,8 @@ void W9xSocketSetBacklogAlloc ( ) { // This provider does not limit the maximum backlog allocation - ref(sock); - ref(bufferSize); + REF(sock); + REF(bufferSize); } diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/W9x/pnAceW9xThread.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/W9x/pnAceW9xThread.cpp index f1e6fad4..b0d95815 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/W9x/pnAceW9xThread.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/W9x/pnAceW9xThread.cpp @@ -392,7 +392,7 @@ bool W9xThreadWaitId ( AsyncId asyncId, unsigned timeoutMs ) { - ref(file); + REF(file); // Find a pending I/O operation with the given id s_critSect.Enter(); diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Win32/pnAceW32Thread.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Win32/pnAceW32Thread.cpp index 3251ad74..060069a9 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Win32/pnAceW32Thread.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Win32/pnAceW32Thread.cpp @@ -104,7 +104,7 @@ AsyncThreadTaskList::~AsyncThreadTaskList () { //=========================================================================== static unsigned THREADCALL ThreadTaskProc (AsyncThread * thread) { - ref(thread); + REF(thread); PerfAddCounter(kAsyncPerfThreadTaskThreadsActive, 1); @@ -266,7 +266,7 @@ void AsyncThreadTaskAdd ( ASSERT(taskList); ASSERT(callback); ASSERT(priority == kThreadTaskPriorityNormal); - ref(priority); + REF(priority); // Allocate a new task record ThreadTask * task = NEW(ThreadTask); diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceCore.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceCore.cpp index 07976ddf..4717bbe4 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceCore.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceCore.cpp @@ -91,7 +91,7 @@ static void DoTransgamingCheck () { //=========================================================================== static void IAsyncInitUseW9x () { - ref(IAsyncInitUseW9x); + REF(IAsyncInitUseW9x); #ifdef HS_BUILD_FOR_WIN32 W9xGetApi(&g_api); #else @@ -101,7 +101,7 @@ static void IAsyncInitUseW9x () { //=========================================================================== static void IAsyncInitUseNt () { - ref(IAsyncInitUseNt); + REF(IAsyncInitUseNt); #ifdef HS_BUILD_FOR_WIN32 NtGetApi(&g_api); #else @@ -111,7 +111,7 @@ static void IAsyncInitUseNt () { //=========================================================================== static void IAsyncInitUseUnix () { - ref(IAsyncInitUseUnix); + REF(IAsyncInitUseUnix); #ifdef HS_BUILD_FOR_UNIX #error Unix I/O not implemented yet UxGetApi(&g_api); @@ -122,7 +122,7 @@ static void IAsyncInitUseUnix () { //=========================================================================== static void IAsyncInitForClient () { - ref(IAsyncInitForClient); + REF(IAsyncInitForClient); #ifdef HS_BUILD_FOR_WIN32 DoTransgamingCheck(); if (s_transgaming) { @@ -140,7 +140,7 @@ static void IAsyncInitForClient () { //=========================================================================== static void IAsyncInitForServer () { - ref(IAsyncInitForServer); + REF(IAsyncInitForServer); #ifdef HS_BUILD_FOR_WIN32 IAsyncInitUseNt(); #elif HS_BUILD_FOR_UNIX diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceLog.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceLog.cpp index e105ef24..c6f738b3 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceLog.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceLog.cpp @@ -143,8 +143,8 @@ static void LogFileNotifyProc ( AsyncNotifyFile * notify, void ** userState ) { - ref(file); - ref(userState); + REF(file); + REF(userState); switch (code) { case kNotifyFileWrite: @@ -163,7 +163,7 @@ static void LogFileNotifyProc ( //============================================================================ static void AllocLogBuffer_CS (unsigned index) { - ref(AllocLogBuffer_CS); + REF(AllocLogBuffer_CS); ASSERT(!s_logBuf[index]); s_logBuf[index] = (char *)ALLOC(s_logSize[index]); @@ -175,7 +175,7 @@ static void AllocLogBuffer_CS (unsigned index) { //============================================================================ static void FreeLogBuffer_CS (unsigned index) { - ref(FreeLogBuffer_CS); + REF(FreeLogBuffer_CS); if (s_logBuf[index]) { FREE(s_logBuf[index]); @@ -322,7 +322,7 @@ static void FlushLogFile_CS ( unsigned index, TimeDesc timeDesc ) { - ref(FlushLogFile_CS); + REF(FlushLogFile_CS); bool close = !s_running || (s_logTime[index].day != timeDesc.day); WriteLogFile_CS(index, close); @@ -332,7 +332,7 @@ static void FlushLogFile_CS ( //============================================================================ static unsigned FlushLogsTimerCallback (void *) { - ref(FlushLogsTimerCallback); + REF(FlushLogsTimerCallback); AsyncLogFlush(); return kAsyncTimeInfinite; @@ -427,9 +427,9 @@ void AsyncLogWriteMsg ( ELogSeverity severity, const wchar msg[] ) { - ref(facility); - ref(severity); - ref(msg); + REF(facility); + REF(severity); + REF(msg); if (!s_running) return; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnIni/Private/pnIniCore.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnIni/Private/pnIniCore.cpp index ab6dd6cf..fd9c3b3d 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnIni/Private/pnIniCore.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnIni/Private/pnIniCore.cpp @@ -741,8 +741,8 @@ unsigned IniGetBoundedValue ( unsigned maxVal, unsigned defVal ) { - ref(key); - ref(section); + REF(key); + REF(section); if (!value) return defVal; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnIniExe/Private/Win32/pnW32IniChange.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnIniExe/Private/Win32/pnW32IniChange.cpp index 71469593..e98b9529 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnIniExe/Private/Win32/pnW32IniChange.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnIniExe/Private/Win32/pnW32IniChange.cpp @@ -126,7 +126,7 @@ static void ChangeDispatch_WL (IniChangeReg * marker) { //=========================================================================== static unsigned THREADCALL IniSrvThreadProc (AsyncThread * thread) { - ref(thread); + REF(thread); IniChangeReg marker; marker.fNotify = nil; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCli/pnNcCli.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCli/pnNcCli.cpp index a01c5151..d735cdfc 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCli/pnNcCli.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCli/pnNcCli.cpp @@ -143,7 +143,7 @@ namespace pnNetCli { static void PutBufferOnWire (NetCli * cli, void * data, unsigned bytes) { byte * temp, * heap = NULL; - ref(temp); + REF(temp); if (cli->mode == kNetCliModeEncrypted) { // Encrypt data... @@ -240,7 +240,7 @@ static void BufferedSendData ( return; unsigned_ptr const * const msgEnd = msg + fieldCount; - ref(msgEnd); + REF(msgEnd); const NetMsgInitSend * sendMsg = NetMsgChannelFindSendMessage(cli->channel, msg[0]); ASSERT(msg[0] == sendMsg->msg.messageId); @@ -1006,7 +1006,7 @@ bool NetCliDispatch ( if (cli->mode == kNetCliModeEncrypted) { // Decrypt data... byte * temp, * heap = NULL; - ref(temp); + REF(temp); #ifndef NO_ENCRYPTION if (bytes <= 2048) @@ -1024,7 +1024,7 @@ bool NetCliDispatch ( // Add data to accumulator and dispatch cli->input.Add(bytes, data); bool result = DispatchData(cli, param); - ref(result); + REF(result); #ifdef SERVER cli->recvDispatch = result; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.cpp index bbb6aa54..47934162 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.cpp @@ -156,8 +156,8 @@ static inline bool ICompareStringI (const T lhs[], const T rhs[]) { //============================================================================ static inline bool ICompareArray (const byte lhs[], const byte rhs[]) { - ref(lhs); - ref(rhs); + REF(lhs); + REF(rhs); return false; } diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnSimpleNet/pnSimpleNet.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnSimpleNet/pnSimpleNet.cpp index 7c9ae90c..6ce474ef 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnSimpleNet/pnSimpleNet.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnSimpleNet/pnSimpleNet.cpp @@ -412,7 +412,7 @@ static void AsyncLookupCallback ( unsigned addrCount, const NetAddress addrs[] ) { - ref(name); + REF(name); ConnectParam * cp = (ConnectParam *)param; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Addr.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Addr.cpp index 9fcff006..286d8dfd 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Addr.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Addr.cpp @@ -101,7 +101,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // 127.0.0.0 - 127.0.0.255 // (lowest) static int NetAddressNodeSortValueNetOrder (NetAddressNode addr) { - ref(NetAddressNodeSortValueNetOrder); + REF(NetAddressNodeSortValueNetOrder); // Loopback addresses if ((addr & kNetClassALoopbackMask) == (kNetClassALoopbackAddr & kNetClassALoopbackMask)) return 4; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.cpp index cdaa3f75..454fec27 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.cpp @@ -93,7 +93,7 @@ unsigned CBaseArray::CalcAllocGrowth (unsigned newAlloc, unsigned oldAlloc, unsi //=========================================================================== void * CBaseArray::ReallocPtr (void * ptr, unsigned bytes) { - ref(ptr); + REF(ptr); void * newPtr = nil; if (bytes) { newPtr = ALLOCFLAGS(bytes, ARR_MEMORY_FLAGS); diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.h index 9cf41443..ea182bd8 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.h @@ -291,12 +291,12 @@ template class TArrayCopyBits { public: inline static void Assign (T * dest, const T source[], unsigned count); - inline static void Construct (T * dest) { ref(dest); } - inline static void Construct (T * dest, unsigned count) { ref(dest); ref(count); } + inline static void Construct (T * dest) { REF(dest); } + inline static void Construct (T * dest, unsigned count) { REF(dest); REF(count); } inline static void CopyConstruct (T * dest, const T & source); inline static void CopyConstruct (T * dest, const T source[], unsigned count); - inline static void Destruct (T * dest) { ref(dest); } - inline static void Destruct (T * dest, unsigned count) { ref(dest); ref(count); } + inline static void Destruct (T * dest) { REF(dest); } + inline static void Destruct (T * dest, unsigned count) { REF(dest); REF(count); } }; //=========================================================================== @@ -378,14 +378,14 @@ void TArrayCopyObject::CopyConstruct (T * dest, const T source[], unsigned co //=========================================================================== template void TArrayCopyObject::Destruct (T * dest) { - ref(dest); + REF(dest); dest->~T(); } //=========================================================================== template void TArrayCopyObject::Destruct (T * dest, unsigned count) { - ref(dest); + REF(dest); for (unsigned loop = count; loop--; ) dest[loop].~T(); } diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBase64.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBase64.cpp index 9fab8390..876a6471 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBase64.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBase64.cpp @@ -107,7 +107,7 @@ unsigned Base64Encode ( ASSERT(dstChars >= Base64EncodeSize(srcChars)); ASSERT(dstData); - ref(dstChars); + REF(dstChars); const char * dstBase = dstData; const byte * srcTerm = srcData + srcChars; @@ -152,7 +152,7 @@ unsigned Base64Decode ( ASSERT(srcData); ASSERT(dstChars >= Base64DecodeSize(srcChars)); ASSERT(dstData); - ref(dstChars); + REF(dstChars); const byte * dstBase = dstData; const char * srcTerm = srcData + srcChars; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCmd.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCmd.cpp index 52ee3b4d..7a68cea4 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCmd.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCmd.cpp @@ -613,15 +613,15 @@ bool CCmdParser::IsSpecified (const wchar name[]) const { //=========================================================================== void CCmdParser::OnError (const wchar str[], ECmdError errorCode, const wchar arg[], const wchar value[]) { - ref(str); - ref(errorCode); - ref(arg); - ref(value); + REF(str); + REF(errorCode); + REF(arg); + REF(value); } //=========================================================================== bool CCmdParser::OnExtra (const wchar str[]) { - ref(str); + REF(str); return false; } diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCrypt.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCrypt.cpp index 49afbd8e..bf4465e2 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCrypt.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCrypt.cpp @@ -159,7 +159,7 @@ static void Rc4Codec ( unsigned sourceBytes, const void * sourceData ) { - ref(encrypt); // RC4 uses the same algorithm to both encrypt and decrypt + REF(encrypt); // RC4 uses the same algorithm to both encrypt and decrypt dest->SetCount(sourceBytes); RC4((RC4_KEY *)key->handle, sourceBytes, (const unsigned char *)sourceData, dest->Ptr()); } @@ -171,7 +171,7 @@ static void Rc4Codec ( unsigned bytes, void * data ) { - ref(encrypt); // RC4 uses the same algorithm to both encrypt and decrypt + REF(encrypt); // RC4 uses the same algorithm to both encrypt and decrypt byte * temp = ALLOCA(byte, bytes); RC4((RC4_KEY *)key->handle, bytes, (const unsigned char *)data, temp); MemCopy(data, temp, bytes); @@ -181,7 +181,7 @@ static void Rc4Codec ( //=========================================================================== void KeyRc4::Codec (bool encrypt, ARRAY(byte) * dest, unsigned sourceBytes, const void * sourceData) { - ref(encrypt); // RC4 uses the same algorithm to both encrypt and decrypt + REF(encrypt); // RC4 uses the same algorithm to both encrypt and decrypt dest->SetCount(sourceBytes); byte * destDataPtr = (byte *)dest->Ptr(); @@ -381,8 +381,8 @@ void CryptKeyGenerate ( break; case kCryptRsa: - ref(keyBits); - ref(publicData); + REF(keyBits); + REF(publicData); #if 0 KeyRsa::KeyGen( keyBits, diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtEndian.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtEndian.h index a9ffe7cb..08baff4e 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtEndian.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtEndian.h @@ -90,8 +90,8 @@ inline void EndianConvert ( word * array, unsigned count ) { - ref(array); - ref(count); + REF(array); + REF(count); return; } @@ -100,8 +100,8 @@ inline void EndianConvert ( dword * array, unsigned count ) { - ref(array); - ref(count); + REF(array); + REF(count); return; } @@ -110,8 +110,8 @@ inline void EndianConvert ( qword * array, unsigned count ) { - ref(array); - ref(count); + REF(array); + REF(count); return; } @@ -121,9 +121,9 @@ inline void EndianConvert ( unsigned elemCount, unsigned elemBytes ) { - ref(data); - ref(elemCount); - ref(elemBytes); + REF(data); + REF(elemCount); + REF(elemBytes); return; } diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtHash.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtHash.h index 870b72de..3bb68d8e 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtHash.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtHash.h @@ -219,7 +219,7 @@ TBaseHashTable::TBaseHashTable () { //=========================================================================== template TBaseHashTable::TBaseHashTable (const TBaseHashTable & source) { - ref(source); + REF(source); #ifdef HS_DEBUGGING FATAL("No copy constructor"); #endif @@ -229,7 +229,7 @@ TBaseHashTable::TBaseHashTable (const TBaseHashTable & source) { //=========================================================================== template TBaseHashTable & TBaseHashTable::operator= (const TBaseHashTable & source) { - ref(source); + REF(source); #ifdef HS_DEBUGGING FATAL("No assignment operator"); #endif @@ -345,7 +345,7 @@ const T * TBaseHashTable::Next (const T * object) const { template void TBaseHashTable::Order (T * linkedObject, ELinkType linkType, T * existingObject) { THashLink & link = GetLink(linkedObject); - ref(link); + REF(link); ASSERT(link.m_linkToFull.IsLinked()); m_fullList.Link(linkedObject, linkType, existingObject); } diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtList.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtList.h index 4e62943d..75f04aec 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtList.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtList.h @@ -138,7 +138,7 @@ CBaseLink::CBaseLink () { //=========================================================================== CBaseLink::CBaseLink (const CBaseLink & source) { - ref(source); + REF(source); #ifdef HS_DEBUGGING if (source.IsLinked()) FATAL("No copy constructor"); @@ -153,7 +153,7 @@ CBaseLink::~CBaseLink () { //=========================================================================== CBaseLink & CBaseLink::operator= (const CBaseLink & source) { - ref(source); + REF(source); #ifdef HS_DEBUGGING FATAL("No assignment operator"); #endif @@ -364,7 +364,7 @@ CBaseList::CBaseList () { //=========================================================================== CBaseList::CBaseList (const CBaseList & source) { m_linkOffset = LINK_OFFSET_UNINIT; - ref(source); + REF(source); } //=========================================================================== @@ -375,7 +375,7 @@ CBaseList::~CBaseList () { //=========================================================================== CBaseList & CBaseList::operator= (const CBaseList & source) { - ref(source); + REF(source); return *this; } diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtRef.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtRef.h index 9441298c..c9592a10 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtRef.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtRef.h @@ -102,7 +102,7 @@ public: ASSERT(!zeroed); #endif long prev = AtomicAdd(&m_ref, 1); - ref(tag); + REF(tag); REFTRACE("Inc %p %s: %u", this, tag, prev+1); return prev+1; } @@ -119,7 +119,7 @@ public: ASSERT(!zeroed); #endif long prev = AtomicAdd(&m_ref, n); - ref(tag); + REF(tag); REFTRACE("Inc %p %s: %u", this, tag, prev+n); return prev+n; } @@ -149,7 +149,7 @@ public: #endif OnZeroRef(); } - ref(tag); + REF(tag); REFTRACE("Dec %p %s: %u", this, tag, prev-1); return prev-1; } @@ -161,8 +161,8 @@ public: #ifdef HS_DEBUGGING ASSERT(!zeroed); #endif - ref(oldTag); - ref(newTag); + REF(oldTag); + REF(newTag); REFTRACE("Inc %p %s: (xfer)", this, newTag); REFTRACE("Dec %p %s: (xfer)", this, oldTag); } diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSpareList.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSpareList.cpp index c76aeb5f..bdde90c8 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSpareList.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSpareList.cpp @@ -93,7 +93,7 @@ void CBaseSpareList::Free (void * object, unsigned objectSize) { #ifdef HS_DEBUGGING MemSet(object, (byte) ((unsigned) object >> 4), objectSize); #else - ref(objectSize); + REF(objectSize); #endif // link memory block onto head of spare list @@ -157,7 +157,7 @@ void CBaseSpareList::CleanUp (const char typeName[]) { #endif } #else - ref(typeName); + REF(typeName); #endif // walk chain of AllocNodes and free each of them diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtUuid.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtUuid.h index 9c19f23b..b47e8e57 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtUuid.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtUuid.h @@ -110,9 +110,9 @@ struct Uuid { inline bool operator ! () const { return GuidIsNil(*this); } inline bool operator < (const Uuid & rhs) const { return GuidCompare(*this, rhs) < 0; } inline bool operator == (const Uuid & rhs) const { return GuidsAreEqual(*this, rhs); } - inline bool operator == (int rhs) const { ref(rhs); ASSERT(!rhs); return GuidsAreEqual(*this, kNilGuid); } + inline bool operator == (int rhs) const { REF(rhs); ASSERT(!rhs); return GuidsAreEqual(*this, kNilGuid); } inline bool operator != (const Uuid & rhs) const { return !GuidsAreEqual(*this, rhs); } - inline bool operator != (int rhs) const { ref(rhs); ASSERT(!rhs); return !GuidsAreEqual(*this, kNilGuid); } + inline bool operator != (int rhs) const { REF(rhs); ASSERT(!rhs); return !GuidsAreEqual(*this, kNilGuid); } }; #include diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.cpp index 39d4ddc1..6ece7cd1 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.cpp @@ -448,7 +448,7 @@ static void INetCliAuthCreatePlayerRequestCallback ( void * param, const NetCliAuthPlayerInfo & playerInfo ) { - ref(param); + REF(param); if (IS_NET_ERROR(result)) { LogMsg(kLogDebug, L"Create player failed: %s", NetErrorToString(result)); @@ -522,7 +522,7 @@ static void INetCliAuthChangePasswordCallback ( ENetError result, void * param ) { - ref(param); + REF(param); if (IS_NET_ERROR(result)) { LogMsg(kLogDebug, L"Change password failed: %s", NetErrorToString(result)); diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp index 15eb6c75..17769cac 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp @@ -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."); } diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglCsr.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglCsr.cpp index 160236a2..d2ef1da6 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglCsr.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglCsr.cpp @@ -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; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglFile.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglFile.cpp index 5c9272a5..3bc666a7 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglFile.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglFile.cpp @@ -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; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGame.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGame.cpp index 6490daf8..e08fc897 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGame.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGame.cpp @@ -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; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGateKeeper.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGateKeeper.cpp index b418e123..1265a25d 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGateKeeper.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGateKeeper.cpp @@ -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;