diff options
| author | Sven Gothel <sgothel@jausoft.com> | 2023-11-28 12:51:46 +0100 |
|---|---|---|
| committer | Sven Gothel <sgothel@jausoft.com> | 2023-11-28 12:51:46 +0100 |
| commit | 1aaf4f070011490bcece50394b9b32dfa593fd9e (patch) | |
| tree | 17d68284e401a35eea3d3a574d986d446a60763a /router/router.cpp | |
| parent | 6e7cee4fa9a8af03f28ca26cd89f8357390dfc90 (diff) | |
| parent | 571b546f35eead77ce109f8d4dd6c3de3199d573 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'router/router.cpp')
| -rw-r--r-- | router/router.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/router/router.cpp b/router/router.cpp index 3c891053..e2ba91d1 100644 --- a/router/router.cpp +++ b/router/router.cpp @@ -17,18 +17,9 @@ #include "version.h" -std::vector<DriverIfacePtr> DriverList; - -thread_local DriverIface *ThreadCtxDriver; - enum LogLevel LogLevel = LogLevel_Error; FILE *LogFile; -#ifdef __MINGW32__ -DriverIface *GetThreadDriver() noexcept { return ThreadCtxDriver; } -void SetThreadDriver(DriverIface *driver) noexcept { ThreadCtxDriver = driver; } -#endif - static void LoadDriverList(void); @@ -328,13 +319,12 @@ void LoadDriverList(void) WCHAR cwd_path[MAX_PATH+1] = L""; WCHAR proc_path[MAX_PATH+1] = L""; WCHAR sys_path[MAX_PATH+1] = L""; - int len; if(GetLoadedModuleDirectory(L"OpenAL32.dll", dll_path, MAX_PATH)) TRACE("Got DLL path %ls\n", dll_path); GetCurrentDirectoryW(MAX_PATH, cwd_path); - len = lstrlenW(cwd_path); + auto len = wcslen(cwd_path); if(len > 0 && (cwd_path[len-1] == '\\' || cwd_path[len-1] == '/')) cwd_path[len-1] = '\0'; TRACE("Got current working directory %ls\n", cwd_path); @@ -343,7 +333,7 @@ void LoadDriverList(void) TRACE("Got proc path %ls\n", proc_path); GetSystemDirectoryW(sys_path, MAX_PATH); - len = lstrlenW(sys_path); + len = wcslen(sys_path); if(len > 0 && (sys_path[len-1] == '\\' || sys_path[len-1] == '/')) sys_path[len-1] = '\0'; TRACE("Got system path %ls\n", sys_path); |