X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdynamic.cpp;h=f2acdd51c6c11736ca62f42bf8bc53a85b4b64b6;hb=6bd4024fd2e93fb740329560356500ce149692b3;hp=70d5e7cae8b5a47d278c0199ba381f284889d693;hpb=dbf4d595433ecefeb61f1267ffa515a91c3ab548;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index 70d5e7cae..f2acdd51c 100644
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -1,20 +1,34 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Oliver Lupton <oliverlupton@gmail.com>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2003, 2006 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd 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, version 2.
  *
- * ---------------------------------------------------
+ * 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/>.
  */
 
+
 #include "inspircd.h"
-#include "dynamic.h"
-#ifndef WIN32
+
+#ifndef _WIN32
 #include <dlfcn.h>
+#else
+#define dlopen(path, state) (void*)LoadLibraryA(path)
+#define dlsym(handle, export) (void*)GetProcAddress((HMODULE)handle, export)
+#define dlclose(handle) FreeLibrary((HMODULE)handle)
 #endif
 
 DLLManager::DLLManager(const char *fname)
@@ -29,7 +43,7 @@ DLLManager::DLLManager(const char *fname)
 	h = dlopen(fname, RTLD_NOW|RTLD_LOCAL);
 	if (!h)
 	{
-		err = dlerror();
+		RetrieveLastError();
 	}
 }
 
@@ -40,23 +54,47 @@ DLLManager::~DLLManager()
 		dlclose(h);
 }
 
-union init_t {
-	void* vptr;
-	Module* (*fptr)();
-};
-
-Module* DLLManager::callInit()
+Module* DLLManager::CallInit()
 {
-	if (!h)
-		return NULL;
-
-	init_t initfn;
-	initfn.vptr = dlsym(h, MODULE_INIT_STR);
-	if (!initfn.vptr)
+	union
 	{
-		err = dlerror();
+		void* vptr;
+		Module* (*fptr)();
+	};
+
+	vptr = GetSymbol(MODULE_INIT_STR);
+	if (!vptr)
 		return NULL;
-	}
 
-	return (*initfn.fptr)();
+	return (*fptr)();
+}
+
+void* DLLManager::GetSymbol(const char* name)
+{
+	return h ? dlsym(h, name) : NULL;
+}
+
+std::string DLLManager::GetVersion()
+{
+	const char* srcver = static_cast<const char*>(GetSymbol("inspircd_src_version"));
+	return srcver ? srcver : "";
+}
+
+void DLLManager::RetrieveLastError()
+{
+#if defined _WIN32
+	char errmsg[500];
+	DWORD dwErrorCode = GetLastError();
+	if (FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)errmsg, _countof(errmsg), NULL) == 0)
+		sprintf_s(errmsg, _countof(errmsg), "Error code: %u", dwErrorCode);
+	SetLastError(ERROR_SUCCESS);
+	err = errmsg;
+#else
+	const char* errmsg = dlerror();
+	err = errmsg ? errmsg : "Unknown error";
+#endif
+
+	std::string::size_type p;
+	while ((p = err.find_last_of("\r\n")) != std::string::npos)
+		err.erase(p, 1);
 }