Merge pull request #86 from Xottab-DUTY/dll_suffix

Remove ".dll" suffix from LoadModule calls. Close #78.
OpenXRay · Nov 20, 2015 · c6387d7 · c6387d7
2 parents c9d84c1 + 9b789e6
commit c6387d7
Show file tree

Hide file tree

Showing 21 changed files with 42 additions and 45 deletions.
diff --git a/src/Layers/xrRender/HW.cpp b/src/Layers/xrRender/HW.cpp
@@ -98,10 +98,10 @@ void CHW::CreateD3D	()
 //#ifndef DEDICATED_SERVER
 //	LPCSTR		_name			= "d3d9.dll";
 //#else
-//	LPCSTR		_name			= "xrd3d9-null.dll";
+//	LPCSTR		_name			= "xrD3D9-Null";
 //#endif
 
-	LPCSTR		_name			= "xrd3d9-null.dll";
+	LPCSTR		_name			= "xrD3D9-Null";
 
 #ifndef _EDITOR
 	if (!g_dedicated_server)

diff --git a/src/editors/ECore/Editor/Engine.cpp b/src/editors/ECore/Editor/Engine.cpp
@@ -51,8 +51,8 @@ void CEngine::Initialize(void)
 #ifdef _EDITOR
 	// Bind PSGP
 	ZeroMemory				(&PSGP,sizeof(PSGP));
-	hPSGP		            = LoadLibrary("xrCPU_Pipe.dll");
-	R_ASSERT2	            (hPSGP,"Can't find 'xrCPU_Pipe.dll'");
+	hPSGP		            = LoadLibrary("xrCPU_Pipe");
+	R_ASSERT2	            (hPSGP,"Can't find 'xrCPU_Pipe'");
 
 	xrBinder* bindCPU	    = (xrBinder*)GetProcAddress(hPSGP,"xrBind_PSGP");	R_ASSERT(bindCPU);
 	bindCPU		            (&PSGP, CPU::ID.feature /*& CPU::ID.os_support*/);

diff --git a/src/editors/LevelEditor/Edit/ESceneSpawnTools.cpp b/src/editors/LevelEditor/Edit/ESceneSpawnTools.cpp
@@ -12,7 +12,7 @@
 #include "EditLibrary.h"
 
 static HMODULE hXRSE_FACTORY = 0;
-static LPCSTR xrse_factory_library	= "xrSE_Factory.dll";
+static LPCSTR xrse_factory_library	= "xrSE_Factory";
 static LPCSTR create_entity_func 	= "_create_entity@4";
 static LPCSTR destroy_entity_func 	= "_destroy_entity@4";
 Tcreate_entity 	create_entity;

diff --git a/src/utils/xrAI/xrAI.cpp b/src/utils/xrAI/xrAI.cpp
@@ -199,7 +199,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
     Debug._initialize       (false);
     Core._initialize        ("xrai",0);
     HMODULE                 hFactory;
-    LPCSTR                  g_name  = "xrSE_Factory.dll";
+    LPCSTR                  g_name  = "xrSE_Factory";
     Log                     ("Loading DLL:",g_name);
     hFactory                = LoadLibrary   (g_name);
     if (0==hFactory)        R_CHK           (GetLastError());

diff --git a/src/utils/xrLC/xrLC.cpp b/src/utils/xrLC/xrLC.cpp
@@ -139,7 +139,7 @@ void Startup(LPSTR     lpCmdLine)
     if (bModifyOptions)     
     {
         Logger.Phase("Project options...");
-        HMODULE     L = LoadLibrary     ("xrLC_Options.dll");
+        HMODULE     L = LoadLibrary     ("xrLC_Options");
         void*       P = GetProcAddress  (L,"_frmScenePropertiesRun");
         R_ASSERT    (P);
         xrOptions*  O = (xrOptions*)P;

diff --git a/src/utils/xrSE_Factory/properties_list_helper_script.cpp b/src/utils/xrSE_Factory/properties_list_helper_script.cpp
@@ -22,7 +22,7 @@ typedef IPropHelper& (__stdcall *TPHelper) ();
 
 TPHelper					_PHelper = 0;
 HMODULE						prop_helper_module = 0;
-LPCSTR						prop_helper_library = "xrEPropsB.dll", prop_helper_func = "PHelper";
+LPCSTR						prop_helper_library = "xrEPropsB", prop_helper_func = "PHelper";
 CScriptPropertiesListHelper	*g_property_list_helper = 0;
 
 void load_prop_helper			()

diff --git a/src/xrCore/xrCore.cpp b/src/xrCore/xrCore.cpp
@@ -46,7 +46,7 @@ void xrCore::_initialize(LPCSTR _ApplicationName, LogCallback cb, BOOL init_fs,
         string_path fn, dr, di;
 
         // application path
-        GetModuleFileName(GetModuleHandle(MODULE_NAME), fn, sizeof(fn));
+        GetModuleFileName(GetModuleHandle("xrCore"), fn, sizeof(fn));
         _splitpath(fn, dr, di, 0, 0);
         strconcat(sizeof(ApplicationPath), ApplicationPath, dr, di);
 #ifndef _EDITOR

diff --git a/src/xrCore/xrCore.h b/src/xrCore/xrCore.h
@@ -102,7 +102,6 @@
 #endif
 
 #include <time.h>
-#define MODULE_NAME "xrCore.dll"
 
 // Warnings
 #pragma warning (disable : 4251 ) // object needs DLL interface

diff --git a/src/xrEngine/Device_Initialize.cpp b/src/xrEngine/Device_Initialize.cpp
@@ -12,10 +12,10 @@ extern LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
 #ifdef INGAME_EDITOR
 void CRenderDevice::initialize_editor()
 {
-    m_editor_module = LoadLibrary("xrWeatherEditor.dll");
+    m_editor_module = LoadLibrary("xrWeatherEditor");
     if (!m_editor_module)
     {
-        Msg("! cannot load library \"xrWeatherEditor.dll\"");
+        Msg("! cannot load library \"xrWeatherEditor\"");
         return;
     }
     m_editor_initialize = (initialize_function_ptr)GetProcAddress(m_editor_module, "initialize");

diff --git a/src/xrEngine/EngineAPI.cpp b/src/xrEngine/EngineAPI.cpp
@@ -55,9 +55,9 @@ bool is_enough_address_space_available()
 
 void CEngineAPI::InitializeNotDedicated()
 {
-    LPCSTR r2_name = "xrRender_R2.dll";
-    LPCSTR r3_name = "xrRender_R3.dll";
-    LPCSTR r4_name = "xrRender_R4.dll";
+    LPCSTR r2_name = "xrRender_R2";
+    LPCSTR r3_name = "xrRender_R3";
+    LPCSTR r4_name = "xrRender_R4";
 
     if (psDeviceFlags.test(rsR4))
     {
@@ -110,7 +110,7 @@ void CEngineAPI::Initialize(void)
 {
     //////////////////////////////////////////////////////////////////////////
     // render
-    LPCSTR r1_name = "xrRender_R1.dll";
+    LPCSTR r1_name = "xrRender_R1";
 
 #ifndef DEDICATED_SERVER
     InitializeNotDedicated();
@@ -132,7 +132,7 @@ void CEngineAPI::Initialize(void)
     }
     // game
     {
-        LPCSTR g_name = "xrGame.dll";
+        LPCSTR g_name = "xrGame";
         Log("Loading DLL:", g_name);
         hGame = LoadLibrary(g_name);
         if (0 == hGame) R_CHK(GetLastError());
@@ -148,7 +148,7 @@ void CEngineAPI::Initialize(void)
     tune_enabled = FALSE;
     if (strstr(Core.Params, "-tune"))
     {
-        LPCSTR g_name = "vTuneAPI.dll";
+        LPCSTR g_name = "vTuneAPI";
         Log("Loading DLL:", g_name);
         hTuner = LoadLibrary(g_name);
         if (0 == hTuner) R_CHK(GetLastError());
@@ -197,9 +197,9 @@ void CEngineAPI::CreateRendererList()
     bool bSupports_r3 = false;
     bool bSupports_r4 = false;
 
-    LPCSTR r2_name = "xrRender_R2.dll";
-    LPCSTR r3_name = "xrRender_R3.dll";
-    LPCSTR r4_name = "xrRender_R4.dll";
+    LPCSTR r2_name = "xrRender_R2";
+    LPCSTR r3_name = "xrRender_R3";
+    LPCSTR r4_name = "xrRender_R4";
 
     if (strstr(Core.Params, "-perfhud_hack"))
     {

diff --git a/src/xrGame/battleye_system.cpp b/src/xrGame/battleye_system.cpp
@@ -327,7 +327,7 @@ bool BattlEyeSystem::InitDLL( LPCSTR dll_name, string_path& out_file )
 	ft = fopen( out_file, "r" );
 	if( ft == NULL )
 	{
-		HMODULE h_game = GetModuleHandle("xrCore.dll");
+		HMODULE h_game = GetModuleHandle("xrCore");
 		R_ASSERT( h_game );
 
 		string_path cur_dir, full_dir;

diff --git a/src/xrGame/gamespy/GameSpy_Available.cpp b/src/xrGame/gamespy/GameSpy_Available.cpp
@@ -6,7 +6,7 @@ CGameSpy_Available::CGameSpy_Available()
 {
 	m_hGameSpyDLL = NULL;
 	//-----------------------------------------------
-	LPCSTR			g_name	= "xrGameSpy.dll";
+	LPCSTR			g_name	= "xrGameSpy";
 	Log				("Loading DLL:",g_name);
 	m_hGameSpyDLL			= LoadLibrary	(g_name);
 	if (0==m_hGameSpyDLL)	R_CHK			(GetLastError());

diff --git a/src/xrGame/gamespy/GameSpy_Browser.cpp b/src/xrGame/gamespy/GameSpy_Browser.cpp
@@ -25,7 +25,7 @@ CGameSpy_Browser::CGameSpy_Browser()
 	m_pGSBrowser = NULL;
 	m_pServerList = NULL;
 	//-------------------------
-	LPCSTR			g_name	= "xrGameSpy.dll";
+	LPCSTR			g_name	= "xrGameSpy";
 	Log				("Loading DLL:",g_name);
 	m_hGameSpyDLL			= LoadLibrary	(g_name);
 	if (0==m_hGameSpyDLL)	R_CHK			(GetLastError());

diff --git a/src/xrGame/gamespy/GameSpy_Full.cpp b/src/xrGame/gamespy/GameSpy_Full.cpp
@@ -57,7 +57,7 @@ CGameSpy_Full::~CGameSpy_Full()
 
 void	CGameSpy_Full::LoadGameSpy()
 {
-	LPCSTR			g_name	= "xrGameSpy.dll";
+	LPCSTR			g_name	= "xrGameSpy";
 	Log				("Loading DLL:",g_name);
 	m_hGameSpyDLL			= LoadLibrary	(g_name);
 	if (0==m_hGameSpyDLL)	R_CHK			(GetLastError());

diff --git a/src/xrGame/gamespy/GameSpy_GCD_Client.cpp b/src/xrGame/gamespy/GameSpy_GCD_Client.cpp
@@ -8,7 +8,7 @@ CGameSpy_GCD_Client::CGameSpy_GCD_Client()
 {
 	m_hGameSpyDLL = NULL;
 
-	LPCSTR			g_name	= "xrGameSpy.dll";
+	LPCSTR			g_name	= "xrGameSpy";
 	Log				("Loading DLL:",g_name);
 	m_hGameSpyDLL			= LoadLibrary	(g_name);
 	if (0==m_hGameSpyDLL)	R_CHK			(GetLastError());

diff --git a/src/xrGame/gamespy/GameSpy_GCD_Server.cpp b/src/xrGame/gamespy/GameSpy_GCD_Server.cpp
@@ -8,7 +8,7 @@ CGameSpy_GCD_Server::CGameSpy_GCD_Server()
 {
 	m_hGameSpyDLL = NULL;
 
-	LPCSTR			g_name	= "xrGameSpy.dll";
+	LPCSTR			g_name	= "xrGameSpy";
 	Log				("Loading DLL:",g_name);
 	m_hGameSpyDLL			= LoadLibrary	(g_name);
 	if (0==m_hGameSpyDLL)	R_CHK			(GetLastError());

diff --git a/src/xrGame/gamespy/GameSpy_HTTP.cpp b/src/xrGame/gamespy/GameSpy_HTTP.cpp
@@ -8,7 +8,7 @@ CGameSpy_HTTP::CGameSpy_HTTP()
 	m_hGameSpyDLL = NULL;
 	m_LastRequest	= -1;
 
-	LPCSTR			g_name	= "xrGameSpy.dll";
+	LPCSTR			g_name	= "xrGameSpy";
 	Log				("Loading DLL:",g_name);
 	m_hGameSpyDLL			= LoadLibrary	(g_name);
 	if (0==m_hGameSpyDLL)	R_CHK			(GetLastError());

diff --git a/src/xrGame/gamespy/GameSpy_Patching.cpp b/src/xrGame/gamespy/GameSpy_Patching.cpp
@@ -8,7 +8,7 @@ CGameSpy_Patching::CGameSpy_Patching()
 {
 	m_hGameSpyDLL = NULL;
 
-	LPCSTR			g_name	= "xrGameSpy.dll";
+	LPCSTR			g_name	= "xrGameSpy";
 	Log				("Loading DLL:",g_name);
 	m_hGameSpyDLL			= LoadLibrary	(g_name);
 	if (0==m_hGameSpyDLL)	R_CHK			(GetLastError());

diff --git a/src/xrGame/gamespy/GameSpy_QR2.cpp b/src/xrGame/gamespy/GameSpy_QR2.cpp
@@ -9,7 +9,7 @@ CGameSpy_QR2::CGameSpy_QR2()
 	//-------------------------------
 	m_hGameSpyDLL = NULL;
 
-	LPCSTR			g_name	= "xrGameSpy.dll";
+	LPCSTR			g_name	= "xrGameSpy";
 	Log				("Loading DLL:",g_name);
 	m_hGameSpyDLL			= LoadLibrary	(g_name);
 	if (0==m_hGameSpyDLL)	R_CHK			(GetLastError());

diff --git a/src/xrGameSpy/GameSpy_Patching.cpp b/src/xrGameSpy/GameSpy_Patching.cpp
@@ -19,7 +19,7 @@ CGameSpy_Patching::~CGameSpy_Patching()
 };
 void	CGameSpy_Patching::LoadGameSpy()
 {
-	LPCSTR			g_name	= "xrGameSpy.dll";
+	LPCSTR			g_name	= "xrGameSpy";
 	Log				("Loading DLL:",g_name);
 	hGameSpyDLL			= LoadLibrary	(g_name);
 	if (0==hGameSpyDLL)	R_CHK			(GetLastError());

diff --git a/src/xrNetServer/NET_AuthCheck.cpp b/src/xrNetServer/NET_AuthCheck.cpp
@@ -31,20 +31,18 @@ void XRNETSERVER_API fill_auth_check_params(xr_auth_strings_t & ignore,
 	check.push_back			(shared_str(FS.update_path(config, "$game_textures$", "wpn\\wpn_crosshair_l85.dds")));
 	check.push_back			(shared_str(FS.update_path(config, "$game_textures$", "wpn\\wpn_crosshair_rpg.dds")));
 
-	check.push_back			(shared_str("xrd3d9-null.dll"));
-	check.push_back			(shared_str("ode.dll"));
-	check.push_back			(shared_str("xrcdb.dll"));
-	check.push_back			(shared_str("xrcore.dll"));
-//	check.push_back			(shared_str("xrcpu_pipe.dll"));
-//	check.push_back			(shared_str("xrgame.dll"));
-	check.push_back			(shared_str("xrgamespy.dll"));
-	check.push_back			(shared_str("xrlua.dll"));
-	check.push_back			(shared_str("xrnetserver.dll"));
-	check.push_back			(shared_str("xrparticles.dll"));
-	check.push_back			(shared_str("xrrender_r1.dll"));
-	check.push_back			(shared_str("xrrender_r2.dll"));
-	check.push_back			(shared_str("xrsound.dll"));
-	check.push_back			(shared_str("xrxmlparser.dll"));
+	check.push_back			(shared_str("xrD3D9-Null"));
+	check.push_back			(shared_str("ODE"));
+	check.push_back			(shared_str("xrCDB"));
+	check.push_back			(shared_str("xrCore"));
+//	check.push_back			(shared_str("xrGame"));
+	check.push_back			(shared_str("xrGamespy"));
+	check.push_back			(shared_str("xrNetserver"));
+	check.push_back			(shared_str("xrParticles"));
+	check.push_back			(shared_str("xrRender_R1"));
+	check.push_back			(shared_str("xrRender_R2"));
+	check.push_back			(shared_str("xrSound"));
+	check.push_back			(shared_str("xrXMLParser"));
 //	check.push_back			(shared_str("xrEngine.exe"));
 }