Introduce SharedObject abstraction around win32's LoadLibrary api

Author: madebr

Code/Commando/WINMAIN.CPP

@@ -95,6 +95,7 @@
 #include "ServerSettings.h"
 #include "openw3d.h"
 #include "ini.h"
+#include "soutil.h"
 
 #ifdef _DEBUG
 #include	<crtdbg.h>
@@ -258,9 +259,10 @@ static bool Graphics_Settings_Trouble_Shooting()
 	return true;
 }
 
-typedef IDirect3D9* (WINAPI *Direct3DCreate8Type) (UINT SDKVersion);
-static Direct3DCreate8Type	Direct3DCreate8Ptr = NULL;
-static HMODULE D3D8Lib = NULL;
+typedef IDirect3D9* (WINAPI *Direct3DCreate9Type) (UINT SDKVersion);
+static Direct3DCreate9Type	Direct3DCreate9Ptr = NULL;
+extern const char *Get_D3D9_Object_Name();
+static SharedObject *D3D9Lib = nullptr;
 
 static bool Video_Card_Driver_Check()
 {
@@ -277,22 +279,24 @@ static bool Video_Card_Driver_Check()
 	// Init D3D
 	Init_D3D_To_WW3_Conversion();
 
-	D3D8Lib = LoadLibraryA("D3D9.DLL");
+	D3D9Lib = SharedObject::LoadObject(Get_D3D9_Object_Name());
 
-	if (D3D8Lib != NULL) {
-		Direct3DCreate8Ptr = (Direct3DCreate8Type) GetProcAddress(D3D8Lib, "Direct3DCreate9");
-		if (Direct3DCreate8Ptr) {
-			d3d=Direct3DCreate8Ptr(D3D_SDK_VERSION);		// TODO: handle failure cases...
+	if (D3D9Lib != NULL) {
+		Direct3DCreate9Ptr = reinterpret_cast<Direct3DCreate9Type>(D3D9Lib->LoadFunction("Direct3DCreate9"));
+		if (Direct3DCreate9Ptr) {
+			d3d=Direct3DCreate9Ptr(D3D_SDK_VERSION);		// TODO: handle failure cases...
 			if (!d3d) {
-				FreeLibrary(D3D8Lib);
+				delete D3D9Lib;
+				D3D9Lib = nullptr;
 				return true;
 			}
 		} else {
-			FreeLibrary(D3D8Lib);
-			return(true);
+			delete D3D9Lib;
+			D3D9Lib = nullptr;
+			return true;
 		}
 	} else {
-		return(true);
+		return true;
 	}
 
 	// Select device. If there is already a device selected in the registry, use it.
@@ -325,7 +329,7 @@ static bool Video_Card_Driver_Check()
 		D3DDEVTYPE_HAL,
 		&tmp_caps))) {
 		d3d->Release();
-		FreeLibrary(D3D8Lib);
+		delete D3D9Lib;
 		return true;
 	}
 
@@ -335,7 +339,8 @@ static bool Video_Card_Driver_Check()
 		0/*D3DENUM_WHQL_LEVEL*/,
 		&adapter_id))) {
 		d3d->Release();
-		FreeLibrary(D3D8Lib);
+		delete D3D9Lib;
+		D3D9Lib = nullptr;
 		return true;
 	}
 
@@ -345,7 +350,8 @@ static bool Video_Card_Driver_Check()
 	DX8Caps::DriverVersionStatusType status=caps.Get_Driver_Version_Status();
 
 	d3d->Release();
-	FreeLibrary(D3D8Lib);
+	delete D3D9Lib;
+	D3D9Lib = nullptr;
 
 	switch (status) {
 	default:

Code/ww3d2/dx8wrapper.cpp

@@ -77,6 +77,7 @@
 #include "bound.h"
 #include "ini.h"
 #include "openw3d.h"
+#include "soutil.h"
 
 const int DEFAULT_RESOLUTION_WIDTH = 800;
 const int DEFAULT_RESOLUTION_HEIGHT = 600;
@@ -170,14 +171,28 @@ static DynamicVectorClass<RenderDeviceDescClass>	_RenderDeviceDescriptionTable;
 
 typedef IDirect3D9* (WINAPI *Direct3DCreate8Type) (UINT SDKVersion);
 Direct3DCreate8Type	Direct3DCreate8Ptr = NULL;
-HINSTANCE D3D8Lib = NULL;
+SharedObject *D3D9Lib = nullptr;
 
 /***********************************************************************************
 **
 ** DX8Wrapper Implementation
 **
 ***********************************************************************************/
 
+const char *Get_D3D9_Object_Name()
+{
+	// FIXME: support overriding object using config (args, ini, register, envvar)
+#ifdef _WIN32
+	return "d3d9.dll";
+#elif defined (__ELF__)
+	return "libdxvk_d3d9.so.0";
+#elif defined (__MACH__)
+	return "libdxvk_d3d9.0.dylib";
+#else
+	static_assert(false, "Unknown d3d9 name");
+#endif
+}
+
 void Log_DX8_ErrorCode(HRESULT res)
 {
 	const char *error_string = DXGetErrorStringA(res);
@@ -240,11 +255,11 @@ bool DX8Wrapper::Init(void * hwnd, bool lite)
 	Invalidate_Cached_Render_States();
 
 	if (!lite) {
-		D3D8Lib = LoadLibraryA("D3D9.DLL");
+		D3D9Lib = SharedObject::LoadObject(Get_D3D9_Object_Name());
 
-		if (D3D8Lib == NULL) return false;
+		if (D3D9Lib == NULL) return false;
 
-		Direct3DCreate8Ptr = (Direct3DCreate8Type) GetProcAddress(D3D8Lib, "Direct3DCreate9");
+		Direct3DCreate8Ptr = reinterpret_cast<Direct3DCreate8Type>(D3D9Lib->LoadFunction("Direct3DCreate9"));
 		if (Direct3DCreate8Ptr) {
 
 			/*
@@ -311,9 +326,9 @@ void DX8Wrapper::Shutdown(void)
 	_RenderDeviceShortNameTable.Delete_All();
 	_RenderDeviceDescriptionTable.Delete_All();
 
-	if (D3D8Lib) {
-		FreeLibrary(D3D8Lib);
-		D3D8Lib = NULL;
+	if (D3D9Lib) {
+		delete D3D9Lib;
+		D3D9Lib = NULL;
 	}
 
 	IsInitted = false;

Code/wwutil/CMakeLists.txt

@@ -8,6 +8,8 @@ set(WWUTIL_SRC
     ProcessManager.h
     pathutil.cpp
     pathutil.h
+    soutil.cpp
+    soutil.h
     $<$<BOOL:${WIN32}>:stackdump-windows.cpp>
     $<$<BOOL:${LINUX}>:stackdump-linux.cpp>
     stackdump.h

Code/wwutil/soutil.cpp

@@ -0,0 +1,47 @@
+#include "soutil.h"
+
+#ifdef _WIN32
+#include <windows.h>
+#else
+#include <dlfcn.h>
+#endif
+
+SharedObject *SharedObject::LoadObject(const char *path)
+{
+	SoType so;
+#ifdef _WIN32
+	so = LoadLibraryA(path);
+#else
+	so = dlopen(path, RTLD_NOW | RTLD_LOCAL);
+#endif
+	if (so == nullptr) {
+		return nullptr;
+	}
+	auto result = new SharedObject(so);
+	if (result == nullptr) {
+#ifdef _WIN32
+		FreeLibrary(so);
+#else
+		dlclose(so);
+#endif
+	}
+	return result;
+}
+
+SharedObject::~SharedObject()
+{
+#ifdef _WIN32
+		FreeLibrary(m_so);
+#else
+		dlclose(m_so);
+#endif
+}
+
+SharedObject::FunctionPointer SharedObject::LoadFunction(const char *name) const
+{
+#ifdef _WIN32
+	return reinterpret_cast<FunctionPointer>(GetProcAddress(m_so, name));
+#else
+	return reinterpret_cast<FunctionPointer>(dlsym(m_so, name));
+#endif
+}

Code/wwutil/soutil.h

@@ -0,0 +1,26 @@
+#pragma once
+
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
+class SharedObject {
+public:
+	using FunctionPointer = void (*)();
+
+	~SharedObject();
+
+	static SharedObject *LoadObject(const char *path);
+
+	FunctionPointer LoadFunction(const char *name) const;
+protected:
+#ifdef _WIN32
+	using SoType = HMODULE;
+#else
+	using SoType = void *;
+#endif
+	SharedObject(SoType so) : m_so(so) {}
+	SharedObject(SharedObject &) = delete;
+
+	SoType m_so;
+};