Fixed library handle in hcaenc

hozuki · Apr 25, 2020 · ac6c9a6 · ac6c9a6
1 parent 0961776
commit ac6c9a6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/src/apps/hcaenc/hcaenc.cpp b/src/apps/hcaenc/hcaenc.cpp
@@ -1,4 +1,6 @@
 #include <cstdio>
+#include <Windows.h>
+
 #include "../../lib/cgss_api.h"
 
 #define VGAUDIO_APP_LINK "https://github.com/hozuki/vgaudio-cpp"
@@ -29,7 +31,7 @@ static void PrintAppTitle(FILE *out);
 static void PrintHelp();
 
 int main(int argc, const char *argv[]) {
-    HMODULE hHcaEncDll = nullptr;
+    cgss::Utilities::HLIB hHcaEncDll = nullptr;
     LPCSTR inputFile = nullptr;
     LPCSTR outputFile = nullptr;
     // These are (nearly) the same settings as High audio profile of CGSS.

diff --git a/src/lib/takamori/Utilities.cpp b/src/lib/takamori/Utilities.cpp
@@ -12,23 +12,23 @@
 
 CGSS_NS_BEGIN
 
-    void *Utilities::LoadDynamicLibrary(const char *lpstrModuleName) {
+    cgss::Utilities::HLIB Utilities::LoadDynamicLibrary(const char *lpstrModuleName) {
 #if defined(__CGSS_OS_WINDOWS__)
         return LoadLibrary(lpstrModuleName);
 #elif defined(__CGSS_OS_UNIX__)
         return dlopen(lpstrModuleName, RTLD_LAZY);
 #endif
     }
 
-    void *Utilities::GetFunctionAddress(const void *hModule, const char *lpstrFuncName) {
+    void *Utilities::GetFunctionAddress(cgss::Utilities::CHLIB hModule, const char *lpstrFuncName) {
 #if defined(__CGSS_OS_WINDOWS__)
         return (void *)GetProcAddress((HMODULE)hModule, lpstrFuncName);
 #elif defined(__CGSS_OS_UNIX__)
         return dlsym(hModule, lpstrFuncName);
 #endif
     }
 
-    bool_t Utilities::FreeDynamicLibrary(void *hModule) {
+    bool_t Utilities::FreeDynamicLibrary(cgss::Utilities::HLIB hModule) {
 #if defined(__CGSS_OS_WINDOWS__)
         return static_cast<bool_t>(FreeLibrary((HMODULE)hModule));
 #elif defined(__CGSS_OS_UNIX__)

diff --git a/src/lib/takamori/Utilities.h b/src/lib/takamori/Utilities.h
@@ -8,11 +8,14 @@ CGSS_NS_BEGIN
 
     public:
 
-        static void *LoadDynamicLibrary(const char *lpstrModuleName);
+        typedef void *HLIB;
+        typedef const void *CHLIB;
 
-        static void *GetFunctionAddress(const void *hModule, const char *lpstrFuncName);
+        static HLIB LoadDynamicLibrary(const char *lpstrModuleName);
 
-        static bool_t FreeDynamicLibrary(void *hModule);
+        static void *GetFunctionAddress(CHLIB hModule, const char *lpstrFuncName);
+
+        static bool_t FreeDynamicLibrary(HLIB hModule);
 
     PURE_STATIC(Utilities);