OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 03:09:13 +00:00
Code Releases Activity

Completely kill off CoreLibExe

Browse Source
This commit is contained in:
Adam Johnson
2012-01-24 23:05:48 -05:00
parent 63a9eea771
commit 91fc595407
36 changed files with 178 additions and 1145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNt.cpp
View File

@ -374,11 +374,11 @@ void NtInitialize () {
(LPCTSTR) nil // name
);
if (!s_waitEvent)
ErrorFatal(__LINE__, __FILE__, "CreateEvent %#x", GetLastError());
ErrorAssert(__LINE__, __FILE__, "CreateEvent %#x", GetLastError());
// create IO completion port
if (0 == (s_ioPort = CreateIoCompletionPort(INVALID_HANDLE_VALUE, 0, 0, 0)))
ErrorFatal(__LINE__, __FILE__, "CreateIoCompletionPort %#x", GetLastError());
ErrorAssert(__LINE__, __FILE__, "CreateIoCompletionPort %#x", GetLastError());
// calculate number of IO worker threads to create
if (!s_pageSizeMask) {

4
Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNtFile.cpp
View File

@ -123,7 +123,7 @@ static void FatalOnNonRecoverableError (
}
ASSERT((op.opType == kOpFileRead) || (op.opType == kOpFileWrite));
ErrorFatal(
ErrorAssert(
__LINE__, __FILE__,
"Disk %s failed, error: %u",
op.opType == kOpFileRead ? "read" : "write",
@ -446,7 +446,7 @@ bool INtFileOpCompleteReadWrite (
// adjust outstanding bytes
if (bytes != op->win32Bytes) {
if (!file->sectorSizeMask)
ErrorFatal(__LINE__, __FILE__, "Disk %s failed", op->opType == kOpFileRead ? "read" : "write");
ErrorAssert(__LINE__, __FILE__, "Disk %s failed", op->opType == kOpFileRead ? "read" : "write");
if (op->opType == kOpFileRead)
memset(op->rw.buffer + bytes, 0, op->win32Bytes - bytes);
}

4
Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Win32/pnAceW32Dns.cpp
View File

@ -175,7 +175,7 @@ static unsigned THREADCALL LookupThreadProc (AsyncThread * thread) {
0
);
if (!s_lookupWindow)
ErrorFatal(__LINE__, __FILE__, "CreateWindow %#x", GetLastError());
ErrorAssert(__LINE__, __FILE__, "CreateWindow %#x", GetLastError());
HANDLE lookupStartEvent = (HANDLE) thread->argument;
SetEvent(lookupStartEvent);
@ -228,7 +228,7 @@ static void StartLookupThread () {
(LPCTSTR) 0 // name
);
if (!lookupStartEvent)
ErrorFatal(__LINE__, __FILE__, "CreateEvent %#x", GetLastError());
ErrorAssert(__LINE__, __FILE__, "CreateEvent %#x", GetLastError());
// create a thread to perform lookups
s_lookupThread = (HANDLE) AsyncThreadCreate(

14
Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceCore.cpp
View File

@ -94,7 +94,7 @@ static void IAsyncInitUseW9x () {
#ifdef HS_BUILD_FOR_WIN32
W9xGetApi(&g_api);
#else
ErrorFatal("W9x I/O Not supported on this platform");
ErrorAssert("W9x I/O Not supported on this platform");
#endif
}
@ -103,7 +103,7 @@ static void IAsyncInitUseNt () {
#ifdef HS_BUILD_FOR_WIN32
NtGetApi(&g_api);
#else
ErrorFatal("Nt I/O Not supported on this platform");
ErrorAssert("Nt I/O Not supported on this platform");
#endif
}
@ -113,7 +113,7 @@ static void IAsyncInitUseUnix () {
#error Unix I/O not implemented yet
UxGetApi(&g_api);
#else
ErrorFatal(__LINE__, __FILE__, "Unix I/O Not supported on this platform");
ErrorAssert(__LINE__, __FILE__, "Unix I/O Not supported on this platform");
#endif
}
@ -130,7 +130,7 @@ static void IAsyncInitForClient () {
#elif HS_BUILD_FOR_UNIX
IAsyncInitUseUnix();
#else
ErrorFatal("AsyncCore: No default implementation for this platform");
ErrorAssert("AsyncCore: No default implementation for this platform");
#endif
}
@ -141,7 +141,7 @@ static void IAsyncInitForServer () {
#elif HS_BUILD_FOR_UNIX
IAsyncInitUseUnix();
#else
ErrorFatal("AsyncCore: No default implementation for this platform");
ErrorAssert("AsyncCore: No default implementation for this platform");
#endif
}
@ -185,9 +185,9 @@ void AsyncCoreInitialize () {
// Initialize WinSock
WSADATA wsaData;
if (WSAStartup(0x101, &wsaData))
ErrorFatal(__LINE__, __FILE__, "WSA startup failed");
ErrorAssert(__LINE__, __FILE__, "WSA startup failed");
if (wsaData.wVersion != 0x101)
ErrorFatal(__LINE__, __FILE__, "WSA version failed");
ErrorAssert(__LINE__, __FILE__, "WSA version failed");
#endif
#ifdef CLIENT

2
Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceThread.cpp
View File

@ -128,7 +128,7 @@ void * AsyncThreadCreate (
);
if (!handle) {
LogMsg(kLogFatal, "%s (%u)", __FILE__, GetLastError());
ErrorFatal(__LINE__, __FILE__, "_beginthreadex failed");
ErrorAssert(__LINE__, __FILE__, "_beginthreadex failed");
}
thread->handle = handle;

4
Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceTimer.cpp
View File

@ -187,7 +187,7 @@ static inline void InitializeTimer () {
(LPCTSTR) nil
);
if (!s_timerEvent)
ErrorFatal(__LINE__, __FILE__, "CreateEvent %u", GetLastError());
ErrorAssert(__LINE__, __FILE__, "CreateEvent %u", GetLastError());
s_timerThread = (HANDLE) AsyncThreadCreate(
TimerThreadProc,
@ -230,7 +230,7 @@ void TimerDestroy (unsigned exitThreadWaitMs) {
s_timerCrit.Leave();
if (AsyncTimer * timer = s_timerProcs.Root())
ErrorFatal(__LINE__, __FILE__, "TimerProc not destroyed: %p", timer->timerProc);
ErrorAssert(__LINE__, __FILE__, "TimerProc not destroyed: %p", timer->timerProc);
}