mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-18 11:19:10 +00:00
Replace Uuid with plUUID EVERYWHERE.
This commit is contained in:
Darryl Pogue
@ -19,7 +19,6 @@ set(pnUtils_HEADERS
|
||||
pnUtSort.h
|
||||
pnUtStr.h
|
||||
pnUtTime.h
|
||||
pnUtUuid.h
|
||||
)
|
||||
|
||||
set(pnUtils_SOURCES
|
||||
@ -32,7 +31,6 @@ set(pnUtils_SOURCES
|
||||
pnUtPath.cpp
|
||||
pnUtStr.cpp
|
||||
pnUtTime.cpp
|
||||
pnUtUuid.cpp
|
||||
)
|
||||
|
||||
if(WIN32)
|
||||
@ -40,12 +38,10 @@ if(WIN32)
|
||||
Win32/pnUtW32Misc.cpp
|
||||
Win32/pnUtW32Path.cpp
|
||||
Win32/pnUtW32Str.cpp
|
||||
Win32/pnUtW32Uuid.cpp
|
||||
)
|
||||
else()
|
||||
set(pnUtils_UNIX
|
||||
Unix/pnUtUxStr.cpp
|
||||
Unix/pnUtUxUuid.cpp
|
||||
)
|
||||
endif()
|
||||
|
||||
|
||||
@ -1,69 +0,0 @@
|
||||
/*==LICENSE==*
|
||||
|
||||
CyanWorlds.com Engine - MMOG client, server and tools
|
||||
Copyright (C) 2011 Cyan Worlds, Inc.
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
Additional permissions under GNU GPL version 3 section 7
|
||||
|
||||
If you modify this Program, or any covered work, by linking or
|
||||
combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
|
||||
NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
|
||||
JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
|
||||
(or a modified version of those libraries),
|
||||
containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
|
||||
PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
|
||||
JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
|
||||
licensors of this Program grant you additional
|
||||
permission to convey the resulting work. Corresponding Source for a
|
||||
non-source form of such a combination shall include the source code for
|
||||
the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
|
||||
work.
|
||||
|
||||
You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
or by snail mail at:
|
||||
Cyan Worlds, Inc.
|
||||
14617 N Newport Hwy
|
||||
Mead, WA 99021
|
||||
|
||||
*==LICENSE==*/
|
||||
/*****************************************************************************
|
||||
*
|
||||
* $/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/Unix/pnUtUxUuid.cpp
|
||||
*
|
||||
***/
|
||||
|
||||
#include "../pnUtUuid.h"
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* Uuid Unix implementation
|
||||
*
|
||||
***/
|
||||
|
||||
#ifdef HS_BUILD_FOR_UNIX
|
||||
|
||||
#include <uuid/uuid.h>
|
||||
|
||||
static_assert(sizeof(Uuid) >= sizeof(uuid_t), "UUID size does not match uuid_t");
|
||||
|
||||
#else
|
||||
|
||||
// Dummy function to prevent a linker warning complaining about no public symbols if the
|
||||
// contents of the file get compiled out via pre-processor
|
||||
void UxUuidPreventLNK4221Warning () {
|
||||
}
|
||||
|
||||
#endif
|
||||
@ -1,150 +0,0 @@
|
||||
/*==LICENSE==*
|
||||
|
||||
CyanWorlds.com Engine - MMOG client, server and tools
|
||||
Copyright (C) 2011 Cyan Worlds, Inc.
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
Additional permissions under GNU GPL version 3 section 7
|
||||
|
||||
If you modify this Program, or any covered work, by linking or
|
||||
combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
|
||||
NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
|
||||
JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
|
||||
(or a modified version of those libraries),
|
||||
containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
|
||||
PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
|
||||
JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
|
||||
licensors of this Program grant you additional
|
||||
permission to convey the resulting work. Corresponding Source for a
|
||||
non-source form of such a combination shall include the source code for
|
||||
the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
|
||||
work.
|
||||
|
||||
You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
or by snail mail at:
|
||||
Cyan Worlds, Inc.
|
||||
14617 N Newport Hwy
|
||||
Mead, WA 99021
|
||||
|
||||
*==LICENSE==*/
|
||||
/*****************************************************************************
|
||||
*
|
||||
* $/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Uuid.cpp
|
||||
*
|
||||
***/
|
||||
|
||||
#include "../pnUtils.h"
|
||||
#include <rpc.h>
|
||||
#include <rpcdce.h>
|
||||
|
||||
#if 0
|
||||
|
||||
void Uuid::Clear()
|
||||
{
|
||||
UuidCreateNil( (GUID *)this );
|
||||
}
|
||||
|
||||
int Uuid::CompareTo( const Uuid * v ) const
|
||||
{
|
||||
RPC_STATUS s;
|
||||
return UuidCompare( (GUID *)this, (GUID *)v, &s );
|
||||
}
|
||||
|
||||
bool Uuid::IsEqualTo( const Uuid * v ) const
|
||||
{
|
||||
return ( CompareTo( v )==0 );
|
||||
}
|
||||
|
||||
void Uuid::CopyFrom( const Uuid * v )
|
||||
{
|
||||
memcpy( (void*)fData, (const void*)v->fData, sizeof(fData) );
|
||||
}
|
||||
|
||||
bool Uuid::IsNull() const
|
||||
{
|
||||
RPC_STATUS s;
|
||||
return 1 == UuidIsNil( (GUID *)this, &s );
|
||||
}
|
||||
|
||||
bool Uuid::FromString( const char * str )
|
||||
{
|
||||
Clear();
|
||||
if ( !str )
|
||||
return false;
|
||||
return RPC_S_OK == UuidFromString( (unsigned char *)str, (GUID *)this );
|
||||
}
|
||||
|
||||
bool Uuid::ToString( std::string & out ) const
|
||||
{
|
||||
out = "";
|
||||
unsigned char * ubuf;
|
||||
RPC_STATUS s;
|
||||
s = UuidToString( (GUID *) this, &ubuf );
|
||||
bool success = ( s==RPC_S_OK );
|
||||
if ( success )
|
||||
out = (char*)ubuf;
|
||||
RpcStringFree( &ubuf );
|
||||
return success;
|
||||
}
|
||||
|
||||
// static
|
||||
Uuid Uuid::Generate()
|
||||
{
|
||||
Uuid result;
|
||||
UuidCreate( (GUID *)&result );
|
||||
return result;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef HS_BUILD_FOR_WIN32
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* Exports
|
||||
*
|
||||
***/
|
||||
|
||||
static_assert(sizeof(Uuid) >= sizeof(GUID), "pnUtils Uuid and Win32 GUID types differ in size");
|
||||
|
||||
|
||||
|
||||
//============================================================================
|
||||
bool GuidFromString (const wchar_t str[], Uuid * uuid) {
|
||||
ASSERT(uuid);
|
||||
static_assert(sizeof(wchar_t) == sizeof(unsigned short), "Wchar is not an uint16");
|
||||
return RPC_S_OK == UuidFromStringW((unsigned short *) str, (GUID *) uuid);
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
bool GuidFromString (const char str[], Uuid * uuid) {
|
||||
ASSERT(uuid);
|
||||
return RPC_S_OK == UuidFromStringA((unsigned char *) str, (GUID *) uuid);
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
int GuidCompare (const Uuid & a, const Uuid & b) {
|
||||
RPC_STATUS s;
|
||||
return UuidCompare((GUID *)&a, (GUID *)&b, &s);
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
bool GuidIsNil (const Uuid & uuid) {
|
||||
RPC_STATUS s;
|
||||
return 1 == UuidIsNil((GUID *)&uuid, &s );
|
||||
}
|
||||
|
||||
#endif // HS_BUILD_FOR_WIN32
|
||||
@ -51,7 +51,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
|
||||
#include "pnUtCoreLib.h" // must be first in list
|
||||
#include "pnUtPragma.h"
|
||||
#include "pnUtUuid.h"
|
||||
#include "pnUtSort.h"
|
||||
#include "pnUtArray.h"
|
||||
#include "pnUtList.h"
|
||||
|
||||
@ -1,66 +0,0 @@
|
||||
/*==LICENSE==*
|
||||
|
||||
CyanWorlds.com Engine - MMOG client, server and tools
|
||||
Copyright (C) 2011 Cyan Worlds, Inc.
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
Additional permissions under GNU GPL version 3 section 7
|
||||
|
||||
If you modify this Program, or any covered work, by linking or
|
||||
combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
|
||||
NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
|
||||
JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
|
||||
(or a modified version of those libraries),
|
||||
containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
|
||||
PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
|
||||
JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
|
||||
licensors of this Program grant you additional
|
||||
permission to convey the resulting work. Corresponding Source for a
|
||||
non-source form of such a combination shall include the source code for
|
||||
the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
|
||||
work.
|
||||
|
||||
You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
or by snail mail at:
|
||||
Cyan Worlds, Inc.
|
||||
14617 N Newport Hwy
|
||||
Mead, WA 99021
|
||||
|
||||
*==LICENSE==*/
|
||||
/*****************************************************************************
|
||||
*
|
||||
* $/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtUuid.cpp
|
||||
*
|
||||
***/
|
||||
|
||||
#include "pnUtUuid.h"
|
||||
#include "pnUtHash.h"
|
||||
#include "pnUtStr.h"
|
||||
|
||||
|
||||
const Uuid kNilGuid;
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* Exports
|
||||
*
|
||||
***/
|
||||
|
||||
//============================================================================
|
||||
Uuid::Uuid (const wchar_t str[]) {
|
||||
|
||||
GuidFromString(str, this);
|
||||
}
|
||||
@ -1,110 +0,0 @@
|
||||
/*==LICENSE==*
|
||||
|
||||
CyanWorlds.com Engine - MMOG client, server and tools
|
||||
Copyright (C) 2011 Cyan Worlds, Inc.
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
Additional permissions under GNU GPL version 3 section 7
|
||||
|
||||
If you modify this Program, or any covered work, by linking or
|
||||
combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
|
||||
NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
|
||||
JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
|
||||
(or a modified version of those libraries),
|
||||
containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
|
||||
PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
|
||||
JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
|
||||
licensors of this Program grant you additional
|
||||
permission to convey the resulting work. Corresponding Source for a
|
||||
non-source form of such a combination shall include the source code for
|
||||
the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
|
||||
work.
|
||||
|
||||
You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
or by snail mail at:
|
||||
Cyan Worlds, Inc.
|
||||
14617 N Newport Hwy
|
||||
Mead, WA 99021
|
||||
|
||||
*==LICENSE==*/
|
||||
/*****************************************************************************
|
||||
*
|
||||
* $/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtUuid.h
|
||||
*
|
||||
***/
|
||||
|
||||
#ifndef PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTUUID_H
|
||||
#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTUUID_H
|
||||
|
||||
#include "Pch.h"
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* Types
|
||||
*
|
||||
***/
|
||||
|
||||
struct Uuid;
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* Constants
|
||||
*
|
||||
***/
|
||||
|
||||
extern const Uuid kNilGuid;
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* Functions
|
||||
*
|
||||
***/
|
||||
|
||||
// Using 'Guid' here instead of 'Uuid' to avoid name clash with windows API =(
|
||||
|
||||
bool GuidFromString (const wchar_t str[], Uuid * uuid);
|
||||
bool GuidFromString (const char str[], Uuid * uuid);
|
||||
int GuidCompare (const Uuid & a, const Uuid & b);
|
||||
inline bool GuidsAreEqual (const Uuid & a, const Uuid & b) { return 0 == GuidCompare(a, b); }
|
||||
bool GuidIsNil (const Uuid & uuid);
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* Uuid
|
||||
*
|
||||
***/
|
||||
|
||||
#pragma pack(push, 1)
|
||||
struct Uuid {
|
||||
union {
|
||||
uint32_t uint32_ts[4];
|
||||
uint8_t data[16];
|
||||
};
|
||||
|
||||
Uuid () {}
|
||||
Uuid (const wchar_t str[]);
|
||||
operator bool () const { return !GuidIsNil(*this); }
|
||||
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 { ASSERT(!rhs); return GuidsAreEqual(*this, kNilGuid); }
|
||||
inline bool operator != (const Uuid & rhs) const { return !GuidsAreEqual(*this, rhs); }
|
||||
inline bool operator != (int rhs) const { ASSERT(!rhs); return !GuidsAreEqual(*this, kNilGuid); }
|
||||
};
|
||||
#pragma pack(pop)
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user