cdvdgigaherz: Move dllmain to a Windows only file

plugins/cdvdGigaherz/src/CDVD.cpp

@@ -61,20 +61,6 @@ const unsigned char version = PS2E_CDVD_VERSION;
 const unsigned char revision = 0;
 const unsigned char build = 10;
 
-HINSTANCE hinst;
-
-BOOL WINAPI DllMain(
-    HINSTANCE hinstDLL, // handle to DLL module
-    DWORD fdwReason,    // reason for calling function
-    LPVOID lpvReserved  // reserved
-    )
-{
-    if (fdwReason == DLL_PROCESS_ATTACH) {
-        hinst = hinstDLL;
-    }
-    return TRUE;
-}
-
 char *CALLBACK PS2EgetLibName()
 {
     return LibName;

plugins/cdvdGigaherz/src/CDVD.h

@@ -87,8 +87,6 @@ extern IOCtlSrc *src;
 
 void configure();
 
-extern HINSTANCE hinst;
-
 void ReadSettings();
 void WriteSettings();
 std::wstring GetValidDrive();

plugins/cdvdGigaherz/src/Windows/config.cpp

@@ -22,6 +22,16 @@
 #include <codecvt>
 #include "resource.h"
 
+static HINSTANCE s_hinstance;
+
+BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved)
+{
+    if (reason == DLL_PROCESS_ATTACH)
+        s_hinstance = hinstance;
+
+    return TRUE;
+}
+
 static INT_PTR CALLBACK ConfigProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     switch (uMsg) {
@@ -111,6 +121,6 @@ void configure()
 {
     ReadSettings();
     auto drives = GetOpticalDriveList();
-    DialogBoxParam(hinst, MAKEINTRESOURCE(IDD_CONFIG), GetActiveWindow(),
+    DialogBoxParam(s_hinstance, MAKEINTRESOURCE(IDD_CONFIG), GetActiveWindow(),
                    ConfigProc, reinterpret_cast<LPARAM>(&drives));
 }