OU
/
CWE-ou-minkata
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
2
1
Fork 0
Code Releases Activity
Browse Source

Merge pull request #499 from zrax/vc2015 

Fix static initialization order dependency in MSVC2015
Adam Johnson 10 years ago
parent
239a2d0208 bffe08b7d4
commit
737515cab9
6 changed files with 29 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      Sources/Plasma/NucleusLib/pnNetCli/pnNcChannel.cpp
  2. 22
      Sources/Plasma/NucleusLib/pnNetCli/pnNcCli.cpp
  3. 4
      Sources/Plasma/NucleusLib/pnNetCli/pnNetCli.h
  4. 4
      Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp
  5. 4
      Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGame.cpp
  6. 4
      Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGateKeeper.cpp

20
Sources/Plasma/NucleusLib/pnNetCli/pnNcChannel.cpp
Unescape View File

@ -204,8 +204,8 @@ static unsigned MaxMsgId (const T msgs[], unsigned count) {
unsigned maxMsgId = 0; unsigned maxMsgId = 0;
for (unsigned i = 0; i < count; i++) { for (unsigned i = 0; i < count; i++) {
ASSERT(msgs[i].msg.count); ASSERT(msgs[i].msg->count);
maxMsgId = std::max(msgs[i].msg.messageId, maxMsgId); maxMsgId = std::max(msgs[i].msg->messageId, maxMsgId);
} }
return maxMsgId; return maxMsgId;
} }
@ -219,13 +219,13 @@ static void AddSendMsgs_CS (
channel->m_sendMsgs.GrowToFit(MaxMsgId(src, count), true); channel->m_sendMsgs.GrowToFit(MaxMsgId(src, count), true);
for (const NetMsgInitSend * term = src + count; src < term; ++src) { for (const NetMsgInitSend * term = src + count; src < term; ++src) {
NetMsgInitSend * const dst = &channel->m_sendMsgs[src[0].msg.messageId]; NetMsgInitSend * const dst = &channel->m_sendMsgs[src[0].msg->messageId];
// check to ensure that the message id isn't already used // check to ensure that the message id isn't already used
ASSERT(!dst->msg.count); ASSERT(!dst->msg);
*dst = *src; *dst = *src;
ValidateMsg(dst->msg); ValidateMsg(*dst->msg);
} }
} }
@ -239,15 +239,15 @@ static void AddRecvMsgs_CS (
for (const NetMsgInitRecv * term = src + count; src < term; ++src) { for (const NetMsgInitRecv * term = src + count; src < term; ++src) {
ASSERT(src->recv); ASSERT(src->recv);
NetMsgInitRecv * const dst = &channel->m_recvMsgs[src[0].msg.messageId]; NetMsgInitRecv * const dst = &channel->m_recvMsgs[src[0].msg->messageId];
// check to ensure that the message id isn't already used // check to ensure that the message id isn't already used
ASSERT(!dst->msg.count); ASSERT(!dst->msg);
// copy the message handler // copy the message handler
*dst = *src; *dst = *src;
const uint32_t bytes = ValidateMsg(dst->msg); const uint32_t bytes = ValidateMsg(*dst->msg);
channel->m_largestRecv = std::max(channel->m_largestRecv, bytes); channel->m_largestRecv = std::max(channel->m_largestRecv, bytes);
} }
} }
@ -332,7 +332,7 @@ const NetMsgInitRecv * NetMsgChannelFindRecvMessage (
// Is message defined? // Is message defined?
const NetMsgInitRecv * recvMsg = &channel->m_recvMsgs[messageId]; const NetMsgInitRecv * recvMsg = &channel->m_recvMsgs[messageId];
if (!recvMsg->msg.count) if (!recvMsg->msg->count)
return nil; return nil;
// Success! // Success!
@ -349,7 +349,7 @@ const NetMsgInitSend * NetMsgChannelFindSendMessage (
// Is message defined? // Is message defined?
const NetMsgInitSend * sendMsg = &channel->m_sendMsgs[messageId]; const NetMsgInitSend * sendMsg = &channel->m_sendMsgs[messageId];
ASSERTMSG(sendMsg->msg.count, "NetMsg not found for send"); ASSERTMSG(sendMsg->msg->count, "NetMsg not found for send");
return sendMsg; return sendMsg;
} }

22
Sources/Plasma/NucleusLib/pnNetCli/pnNcCli.cpp
Unescape View File

@ -283,8 +283,8 @@ static void BufferedSendData (
uintptr_t const * const msgEnd = msg + fieldCount; uintptr_t const * const msgEnd = msg + fieldCount;
const NetMsgInitSend * sendMsg = NetMsgChannelFindSendMessage(cli->channel, msg[0]); const NetMsgInitSend * sendMsg = NetMsgChannelFindSendMessage(cli->channel, msg[0]);
ASSERT(msg[0] == sendMsg->msg.messageId); ASSERT(msg[0] == sendMsg->msg->messageId);
ASSERT(fieldCount-1 == sendMsg->msg.count); ASSERT(fieldCount-1 == sendMsg->msg->count);
// insert messageId into command stream // insert messageId into command stream
const uint16_t msgId = hsToLE16((uint16_t)msg[0]); const uint16_t msgId = hsToLE16((uint16_t)msg[0]);
@ -295,8 +295,8 @@ static void BufferedSendData (
// insert fields into command stream // insert fields into command stream
uint32_t varCount = 0; uint32_t varCount = 0;
uint32_t varSize = 0; uint32_t varSize = 0;
const NetMsgField * cmd = sendMsg->msg.fields; const NetMsgField * cmd = sendMsg->msg->fields;
const NetMsgField * cmdEnd = cmd + sendMsg->msg.count; const NetMsgField * cmdEnd = cmd + sendMsg->msg->count;
for (; cmd < cmdEnd; ++msg, ++cmd) { for (; cmd < cmdEnd; ++msg, ++cmd) {
switch (cmd->type) { switch (cmd->type) {
case kNetMsgFieldInteger: { case kNetMsgFieldInteger: {
@ -429,7 +429,7 @@ static bool DispatchData (NetCli * cli, void * param) {
// prepare to start decompressing new fields // prepare to start decompressing new fields
ASSERT(!cli->recvField); ASSERT(!cli->recvField);
ASSERT(!cli->recvFieldBytes); ASSERT(!cli->recvFieldBytes);
cli->recvField = cli->recvMsg->msg.fields; cli->recvField = cli->recvMsg->msg->fields;
cli->recvBuffer.ZeroCount(); cli->recvBuffer.ZeroCount();
cli->recvBuffer.Reserve(kAsyncSocketBufferSize); cli->recvBuffer.Reserve(kAsyncSocketBufferSize);
@ -439,7 +439,7 @@ static bool DispatchData (NetCli * cli, void * param) {
} }
for ( for (
const NetMsgField * end = cli->recvMsg->msg.fields + cli->recvMsg->msg.count; const NetMsgField * end = cli->recvMsg->msg->fields + cli->recvMsg->msg->count;
cli->recvField < end; cli->recvField < end;
++cli->recvField ++cli->recvField
) { ) {
@ -574,7 +574,7 @@ static bool DispatchData (NetCli * cli, void * param) {
} }
// dispatch message to handler function // dispatch message to handler function
NCCLI_LOG(kLogPerf, L"pnNetCli: Dispatching. msg: %S. cli: %p", cli->recvMsg ? cli->recvMsg->msg.name : "(unknown)", cli); NCCLI_LOG(kLogPerf, L"pnNetCli: Dispatching. msg: %S. cli: %p", cli->recvMsg ? cli->recvMsg->msg->name : "(unknown)", cli);
if (!cli->recvMsg->recv(cli->recvBuffer.Ptr(), cli->recvBuffer.Count(), param)) if (!cli->recvMsg->recv(cli->recvBuffer.Ptr(), cli->recvBuffer.Count(), param))
goto ERR_DISPATCH_FAILED; goto ERR_DISPATCH_FAILED;
@ -592,19 +592,19 @@ static bool DispatchData (NetCli * cli, void * param) {
// these are used for convenience in setting breakpoints // these are used for convenience in setting breakpoints
NEED_MORE_DATA: NEED_MORE_DATA:
NCCLI_LOG(kLogPerf, L"pnNetCli: NEED_MORE_DATA. msg: %S (%u). cli: %p", cli->recvMsg ? cli->recvMsg->msg.name : "(unknown)", msgId, cli); NCCLI_LOG(kLogPerf, L"pnNetCli: NEED_MORE_DATA. msg: %S (%u). cli: %p", cli->recvMsg ? cli->recvMsg->msg->name : "(unknown)", msgId, cli);
return true; return true;
ERR_BAD_COUNT: ERR_BAD_COUNT:
LogMsg(kLogError, L"pnNetCli: ERR_BAD_COUNT. msg: %S (%u). cli: %p", cli->recvMsg ? cli->recvMsg->msg.name : "(unknown)", msgId, cli); LogMsg(kLogError, L"pnNetCli: ERR_BAD_COUNT. msg: %S (%u). cli: %p", cli->recvMsg ? cli->recvMsg->msg->name : "(unknown)", msgId, cli);
return false; return false;
ERR_NO_HANDLER: ERR_NO_HANDLER:
LogMsg(kLogError, L"pnNetCli: ERR_NO_HANDLER. msg: %S (%u). cli: %p", cli->recvMsg ? cli->recvMsg->msg.name : "(unknown)", msgId, cli); LogMsg(kLogError, L"pnNetCli: ERR_NO_HANDLER. msg: %S (%u). cli: %p", cli->recvMsg ? cli->recvMsg->msg->name : "(unknown)", msgId, cli);
return false; return false;
ERR_DISPATCH_FAILED: ERR_DISPATCH_FAILED:
LogMsg(kLogError, L"pnNetCli: ERR_DISPATCH_FAILED. msg: %S (%u). cli: %p", cli->recvMsg ? cli->recvMsg->msg.name : "(unknown)", msgId, cli); LogMsg(kLogError, L"pnNetCli: ERR_DISPATCH_FAILED. msg: %S (%u). cli: %p", cli->recvMsg ? cli->recvMsg->msg->name : "(unknown)", msgId, cli);
return false; return false;
} }

4
Sources/Plasma/NucleusLib/pnNetCli/pnNetCli.h
Unescape View File

@ -311,10 +311,10 @@ struct NetCliQueue;
***/ ***/
struct NetMsgInitSend { struct NetMsgInitSend {
NetMsg msg; const NetMsg *msg;
}; };
struct NetMsgInitRecv { struct NetMsgInitRecv {
NetMsg msg; const NetMsg *msg;
bool (* recv)(const uint8_t msg[], unsigned bytes, void * param); bool (* recv)(const uint8_t msg[], unsigned bytes, void * param);
}; };

4
Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp
Unescape View File

@ -2345,7 +2345,7 @@ static bool Recv_ScoreGetRanksReply (
* *
***/ ***/
#define MSG(s) kNetMsg_Cli2Auth_##s #define MSG(s) &kNetMsg_Cli2Auth_##s
static NetMsgInitSend s_send[] = { static NetMsgInitSend s_send[] = {
{ MSG(PingRequest) }, { MSG(PingRequest) },
{ MSG(ClientRegisterRequest) }, { MSG(ClientRegisterRequest) },
@ -2396,7 +2396,7 @@ static NetMsgInitSend s_send[] = {
}; };
#undef MSG #undef MSG
#define MSG(s) kNetMsg_Auth2Cli_##s, Recv_##s #define MSG(s) &kNetMsg_Auth2Cli_##s, Recv_##s
static NetMsgInitRecv s_recv[] = { static NetMsgInitRecv s_recv[] = {
{ MSG(PingReply) }, { MSG(PingReply) },
{ MSG(ClientRegisterReply) }, { MSG(ClientRegisterReply) },

4
Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGame.cpp
Unescape View File

@ -550,7 +550,7 @@ static bool Recv_GameMgrMsg (
//============================================================================ //============================================================================
// Send/Recv protocol handler init // Send/Recv protocol handler init
//============================================================================ //============================================================================
#define MSG(s) kNetMsg_Cli2Game_##s #define MSG(s) &kNetMsg_Cli2Game_##s
static NetMsgInitSend s_send[] = { static NetMsgInitSend s_send[] = {
{ MSG(PingRequest), }, { MSG(PingRequest), },
{ MSG(JoinAgeRequest), }, { MSG(JoinAgeRequest), },
@ -559,7 +559,7 @@ static NetMsgInitSend s_send[] = {
}; };
#undef MSG #undef MSG
#define MSG(s) kNetMsg_Game2Cli_##s, Recv_##s #define MSG(s) &kNetMsg_Game2Cli_##s, Recv_##s
static NetMsgInitRecv s_recv[] = { static NetMsgInitRecv s_recv[] = {
{ MSG(PingReply) }, { MSG(PingReply) },
{ MSG(JoinAgeReply), }, { MSG(JoinAgeReply), },

4
Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGateKeeper.cpp
Unescape View File

@ -732,7 +732,7 @@ static bool Recv_AuthSrvIpAddressReply (
* *
***/ ***/
#define MSG(s) kNetMsg_Cli2GateKeeper_##s #define MSG(s) &kNetMsg_Cli2GateKeeper_##s
static NetMsgInitSend s_send[] = { static NetMsgInitSend s_send[] = {
{ MSG(PingRequest) }, { MSG(PingRequest) },
{ MSG(FileSrvIpAddressRequest) }, { MSG(FileSrvIpAddressRequest) },
@ -740,7 +740,7 @@ static NetMsgInitSend s_send[] = {
}; };
#undef MSG #undef MSG
#define MSG(s) kNetMsg_GateKeeper2Cli_##s, Recv_##s #define MSG(s) &kNetMsg_GateKeeper2Cli_##s, Recv_##s
static NetMsgInitRecv s_recv[] = { static NetMsgInitRecv s_recv[] = {
{ MSG(PingReply) }, { MSG(PingReply) },
{ MSG(FileSrvIpAddressReply) }, { MSG(FileSrvIpAddressReply) },

Write Preview
Loading…
Cancel
Save