OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 02:27:40 -04:00
Code Releases Activity

Replace Uuid with plUUID EVERYWHERE.

Browse Source
This commit is contained in:
Darryl Pogue
2012-12-29 02:05:23 -08:00
parent a0641ba66b
commit bcf6e97d23
78 changed files with 427 additions and 892 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp
View File

@ -92,7 +92,7 @@ struct CliAuConn : AtomicRef {
NetCli * cli;
char name[MAX_PATH];
plNetAddress addr;
Uuid token;
plUUID token;
unsigned seq;
unsigned serverChallenge;
AsyncCancelId cancelId;
@ -161,7 +161,7 @@ struct LoginRequestTrans : NetAuthTrans {
FNetCliAuthLoginRequestCallback m_callback;
void * m_param;
Uuid m_accountId;
plUUID m_accountId;
unsigned m_accountFlags;
unsigned m_billingType;
unsigned m_playerCount;
@ -195,13 +195,13 @@ struct AgeRequestTrans : NetAuthTrans {
void * m_param;
wchar_t m_ageName[kMaxAgeNameLength];
unsigned m_ageMcpId;
Uuid m_ageInstId;
plUUID m_ageInstId;
unsigned m_ageVaultId;
uint32_t m_gameSrvNode;
AgeRequestTrans (
const wchar_t ageName[],
const Uuid & ageInstId,
const plUUID& ageInstId,
FNetCliAuthAgeRequestCallback callback,
void * param
);
@ -229,7 +229,7 @@ struct AccountCreateRequestTrans : NetAuthTrans {
unsigned m_billingType;
// recv
Uuid m_accountId;
plUUID m_accountId;
AccountCreateRequestTrans (
const wchar_t accountName[],
@ -258,17 +258,17 @@ struct AccountCreateFromKeyRequestTrans : NetAuthTrans {
// send
wchar_t m_accountName[kMaxAccountNameLength];
ShaDigest m_namePassHash;
Uuid m_key;
plUUID m_key;
unsigned m_billingType;
// recv
Uuid m_accountId;
Uuid m_activationKey;
plUUID m_accountId;
plUUID m_activationKey;
AccountCreateFromKeyRequestTrans (
const wchar_t accountName[],
const wchar_t password[],
const Uuid & key,
AccountCreateFromKeyRequestTrans(
const wchar_t accountName[],
const wchar_t password[],
const plUUID& key,
unsigned billingType,
FNetCliAuthAccountCreateFromKeyRequestCallback callback,
void * param
@ -505,10 +505,10 @@ struct AccountActivateRequestTrans : NetAuthTrans {
void * m_param;
// send
Uuid m_activationKey;
plUUID m_activationKey;
AccountActivateRequestTrans (
const Uuid & activationKey,
const plUUID& activationKey,
FNetCliAuthAccountActivateRequestCallback callback,
void * param
);
@ -609,7 +609,7 @@ struct RcvdPropagatedBufferTrans : NetNotifyTrans {
struct VaultNodeChangedTrans : NetNotifyTrans {
unsigned m_nodeId;
Uuid m_revId;
plUUID m_revId;
VaultNodeChangedTrans () : NetNotifyTrans(kVaultNodeChangedTrans) {}
void Post ();
@ -683,8 +683,8 @@ struct VaultInitAgeTrans : NetAuthTrans {
FNetCliAuthAgeInitCallback m_callback;
void * m_param;
Uuid m_ageInstId;
Uuid m_parentAgeInstId;
plUUID m_ageInstId;
plUUID m_parentAgeInstId;
wchar_t * m_ageFilename;
wchar_t * m_ageInstName;
wchar_t * m_ageUserName;
@ -695,15 +695,15 @@ struct VaultInitAgeTrans : NetAuthTrans {
unsigned m_ageId;
unsigned m_ageInfoId;
VaultInitAgeTrans (
VaultInitAgeTrans(
FNetCliAuthAgeInitCallback callback, // optional
void * param, // optional
const Uuid & ageInstId, // optional. is used in match
const Uuid & parentAgeInstId, // optional. is used in match
const wchar_t ageFilename[], // optional. is used in match
const wchar_t ageInstName[], // optional. not used in match
const wchar_t ageUserName[], // optional. not used in match
const wchar_t ageDesc[], // optional. not used in match
const plUUID& ageInstId, // optional. is used in match
const plUUID& parentAgeInstId, // optional. is used in match
const wchar_t ageFilename[], // optional. is used in match
const wchar_t ageInstName[], // optional. not used in match
const wchar_t ageUserName[], // optional. not used in match
const wchar_t ageDesc[], // optional. not used in match
unsigned ageSequenceNumber, // optional. not used in match
unsigned ageLanguage // optional. not used in match
);
@ -800,14 +800,14 @@ struct VaultCreateNodeTrans : NetAuthTrans {
struct VaultSaveNodeTrans : NetAuthTrans {
unsigned m_nodeId;
Uuid m_revisionId;
plUUID m_revisionId;
ARRAY(uint8_t) m_buffer;
FNetCliAuthVaultNodeSaveCallback m_callback;
void * m_param;
VaultSaveNodeTrans (
unsigned nodeId,
const Uuid & revisionId,
const plUUID& revisionId,
unsigned dataCount,
const void * data,
FNetCliAuthVaultNodeSaveCallback callback,
@ -945,12 +945,12 @@ struct SendFriendInviteTrans : NetAuthTrans {
// send
wchar_t m_emailAddress[kMaxEmailAddressLength];
wchar_t m_toName[kMaxPlayerNameLength];
Uuid m_inviteUuid;
plUUID m_inviteUuid;
SendFriendInviteTrans (
const wchar_t emailAddr[],
const wchar_t toName[],
const Uuid & inviteUuid,
SendFriendInviteTrans(
const wchar_t emailAddr[],
const wchar_t toName[],
const plUUID& inviteUuid,
FNetCliAuthSendFriendInviteCallback callback,
void * param
);
@ -1371,7 +1371,7 @@ static void CheckedReconnect (CliAuConn * conn, ENetError error) {
ReportNetError(kNetProtocolCli2Auth, error);
}
else {
if (conn->token != kNilGuid)
if (conn->token != kNilUuid)
// previously encrypted; reconnect quickly
conn->reconnectStartMs = GetNonZeroTimeMs() + 500;
else
@ -2595,7 +2595,7 @@ LoginRequestTrans::LoginRequestTrans (
) : NetAuthTrans(kLoginRequestTrans)
, m_callback(callback)
, m_param(param)
, m_accountId(kNilGuid)
, m_accountId(kNilUuid)
, m_accountFlags(0)
, m_playerCount(0)
{
@ -2717,7 +2717,7 @@ bool LoginRequestTrans::Recv (
//============================================================================
AgeRequestTrans::AgeRequestTrans (
const wchar_t ageName[],
const Uuid & ageInstId,
const plUUID& ageInstId,
FNetCliAuthAgeRequestCallback callback,
void * param
) : NetAuthTrans(kAgeRequestTrans)
@ -2859,7 +2859,7 @@ bool AccountCreateRequestTrans::Recv (
AccountCreateFromKeyRequestTrans::AccountCreateFromKeyRequestTrans (
const wchar_t accountName[],
const wchar_t password[],
const Uuid & key,
const plUUID& key,
unsigned billingType,
FNetCliAuthAccountCreateFromKeyRequestCallback callback,
void * param
@ -3394,7 +3394,7 @@ bool AccountSetBillingTypeRequestTrans::Recv (
//============================================================================
AccountActivateRequestTrans::AccountActivateRequestTrans (
const Uuid & activationKey,
const plUUID& activationKey,
FNetCliAuthAccountActivateRequestCallback callback,
void * param
) : NetAuthTrans(kAccountActivateRequestTrans)
@ -3805,12 +3805,12 @@ bool VaultFetchNodeRefsTrans::Recv (
VaultInitAgeTrans::VaultInitAgeTrans (
FNetCliAuthAgeInitCallback callback, // optional
void * param, // optional
const Uuid & ageInstId, // optional. is used in match
const Uuid & parentAgeInstId, // optional. is used in match
const wchar_t ageFilename[], // optional. is used in match
const wchar_t ageInstName[], // optional. not used in match
const wchar_t ageUserName[], // optional. not used in match
const wchar_t ageDesc[], // optional. not used in match
const plUUID& ageInstId, // optional. is used in match
const plUUID& parentAgeInstId, // optional. is used in match
const wchar_t ageFilename[], // optional. is used in match
const wchar_t ageInstName[], // optional. not used in match
const wchar_t ageUserName[], // optional. not used in match
const wchar_t ageDesc[], // optional. not used in match
unsigned ageSequenceNumber, // optional. not used in match
unsigned ageLanguage // optional. not used in match
) : NetAuthTrans(kVaultInitAgeTrans)
@ -4100,7 +4100,7 @@ bool VaultCreateNodeTrans::Recv (
//============================================================================
VaultSaveNodeTrans::VaultSaveNodeTrans (
unsigned nodeId,
const Uuid & revisionId,
const plUUID& revisionId,
unsigned dataCount,
const void * data,
FNetCliAuthVaultNodeSaveCallback callback,
@ -4415,9 +4415,9 @@ bool ChangePlayerNameRequestTrans::Recv (
//============================================================================
SendFriendInviteTrans::SendFriendInviteTrans (
const wchar_t emailAddr[],
const wchar_t toName[],
const Uuid & inviteUuid,
const wchar_t emailAddr[],
const wchar_t toName[],
const plUUID& inviteUuid,
FNetCliAuthSendFriendInviteCallback callback,
void * param
) : NetAuthTrans(kSendFriendInviteTrans)
@ -4521,7 +4521,7 @@ bool ScoreCreateTrans::Send () {
m_ownerId,
(uintptr_t) wgameName,
m_gameType,
m_value
(uintptr_t)m_value
};
m_conn->Send(msg, arrsize(msg));
@ -4727,7 +4727,7 @@ bool ScoreAddPointsTrans::Send () {
kCli2Auth_ScoreAddPoints,
m_transId,
m_scoreId,
m_numPoints,
(uintptr_t)m_numPoints,
};
m_conn->Send(msg, arrsize(msg));
@ -4789,7 +4789,7 @@ bool ScoreTransferPointsTrans::Send () {
m_transId,
m_srcScoreId,
m_destScoreId,
m_numPoints,
(uintptr_t)m_numPoints,
};
m_conn->Send(msg, arrsize(msg));
@ -4848,7 +4848,7 @@ bool ScoreSetPointsTrans::Send () {
kCli2Auth_ScoreSetPoints,
m_transId,
m_scoreId,
m_numPoints,
(uintptr_t)m_numPoints,
};
m_conn->Send(msg, arrsize(msg));
@ -5249,7 +5249,7 @@ void NetCliAuthLoginRequest (
//============================================================================
void NetCliAuthAgeRequest (
const wchar_t ageName[],
const Uuid & ageInstId,
const plUUID& ageInstId,
FNetCliAuthAgeRequestCallback callback,
void * param
) {
@ -5296,7 +5296,7 @@ void NetCliAuthAccountCreateRequest (
void NetCliAuthAccountCreateFromKeyRequest (
const wchar_t accountName[],
const wchar_t password[],
Uuid key,
plUUID key,
unsigned billingType,
FNetCliAuthAccountCreateFromKeyRequestCallback callback,
void * param
@ -5482,7 +5482,7 @@ void NetCliAuthAccountSetBillingTypeRequest (
//============================================================================
void NetCliAuthAccountActivateRequest (
const Uuid & activationKey,
const plUUID& activationKey,
FNetCliAuthAccountActivateRequestCallback callback,
void * param
) {
@ -5624,7 +5624,7 @@ unsigned NetCliAuthVaultNodeSave (
node->dirtyFlags |= NetVaultNode::kNodeType;
// We're definitely saving this node, so assign a revisionId
node->revisionId = (Uuid)plUUID::Generate();
node->revisionId = plUUID::Generate();
ARRAY(uint8_t) buffer;
unsigned bytes = node->Write_LCS(&buffer, NetVaultNode::kRwDirtyOnly | NetVaultNode::kRwUpdateDirty);
@ -5740,8 +5740,8 @@ void NetCliAuthVaultSendNode (
//============================================================================
void NetCliAuthVaultInitAge (
const Uuid & ageInstId, // optional. is used in match
const Uuid & parentAgeInstId, // optional. is used in match
const plUUID& ageInstId, // optional. is used in match
const plUUID& parentAgeInstId, // optional. is used in match
const wchar_t ageFilename[], // optional. is used in match
const wchar_t ageInstName[], // optional. not used in match
const wchar_t ageUserName[], // optional. not used in match
@ -5913,7 +5913,7 @@ void NetCliAuthChangePlayerNameRequest (
void NetCliAuthSendFriendInvite (
const wchar_t emailAddress[],
const wchar_t toName[],
const Uuid& inviteUuid,
const plUUID& inviteUuid,
FNetCliAuthSendFriendInviteCallback callback,
void * param
) {

24
Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.h
View File

@ -128,7 +128,7 @@ struct NetCliAuthPlayerInfo {
typedef void (*FNetCliAuthLoginRequestCallback)(
ENetError result,
void * param,
const Uuid & accountId,
const plUUID& accountId,
unsigned accountFlags,
unsigned billingType,
const NetCliAuthPlayerInfo playerInfoArr[],
@ -162,7 +162,7 @@ void NetCliAuthSetPlayerRequest (
typedef void (*FNetCliAuthAccountCreateRequestCallback)(
ENetError result,
void * param,
const Uuid & accountId
const plUUID& accountId
);
void NetCliAuthAccountCreateRequest (
const wchar_t accountName[],
@ -179,13 +179,13 @@ void NetCliAuthAccountCreateRequest (
typedef void (*FNetCliAuthAccountCreateFromKeyRequestCallback)(
ENetError result,
void * param,
const Uuid & accountId,
const Uuid & activationKey
const plUUID& accountId,
const plUUID& activationKey
);
void NetCliAuthAccountCreateFromKeyRequest (
const wchar_t accountName[],
const wchar_t accountPass[],
Uuid key,
plUUID key,
unsigned billingType,
FNetCliAuthAccountCreateFromKeyRequestCallback callback,
void * param
@ -313,7 +313,7 @@ typedef void (*FNetCliAuthAccountActivateRequestCallback)(
void * param
);
void NetCliAuthAccountActivateRequest (
const Uuid & activationKey,
const plUUID& activationKey,
FNetCliAuthAccountActivateRequestCallback callback,
void * param
);
@ -326,12 +326,12 @@ typedef void (*FNetCliAuthAgeRequestCallback)(
void * param,
unsigned ageMcpId,
unsigned ageVaultId,
const Uuid & ageInstId,
const plUUID& ageInstId,
plNetAddress gameAddr
);
void NetCliAuthAgeRequest (
const wchar_t ageName[], // L"Teledahn"
const Uuid & ageInstId,
const plUUID& ageInstId,
FNetCliAuthAgeRequestCallback callback,
void * param
);
@ -389,7 +389,7 @@ struct NetVaultNodeRef;
// VaultNodeChanged
typedef void (*FNetCliAuthVaultNodeChanged)(
unsigned nodeId,
const Uuid & revisionId
const plUUID& revisionId
);
void NetCliAuthVaultSetRecvNodeChangedHandler (
FNetCliAuthVaultNodeChanged handler
@ -519,8 +519,8 @@ typedef void (*FNetCliAuthAgeInitCallback) (
unsigned ageInfoVaultId
);
void NetCliAuthVaultInitAge (
const Uuid & ageInstId, // optional. is used in match
const Uuid & parentAgeInstId, // optional. is used in match
const plUUID& ageInstId, // optional. is used in match
const plUUID& parentAgeInstId, // optional. is used in match
const wchar_t ageFilename[], // optional. is used in match
const wchar_t ageInstName[], // optional. not used in match
const wchar_t ageUserName[], // optional. not used in match
@ -589,7 +589,7 @@ typedef void (*FNetCliAuthSendFriendInviteCallback)(
void NetCliAuthSendFriendInvite (
const wchar_t emailAddress[],
const wchar_t toName[],
const Uuid& inviteUuid,
const plUUID& inviteUuid,
FNetCliAuthSendFriendInviteCallback callback,
void * param
);

8
Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGame.cpp
View File

@ -91,12 +91,12 @@ struct JoinAgeRequestTrans : NetGameTrans {
void * m_param;
// sent
unsigned m_ageMcpId;
Uuid m_accountUuid;
plUUID m_accountUuid;
unsigned m_playerInt;
JoinAgeRequestTrans (
unsigned ageMcpId,
const Uuid & accountUuid,
const plUUID& accountUuid,
unsigned playerInt,
FNetCliGameJoinAgeRequestCallback callback,
void * param
@ -574,7 +574,7 @@ static NetMsgInitRecv s_recv[] = {
//============================================================================
JoinAgeRequestTrans::JoinAgeRequestTrans (
unsigned ageMcpId,
const Uuid & accountUuid,
const plUUID& accountUuid,
unsigned playerInt,
FNetCliGameJoinAgeRequestCallback callback,
void * param
@ -817,7 +817,7 @@ void NetCliGameDisconnect () {
//============================================================================
void NetCliGameJoinAgeRequest (
unsigned ageMcpId,
const Uuid & accountUuid,
const plUUID& accountUuid,
unsigned playerInt,
FNetCliGameJoinAgeRequestCallback callback,
void * param

2
Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGame.h
View File

@ -78,7 +78,7 @@ typedef void (*FNetCliGameJoinAgeRequestCallback)(
);
void NetCliGameJoinAgeRequest (
unsigned ageMcpId,
const Uuid & accountUuid,
const plUUID& accountUuid,
unsigned playerInt,
FNetCliGameJoinAgeRequestCallback callback,
void * param

6
Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGateKeeper.cpp
View File

@ -91,7 +91,7 @@ struct CliGkConn : AtomicRef {
NetCli * cli;
char name[MAX_PATH];
plNetAddress addr;
Uuid token;
plUUID token;
unsigned seq;
unsigned serverChallenge;
AsyncCancelId cancelId;
@ -307,7 +307,7 @@ static void CheckedReconnect (CliGkConn * conn, ENetError error) {
ReportNetError(kNetProtocolCli2GateKeeper, error);
}
else {
if (conn->token != kNilGuid)
if (conn->token != kNilUuid)
// previously encrypted; reconnect quickly
conn->reconnectStartMs = GetNonZeroTimeMs() + 500;
else
@ -841,7 +841,7 @@ bool FileSrvIpAddressRequestTrans::Send () {
const uintptr_t msg[] = {
kCli2GateKeeper_FileSrvIpAddressRequest,
m_transId,
m_isPatcher == true ? 1 : 0
(uintptr_t)(m_isPatcher == true ? 1 : 0)
};
m_conn->Send(msg, arrsize(msg));