mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-20 04:09:16 +00:00
Update1 for MSVC10
Capitalize the ref macro in hsTypes.h due to a name collision.
This commit is contained in:
@ -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);
|
||||
|
@ -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))
|
||||
|
@ -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);
|
||||
|
||||
}
|
||||
|
||||
|
@ -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();
|
||||
|
@ -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);
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
|
Reference in New Issue
Block a user