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

Make pnUtUuid compile on *nix.

Browse Source
This commit is contained in:
Darryl Pogue
2012-01-29 00:18:26 -08:00
parent 65b75f0667
commit 945e1ac37b
11 changed files with 26 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Sources/Plasma/NucleusLib/pnUUID/pnUUID.cpp
View File

@ -57,6 +57,11 @@ plUUID::plUUID( const plUUID & other )
CopyFrom( &other );
}
plUUID::plUUID( const Uuid & uuid )
{
memcpy(fData, uuid.data, sizeof(fData));
}
void plUUID::Read( hsStream * s)
{
s->LogSubStreamPushDesc("plUUID");
@ -73,3 +78,9 @@ const char * plUUID::AsString() const {
ToStdString(str);
return str.c_str();
}
plUUID::operator Uuid () const {
Uuid uuid;
memcpy(uuid.data, fData, sizeof(uuid.data));
return uuid;
}

6
Sources/Plasma/NucleusLib/pnUUID/pnUUID.h
View File

@ -44,9 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "HeadSpin.h"
#include "hsStlUtils.h"
#ifdef HS_BUILD_FOR_WIN32
#include "pnUtils/pnUtUuid.h"
#endif
class hsStream;
@ -65,9 +63,7 @@ public:
plUUID();
plUUID( const char * s );
plUUID( const plUUID & other );
#ifdef HS_BUILD_FOR_WIN32
plUUID( const Uuid & uuid );
#endif
void Clear();
bool IsNull() const;
bool IsSet() const { return !IsNull(); }
@ -85,9 +81,7 @@ public:
bool operator==( const plUUID & other ) const { return IsEqualTo( &other ); }
bool operator!=( const plUUID & other ) const { return !IsEqualTo( &other ); }
int operator <( const plUUID & other ) const { return CompareTo( &other ); }
#ifdef HS_BUILD_FOR_WIN32
operator Uuid () const;
#endif
static plUUID Generate();
};

11
Sources/Plasma/NucleusLib/pnUUID/pnUUID_Win32.cpp
View File

@ -47,11 +47,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include <rpc.h>
plUUID::plUUID( const Uuid & uuid )
{
memcpy(fData, uuid.data, sizeof(fData));
}
void plUUID::Clear()
{
UuidCreateNil( (GUID *)this );
@ -85,12 +80,6 @@ void plUUID::CopyFrom( const plUUID & v ) {
memcpy(fData, v.fData, sizeof(fData));
}
plUUID::operator Uuid () const {
Uuid uuid;
memcpy(uuid.data, fData, sizeof(uuid.data));
return uuid;
}
bool plUUID::FromString( const char * str )
{
Clear();

4
Sources/Plasma/NucleusLib/pnUtils/CMakeLists.txt
View File

@ -45,6 +45,7 @@ set(pnUtils_SOURCES
pnUtSpareList.cpp
pnUtStr.cpp
pnUtTime.cpp
pnUtUuid.cpp
)
if(WIN32)
@ -59,13 +60,12 @@ if(WIN32)
pnUtCrypt.cpp
pnUtTls.cpp
pnUtUuid.cpp
)
else()
set(pnUtils_UNIX
Unix/pnUtUxStr.cpp
#Unix/pnUtUxSync.cpp
#Unix/pnUtUxUuid.cpp
Unix/pnUtUxUuid.cpp
)
endif()

1
Sources/Plasma/NucleusLib/pnUtils/Pch.h
View File

@ -50,7 +50,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pnUtCoreLib.h" // must be first in list
#include "pnUtPragma.h"
#include "pnProduct/pnProduct.h"
#include <malloc.h>

2
Sources/Plasma/NucleusLib/pnUtils/Unix/pnUtUxUuid.cpp
View File

@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*
***/
#include "../pnUtUUID.h"
#include "../pnUtUuid.h"
/*****************************************************************************
*

4
Sources/Plasma/NucleusLib/pnUtils/pnUtAllIncludes.h
View File

@ -52,18 +52,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pnUtCoreLib.h" // must be first in list
#include "pnUtPragma.h"
#include "pnUtAddr.h"
#if HS_BUILD_FOR_WIN32
#include "pnUtUuid.h"
#endif
#include "pnUtMath.h"
#include "pnUtSort.h"
#include "pnUtArray.h"
#include "pnUtList.h"
#include "pnUtHash.h"
#include "pnUtPriQ.h"
#if HS_BUILD_FOR_WIN32
#include "pnUtSync.h"
#endif
#include "pnUtTime.h"
#if HS_BUILD_FOR_WIN32
#include "pnUtTls.h"

6
Sources/Plasma/NucleusLib/pnUtils/pnUtCrypt.cpp
View File

@ -46,6 +46,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
***/
#include "pnUtCrypt.h"
#include "pnUtStr.h"
#include "pnUtTime.h"
#include <openssl/md5.h>
#include <openssl/sha.h>
@ -360,13 +362,13 @@ void CryptHashPasswordChallenge (
const ShaDigest & namePassHash,
ShaDigest * challengeHash
) {
#include <pshpack1.h>
#pragma pack(push, 1)
struct {
uint32_t clientChallenge;
uint32_t serverChallenge;
ShaDigest namePassHash;
} buffer;
#include <poppack.h>
#pragma pack(pop)
buffer.clientChallenge = clientChallenge;
buffer.serverChallenge = serverChallenge;
buffer.namePassHash = namePassHash;

7
Sources/Plasma/NucleusLib/pnUtils/pnUtSync.h
View File

@ -104,9 +104,9 @@ public:
#ifdef HS_BUILD_FOR_WIN32
typedef HANDLE EventHandle;
#else
# error "CEvent: Not implemented on this platform"
#endif
//#else
//# error "CEvent: Not implemented on this platform"
//#endif
const unsigned kEventWaitForever = (unsigned)-1;
@ -130,5 +130,6 @@ public:
const EventHandle & Handle () const { return m_handle; }
};
#endif // HS_BUILD_FOR_WIN32
#endif

2
Sources/Plasma/NucleusLib/pnUtils/pnUtUuid.cpp
View File

@ -46,6 +46,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
***/
#include "pnUtUuid.h"
#include "pnUtHash.h"
#include "pnUtStr.h"
const Uuid kNilGuid;

4
Sources/Plasma/NucleusLib/pnUtils/pnUtUuid.h
View File

@ -95,7 +95,7 @@ bool GuidFromHex (const uint8_t buf[], unsigned length, Uuid * uuid);
*
***/
#include <pshpack1.h>
#pragma pack(push, 1)
struct Uuid {
union {
uint32_t uint32_ts[4];
@ -113,6 +113,6 @@ struct Uuid {
inline bool operator != (const Uuid & rhs) const { return !GuidsAreEqual(*this, rhs); }
inline bool operator != (int rhs) const { ASSERT(!rhs); return !GuidsAreEqual(*this, kNilGuid); }
};
#include <poppack.h>
#pragma pack(pop)
#endif