Skip to content

Commit

Permalink
xrCore/ModuleLookup.cpp: rename methods according to the code style
Browse files Browse the repository at this point in the history
  • Loading branch information
Xottab-DUTY committed May 27, 2018
1 parent 65559cd commit c5a5899
Show file tree
Hide file tree
Showing 10 changed files with 46 additions and 46 deletions.
4 changes: 2 additions & 2 deletions src/Layers/xrRender/HW.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ CHW::~CHW() {}
void CHW::CreateD3D()
{
hD3D = XRay::LoadModule(GEnv.isDedicatedServer ? "xrD3D9-Null" : "d3d9.dll");
R_ASSERT2(hD3D->exist(), "Can't find 'd3d9.dll'\nPlease install latest version of DirectX before running this program");
R_ASSERT2(hD3D->IsLoaded(), "Can't find 'd3d9.dll'\nPlease install latest version of DirectX before running this program");

using _Direct3DCreate9 = IDirect3D9* WINAPI(UINT SDKVersion);
auto createD3D = (_Direct3DCreate9*)hD3D->getProcAddress("Direct3DCreate9");
auto createD3D = (_Direct3DCreate9*)hD3D->GetProcAddress("Direct3DCreate9");
R_ASSERT(createD3D);
pD3D = createD3D(D3D_SDK_VERSION);
R_ASSERT2(pD3D, "Please install DirectX 9.0c");
Expand Down
8 changes: 4 additions & 4 deletions src/utils/xrAI/xrAI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ void execute(LPSTR cmd)

const auto hFactory = XRay::LoadModule("xrSE_Factory");

R_ASSERT2(hFactory->exist(), "Factory DLL raised exception during loading or there is no factory DLL at all");
R_ASSERT2(hFactory->IsLoaded(), "Factory DLL raised exception during loading or there is no factory DLL at all");

#ifdef XR_X64
pcstr create_entity_name = "create_entity";
Expand All @@ -113,15 +113,15 @@ void execute(LPSTR cmd)
pcstr create_entity_name = "_create_entity@4";
pcstr destroy_entity_name = "_destroy_entity@4";
#endif
create_entity = (Factory_Create*)hFactory->getProcAddress(create_entity_name);
destroy_entity = (Factory_Destroy*)hFactory->getProcAddress(destroy_entity_name);
create_entity = (Factory_Create*)hFactory->GetProcAddress(create_entity_name);
destroy_entity = (Factory_Destroy*)hFactory->GetProcAddress(destroy_entity_name);

R_ASSERT(create_entity);
R_ASSERT(destroy_entity);

CGameSpawnConstructor(name, output, start, !!no_separator_check);

hFactory->close();
hFactory->Close();

create_entity = nullptr;
destroy_entity = nullptr;
Expand Down
2 changes: 1 addition & 1 deletion src/utils/xrLC/xrLC.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ void Startup(LPSTR lpCmdLine)
Logger.Phase("Project options...");
const auto L = XRay::LoadModule("xrLC_Options");

const auto O = (xrOptions*)L->getProcAddress("_frmScenePropertiesRun");
const auto O = (xrOptions*)L->GetProcAddress("_frmScenePropertiesRun");
R_ASSERT(O);

const int R = O(&Params, version, false);
Expand Down
4 changes: 2 additions & 2 deletions src/utils/xrSE_Factory/properties_list_helper_script.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ CScriptPropertiesListHelper* g_property_list_helper = nullptr;
void load_prop_helper()
{
prop_helper_module = XRay::LoadModule(prop_helper_library);
if (!prop_helper_module->exist())
if (!prop_helper_module->IsLoaded())
{
Msg("! Cannot find library %s", prop_helper_library);
return;
}

_PHelper = (TPHelper)prop_helper_module->getProcAddress(prop_helper_func);
_PHelper = (TPHelper)prop_helper_module->GetProcAddress(prop_helper_func);
if (!_PHelper)
{
Msg("! Cannot find entry point of the function %s in the library %s", prop_helper_func, prop_helper_func);
Expand Down
2 changes: 1 addition & 1 deletion src/utils/xrSE_Factory/xrSE_Factory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ BOOL APIENTRY DllMain(HANDLE module_handle, DWORD call_reason, LPVOID reserved)
xr_delete(g_ai_space);
xr_delete(g_object_factory);
if (prop_helper_module)
prop_helper_module->close();
prop_helper_module->Сlose();
//Core._destroy();
break;
}
Expand Down
16 changes: 8 additions & 8 deletions src/xrCore/ModuleLookup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ ModuleHandle::ModuleHandle(const bool dontUnload) : handle(nullptr), dontUnload(

ModuleHandle::ModuleHandle(pcstr moduleName, bool dontUnload /*= false*/) : handle(nullptr), dontUnload(dontUnload)
{
open(moduleName);
Open(moduleName);
}

ModuleHandle::~ModuleHandle()
{
close();
Сlose();
}

void* ModuleHandle::open(pcstr moduleName)
void* ModuleHandle::Open(pcstr moduleName)
{
if (exist())
close();
if (IsLoaded())
Сlose();

Log("Loading DLL:", moduleName);

Expand All @@ -40,7 +40,7 @@ void* ModuleHandle::open(pcstr moduleName)
return handle;
}

void ModuleHandle::close()
void ModuleHandle::Сlose()
{
if (dontUnload)
return;
Expand All @@ -65,7 +65,7 @@ void ModuleHandle::close()
handle = nullptr;
}

bool ModuleHandle::exist() const
bool ModuleHandle::IsLoaded() const
{
return handle != nullptr;
}
Expand All @@ -75,7 +75,7 @@ void* ModuleHandle::operator()() const
return handle;
}

void* ModuleHandle::getProcAddress(pcstr procName) const
void* ModuleHandle::GetProcAddress(pcstr procName) const
{
void* proc = nullptr;

Expand Down
8 changes: 4 additions & 4 deletions src/xrCore/ModuleLookup.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ class XRCORE_API ModuleHandle
ModuleHandle(pcstr moduleName, bool dontUnload = false);
~ModuleHandle();

void* open(pcstr moduleName);
void close();
void* Open(pcstr moduleName);
void Сlose();

bool exist() const;
bool IsLoaded() const;

void* operator()() const;

void* getProcAddress(pcstr procName) const;
void* GetProcAddress(pcstr procName) const;
};

using Module = std::unique_ptr<ModuleHandle>;
Expand Down
6 changes: 3 additions & 3 deletions src/xrEngine/Device_Initialize.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ extern LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
void CRenderDevice::initialize_weather_editor()
{
m_editor_module = XRay::LoadModule("xrWeatherEditor");
if (!m_editor_module->exist())
if (!m_editor_module->IsLoaded())
return;

m_editor_initialize = (initialize_function_ptr)m_editor_module->getProcAddress("initialize");
m_editor_initialize = (initialize_function_ptr)m_editor_module->GetProcAddress("initialize");
VERIFY(m_editor_initialize);

m_editor_finalize = (finalize_function_ptr)m_editor_module->getProcAddress("finalize");
m_editor_finalize = (finalize_function_ptr)m_editor_module->GetProcAddress("finalize");
VERIFY(m_editor_finalize);

m_engine = new engine_impl();
Expand Down
36 changes: 18 additions & 18 deletions src/xrEngine/EngineAPI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ void CEngineAPI::SetupCurrentRenderer()

if (psDeviceFlags.test(rsRGL))
{
if (hRenderRGL->exist())
if (hRenderRGL->IsLoaded())
{
GEnv.CurrentRenderer = 5;
GEnv.SetupCurrentRenderer = GEnv.SetupRGL;
Expand All @@ -65,7 +65,7 @@ void CEngineAPI::SetupCurrentRenderer()

if (psDeviceFlags.test(rsR4))
{
if (hRenderR4->exist())
if (hRenderR4->IsLoaded())
{
GEnv.CurrentRenderer = 4;
GEnv.SetupCurrentRenderer = GEnv.SetupR4;
Expand All @@ -79,7 +79,7 @@ void CEngineAPI::SetupCurrentRenderer()

if (psDeviceFlags.test(rsR3))
{
if (hRenderR3->exist())
if (hRenderR3->IsLoaded())
{
GEnv.CurrentRenderer = 3;
GEnv.SetupCurrentRenderer = GEnv.SetupR3;
Expand All @@ -93,7 +93,7 @@ void CEngineAPI::SetupCurrentRenderer()

if (psDeviceFlags.test(rsR2))
{
if (hRenderR2->exist())
if (hRenderR2->IsLoaded())
{
GEnv.CurrentRenderer = 2;
GEnv.SetupCurrentRenderer = GEnv.SetupR2;
Expand All @@ -107,7 +107,7 @@ void CEngineAPI::SetupCurrentRenderer()

if (psDeviceFlags.test(rsR1))
{
if (hRenderR1->exist())
if (hRenderR1->IsLoaded())
{
GEnv.CurrentRenderer = 1;
GEnv.SetupCurrentRenderer = GEnv.SetupR1;
Expand Down Expand Up @@ -164,10 +164,10 @@ void CEngineAPI::Initialize(void)
hGame = XRay::LoadModule("xrGame");
R_ASSERT2(hGame, "Game DLL raised exception during loading or there is no game DLL at all");

pCreate = (Factory_Create*)hGame->getProcAddress("xrFactory_Create");
pCreate = (Factory_Create*)hGame->GetProcAddress("xrFactory_Create");
R_ASSERT(pCreate);

pDestroy = (Factory_Destroy*)hGame->getProcAddress("xrFactory_Destroy");
pDestroy = (Factory_Destroy*)hGame->GetProcAddress("xrFactory_Destroy");
R_ASSERT(pDestroy);

//////////////////////////////////////////////////////////////////////////
Expand All @@ -176,8 +176,8 @@ void CEngineAPI::Initialize(void)
if (strstr(Core.Params, "-tune"))
{
hTuner = XRay::LoadModule("vTuneAPI");
tune_pause = (VTPause*)hTuner->getProcAddress("VTPause");
tune_resume = (VTResume*)hTuner->getProcAddress("VTResume");
tune_pause = (VTPause*)hTuner->GetProcAddress("VTPause");
tune_resume = (VTResume*)hTuner->GetProcAddress("VTResume");

if (!tune_pause || !tune_resume)
{
Expand Down Expand Up @@ -213,7 +213,7 @@ void CEngineAPI::CreateRendererList()
xr_vector<xr_token> modes;
if (GEnv.isDedicatedServer)
{
R_ASSERT2(hRenderR1->exist(), "Dedicated server needs xrRender_R1 to work");
R_ASSERT2(hRenderR1->IsLoaded(), "Dedicated server needs xrRender_R1 to work");
modes.emplace_back(xr_token("renderer_r1", 0));
modes.emplace_back(xr_token(nullptr, -1));
vid_quality_token = std::move(modes);
Expand All @@ -234,41 +234,41 @@ void CEngineAPI::CreateRendererList()
// Restore error handling
SetErrorMode(0);

if (hRenderR1->exist())
if (hRenderR1->IsLoaded())
{
modes.emplace_back(xr_token("renderer_r1", 0));
}

if (hRenderR2->exist())
if (hRenderR2->IsLoaded())
{
modes.emplace_back(xr_token("renderer_r2a", 1));
modes.emplace_back(xr_token("renderer_r2", 2));
if (GEnv.CheckR2 && GEnv.CheckR2())
modes.emplace_back(xr_token("renderer_r2.5", 3));
}

if (hRenderR3->exist())
if (hRenderR3->IsLoaded())
{
if (GEnv.CheckR3 && GEnv.CheckR3())
modes.emplace_back(xr_token("renderer_r3", 4));
else
hRenderR3->close();
hRenderR3->Сlose();
}

if (hRenderR4->exist())
if (hRenderR4->IsLoaded())
{
if (GEnv.CheckR4 && GEnv.CheckR4())
modes.emplace_back(xr_token("renderer_r4", 5));
else
hRenderR4->close();
hRenderR4->Сlose();
}

if (hRenderRGL->exist())
if (hRenderRGL->IsLoaded())
{
if (GEnv.CheckRGL && GEnv.CheckRGL())
modes.emplace_back(xr_token("renderer_gl", 6));
else
hRenderRGL->close();
hRenderRGL->Сlose();
}
modes.emplace_back(xr_token(nullptr, -1));

Expand Down
6 changes: 3 additions & 3 deletions src/xrScriptEngine/script_engine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -745,18 +745,18 @@ void CScriptEngine::initialize_lua_studio(lua_State* state, cs::lua_studio::worl

const auto s_script_debugger_module = XRay::LoadModule(CS_LUA_STUDIO_BACKEND_FILE_NAME);
SetErrorMode(old_error_mode);
if (!s_script_debugger_module->exist())
if (!s_script_debugger_module->IsLoaded())
{
Msg("! cannot load %s dynamic library", CS_LUA_STUDIO_BACKEND_FILE_NAME);
return;
}

s_create_world =
(create_world_function_type)s_script_debugger_module->getProcAddress("_cs_lua_studio_backend_create_world@12");
(create_world_function_type)s_script_debugger_module->GetProcAddress("_cs_lua_studio_backend_create_world@12");
R_ASSERT2(s_create_world, "can't find function \"cs_lua_studio_backend_create_world\"");

s_destroy_world =
(destroy_world_function_type)s_script_debugger_module->getProcAddress("_cs_lua_studio_backend_destroy_world@4");
(destroy_world_function_type)s_script_debugger_module->GetProcAddress("_cs_lua_studio_backend_destroy_world@4");
R_ASSERT2(s_destroy_world, "can't find function \"cs_lua_studio_backend_destroy_world\" in the library");

engine = new lua_studio_engine();
Expand Down

0 comments on commit c5a5899

Please sign in to comment.