1.1 --- a/loader/loader.cpp Wed Nov 19 01:17:48 2008 -0600
1.2 +++ b/loader/loader.cpp Sun Nov 23 21:21:49 2008 -0600
1.3 @@ -1,10 +1,13 @@
1.4 #include <time.h>
1.5 +#include <assert.h>
1.6 +#include <stdarg.h>
1.7 #include <stdio.h>
1.8 -#include <stdarg.h>
1.9 #include <stdlib.h>
1.10 #include <string.h>
1.11 #include "loader.h"
1.12 #include "serverplugin.h"
1.13 +#include "gamedll.h"
1.14 +#include "utility.h"
1.15
1.16 static HMODULE mm_library = NULL;
1.17 static char mm_fatal_logfile[PLATFORM_MAX_PATH] = "metamod-fatal.log";
1.18 @@ -34,56 +37,6 @@
1.19 fclose(fp);
1.20 }
1.21
1.22 -static size_t
1.23 -mm_FormatArgs(char *buffer, size_t maxlength, const char *fmt, va_list params)
1.24 -{
1.25 - size_t len = vsnprintf(buffer, maxlength, fmt, params);
1.26 -
1.27 - if (len >= maxlength)
1.28 - {
1.29 - len = maxlength - 1;
1.30 - buffer[len] = '\0';
1.31 - }
1.32 -
1.33 - return len;
1.34 -}
1.35 -
1.36 -static size_t
1.37 -mm_Format(char *buffer, size_t maxlength, const char *fmt, ...)
1.38 -{
1.39 - size_t len;
1.40 - va_list ap;
1.41 -
1.42 - va_start(ap, fmt);
1.43 - len = mm_FormatArgs(buffer, maxlength, fmt, ap);
1.44 - va_end(ap);
1.45 -
1.46 - return len;
1.47 -}
1.48 -
1.49 -static bool
1.50 -mm_GetFileOfAddress(void *pAddr, char *buffer, size_t maxlength)
1.51 -{
1.52 -#if defined _WIN32
1.53 - MEMORY_BASIC_INFORMATION mem;
1.54 - if (!VirtualQuery(pAddr, &mem, sizeof(mem)))
1.55 - return false;
1.56 - if (mem.AllocationBase == NULL)
1.57 - return false;
1.58 - HMODULE dll = (HMODULE)mem.AllocationBase;
1.59 - GetModuleFileName(dll, (LPTSTR)buffer, maxlength);
1.60 -#else
1.61 - Dl_info info;
1.62 - if (!dladdr(pAddr, &info))
1.63 - return false;
1.64 - if (!info.dli_fbase || !info.dli_fname)
1.65 - return false;
1.66 - const char *dllpath = info.dli_fname;
1.67 - snprintf(buffer, maxlength, "%s", dllpath);
1.68 -#endif
1.69 - return true;
1.70 -}
1.71 -
1.72 static const char *backend_names[3] =
1.73 {
1.74 "1.ep1",
1.75 @@ -100,7 +53,7 @@
1.76 #endif
1.77
1.78 #if defined _WIN32
1.79 -static void
1.80 +void
1.81 mm_GetPlatformError(char *buffer, size_t maxlength)
1.82 {
1.83 DWORD dw = GetLastError();
1.84 @@ -143,35 +96,16 @@
1.85 "metamod.%s" LIBRARY_MINEXT,
1.86 backend_names[backend]);
1.87
1.88 -#if defined _WIN32
1.89 - mm_library = LoadLibrary(mm_path);
1.90 + mm_library = mm_LoadLibrary(mm_path, buffer, maxlength);
1.91
1.92 - if (mm_library == NULL)
1.93 - {
1.94 - mm_GetPlatformError(buffer, maxlength);
1.95 - return false;
1.96 - }
1.97 -#elif defined __linux__
1.98 - mm_library = dlopen(mm_path, RTLD_NOW);
1.99 -
1.100 - if (mm_library == NULL)
1.101 - {
1.102 - mm_Format(buffer, maxlength, "%s", dlerror());
1.103 - return false;
1.104 - }
1.105 -#endif
1.106 -
1.107 - return true;
1.108 + return (mm_library != NULL);
1.109 }
1.110
1.111 void
1.112 mm_UnloadMetamodLibrary()
1.113 {
1.114 -#if defined _WIN32
1.115 - FreeLibrary(mm_library);
1.116 -#else
1.117 - dlclose(mm_library);
1.118 -#endif
1.119 + mm_UnloadLibrary(mm_library);
1.120 + mm_library = NULL;
1.121 }
1.122
1.123 #if defined _WIN32
1.124 @@ -187,35 +121,63 @@
1.125 EXPORT void *
1.126 CreateInterface(const char *name, int *ret)
1.127 {
1.128 - if (mm_library != NULL)
1.129 + /* If we've got a VSP bridge, do nothing. */
1.130 + if (vsp_bridge != NULL)
1.131 {
1.132 if (ret != NULL)
1.133 *ret = 1;
1.134 return NULL;
1.135 }
1.136
1.137 + /* If we've got a gamedll bridge, forward the request. */
1.138 + if (gamedll_bridge != NULL)
1.139 + return gamedll_bridge->QueryInterface(name, ret);
1.140 +
1.141 + /* Otherwise, we're probably trying to load Metamod. */
1.142 void *ptr;
1.143 if (strncmp(name, "ISERVERPLUGINCALLBACKS", 22) == 0)
1.144 - {
1.145 ptr = mm_GetVspCallbacks(atoi(&name[22]));
1.146 - if (ret != NULL)
1.147 - *ret = ptr != NULL ? 0 : 1;
1.148 - return ptr;
1.149 - }
1.150 + else
1.151 + ptr = mm_GameDllRequest(name, ret);
1.152
1.153 if (ret != NULL)
1.154 - *ret = 1;
1.155 + *ret = (ptr != NULL) ? 0 : 1;
1.156
1.157 - return NULL;
1.158 + return ptr;
1.159 }
1.160
1.161 -extern void *
1.162 +void *
1.163 mm_GetProcAddress(const char *name)
1.164 {
1.165 -#if defined _WIN32
1.166 - return GetProcAddress(mm_library, name);
1.167 -#elif defined __linux__
1.168 - return dlsym(mm_library, name);
1.169 -#endif
1.170 + return mm_GetLibAddress(mm_library, name);
1.171 }
1.172
1.173 +MetamodBackend
1.174 +mm_DetermineBackend(QueryValveInterface engineFactory)
1.175 +{
1.176 + /* Check for L4D */
1.177 + if (engineFactory("VEngineServer022", NULL) != NULL &&
1.178 + engineFactory("VEngineCvar007", NULL) != NULL)
1.179 + {
1.180 + return MMBackend_Left4Dead;
1.181 + }
1.182 + else if (engineFactory("VEngineServer021", NULL) != NULL)
1.183 + {
1.184 + /* Check for OB */
1.185 + if (engineFactory("VEngineCvar004", NULL) != NULL &&
1.186 + engineFactory("VModelInfoServer002", NULL) != NULL)
1.187 + {
1.188 + return MMBackend_Episode2;
1.189 + }
1.190 + /* Check for EP1 */
1.191 + else if (engineFactory("VModelInfoServer001", NULL) != NULL &&
1.192 + (engineFactory("VEngineCvar003", NULL) != NULL ||
1.193 + engineFactory("VEngineCvar002", NULL) != NULL))
1.194 + {
1.195 + return MMBackend_Episode1;
1.196 + }
1.197 + }
1.198 +
1.199 + return MMBackend_UNKNOWN;
1.200 +}
1.201 +