dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: refactor the Windows-only DllLoader in a cross-platform LibraryLoader (#11751)

Browse Source
This commit is contained in:
Patric Stout
2024-01-10 22:38:58 +01:00
committed by GitHub
parent f7bd70baec
commit d3ee045c2d
14 changed files with 268 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/os/windows/win32.cpp
View File

@@ -27,6 +27,7 @@
#include <sys/stat.h>
#include "../../language.h"
#include "../../thread.h"
#include "../../library_loader.h"
#include "../../safeguards.h"
@@ -573,8 +574,8 @@ int OTTDStringCompare(std::string_view s1, std::string_view s2)
#endif
if (first_time) {
static DllLoader _kernel32(L"Kernel32.dll");
_CompareStringEx = _kernel32.GetProcAddress("CompareStringEx");
static LibraryLoader _kernel32("Kernel32.dll");
_CompareStringEx = _kernel32.GetFunction("CompareStringEx");
first_time = false;
}
@@ -617,8 +618,8 @@ int Win32StringContains(const std::string_view str, const std::string_view value
static bool first_time = true;
if (first_time) {
static DllLoader _kernel32(L"Kernel32.dll");
_FindNLSStringEx = _kernel32.GetProcAddress("FindNLSStringEx");
static LibraryLoader _kernel32("Kernel32.dll");
_FindNLSStringEx = _kernel32.GetFunction("FindNLSStringEx");
first_time = false;
}