WebSVN – filter_foundry – Diff – /trunk/slider_win.c

 // PLUGIN.DLL Sliders: This method will register the "slider" class used in dialogs.
 typedef BOOL(__cdecl* f_RegisterSlider)(HINSTANCE hInstanceDll, DWORD* MessageID);
 BOOL RegisterSlider(HINSTANCE hInstanceDll, DWORD* MessageID) {
         f_RegisterSlider fRegisterSlider;
-        HMODULE hPlugin;
         BOOL res;
-        hPlugin = LoadLibrary(TEXT("PLUGIN.DLL"));
-        if (!hPlugin) return false;
+        if (!gdata->libPluginDll) return false;
-        fRegisterSlider = (f_RegisterSlider)(void*)GetProcAddress(hPlugin, "RegisterSlider");
+        fRegisterSlider = (f_RegisterSlider)(void*)GetProcAddress(gdata->libPluginDll, "RegisterSlider");
         res = (fRegisterSlider != 0) ? fRegisterSlider(hInstanceDll, MessageID) : false;
-        FreeLibrary(hPlugin);
         return res;
+}
 // PLUGIN.DLL Sliders: This method will unregister the "slider" class used in dialogs.
 typedef BOOL(__cdecl* f_UnRegisterSlider)(HINSTANCE hInstanceDll);
 BOOL UnRegisterSlider(HINSTANCE hInstanceDll) {
         f_UnRegisterSlider fUnRegisterSlider;
-        HMODULE hPlugin;
         BOOL res;
-        hPlugin = LoadLibrary(TEXT("PLUGIN.DLL"));
-        if (!hPlugin) return false;
+        if (!gdata->libPluginDll) return false;
-        fUnRegisterSlider = (f_UnRegisterSlider)(void*)GetProcAddress(hPlugin, "UnRegisterSlider");
+        fUnRegisterSlider = (f_UnRegisterSlider)(void*)GetProcAddress(gdata->libPluginDll, "UnRegisterSlider");
         res = (fUnRegisterSlider != 0) ? fUnRegisterSlider(hInstanceDll) : false;
-        FreeLibrary(hPlugin);
         return res;
+}
 // PLUGIN.DLL Sliders: Set slider range (min/max)
 typedef int(__cdecl* f_SetSliderRange)(HWND hWnd, int nMin, int nMax);
 int SetSliderRange(HWND hWnd, int nMin, int nMax) {
         f_SetSliderRange fSetSliderRange;
-        HMODULE hPlugin;
         int res;
-        hPlugin = LoadLibrary(TEXT("PLUGIN.DLL"));
-        if (!hPlugin) return 0;
+        if (!gdata->libPluginDll) return 0;
-        fSetSliderRange = (f_SetSliderRange)(void*)GetProcAddress(hPlugin, "SetSliderRange");
+        fSetSliderRange = (f_SetSliderRange)(void*)GetProcAddress(gdata->libPluginDll, "SetSliderRange");
         res = (fSetSliderRange != 0) ? fSetSliderRange(hWnd, nMin, nMax) : 0;
-        FreeLibrary(hPlugin);
         return res;
+}
 // PLUGIN.DLL Sliders : Sets slider position
 typedef int(__cdecl* f_SetSliderPos)(HWND hWnd, int nPos, BOOL bRepaint);
 int SetSliderPos(HWND hWnd, int nPos, BOOL bRepaint) {
         f_SetSliderPos fSetSliderPos;
-        HMODULE hPlugin;
         int res;
-        hPlugin = LoadLibrary(TEXT("PLUGIN.DLL"));
-        if (!hPlugin) return 0;
+        if (!gdata->libPluginDll) return 0;
-        fSetSliderPos = (f_SetSliderPos)(void*)GetProcAddress(hPlugin, "SetSliderPos");
+        fSetSliderPos = (f_SetSliderPos)(void*)GetProcAddress(gdata->libPluginDll, "SetSliderPos");
         res = (fSetSliderPos != 0) ? fSetSliderPos(hWnd, nPos, bRepaint) : 0;
-        FreeLibrary(hPlugin);
         return res;
+}
 // PLUGIN.DLL Sliders : Get slider position
 typedef int(__cdecl* f_GetSliderPos)(HWND hWnd, BOOL bPixelPosition);
 int GetSliderPos(HWND hWnd, BOOL bPixelPosition) {
         f_GetSliderPos fGetSliderPos;
-        HMODULE hPlugin;
         int res;
-        hPlugin = LoadLibrary(TEXT("PLUGIN.DLL"));
-        if (!hPlugin) return 0;
+        if (!gdata->libPluginDll) return 0;
-        fGetSliderPos = (f_GetSliderPos)(void*)GetProcAddress(hPlugin, "GetSliderPos");
+        fGetSliderPos = (f_GetSliderPos)(void*)GetProcAddress(gdata->libPluginDll, "GetSliderPos");
         res = (fGetSliderPos != 0) ? fGetSliderPos(hWnd, bPixelPosition) : 0;
-        FreeLibrary(hPlugin);
         return res;
+}
 LRESULT CALLBACK DummyWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) {
         return DefWindowProc(hwnd, uMsg, wParam, lParam);
+                }
                 return false;
+        }
+}
-void Slider_Uninit_PluginDll() {
-#ifndef use_plugin_dll_sliders
-        return;
-#else
-        if (gdata->pluginDllSliderInitialized) {
-                if (UnRegisterSlider(hDllInstance)) {
-                        gdata->pluginDllSliderInitialized = false;
-                } else {
-                        simplealert(TEXT("UnRegisterSlider failed"));
-                }
-        }
-#endif
-}
 Boolean Slider_Init_PluginDll(LPCTSTR targetClass) {
 #ifndef use_plugin_dll_sliders
         return false;
 #else
-        if (!gdata->pluginDllSliderInitialized) {
+        if (gdata->pluginDllSliderInitialized) return true;
+        if (!gdata->libPluginDll) {
+                // DM 16.04.2022 : It is important that PLUGIN.DLL stays loaded, otherwise
+                // DialogBoxParamA crashes. Can be reproduced if all 8BX modules are disabled in Photoshop 7
+                // (they keep PLUGIN.DLL loaded).
+                gdata->libPluginDll = LoadLibrary(TEXT("Plugin.dll"));
+        }
-                if (RegisterSlider(hDllInstance, &gdata->pluginDllSliderMessageId)) {
+        if (gdata->libPluginDll && RegisterSlider(hDllInstance, &gdata->pluginDllSliderMessageId)) {
-                        gdata->pluginDllSliderInitialized = true;
+                gdata->pluginDllSliderInitialized = true;
+                // Make "FoundrySlider" a subclass of "slider" then
+                return MakeSimpleSubclass(targetClass, TEXT("slider"));
+        }
-                else {
+        else {
-                        // This can happen if PLUGIN.DLL is not existing
+                // This can happen if PLUGIN.DLL is not existing
-                        // It will also happen if a previous uninitialization failed (or was forgotten)
+                // It will also happen if a previous uninitialization failed (or was forgotten)
-                        return false; // Fall back to Windows sliders
+                return false; // Fall back to Windows sliders
+        }
+#endif
+}
+void Slider_Uninit_PluginDll() {
+#ifndef use_plugin_dll_sliders
+        return;
+#else
+        if (gdata->pluginDllSliderInitialized) {
+                if (UnRegisterSlider(hDllInstance)) {
-        // Make "FoundrySlider" a subclass of "slider" then
+                        gdata->pluginDllSliderInitialized = false;
+                        if (gdata->libPluginDll) {
+                                FreeLibrary(gdata->libPluginDll);
+                                gdata->libPluginDll = 0;
+                        }
+                }
+                else {
-        return MakeSimpleSubclass(targetClass, TEXT("slider"));
+                        simplealert((TCHAR*)TEXT("UnRegisterSlider failed"));
+                }
+        }
 #endif
+}
 typedef void(__stdcall* f_InitCommonControls)();
 typedef BOOL(__stdcall* f_InitCommonControlsEx)(const INITCOMMONCONTROLSEX* picce);
 Boolean Slider_Init_MsTrackbar(LPCTSTR targetClass) {
         f_InitCommonControls fInitCommonControls;
         f_InitCommonControlsEx fInitCommonControlsEx;
-        HMODULE libComctl32;
         // Make sure that Comctl32 is loaded
+        if (!gdata->libComctl32) {
-        libComctl32 = LoadLibrary(TEXT("Comctl32.dll"));
+                gdata->libComctl32 = LoadLibrary(TEXT("Comctl32.dll"));
+        }
-        if (libComctl32) {
+        if (gdata->libComctl32) {
-                fInitCommonControlsEx = (f_InitCommonControlsEx)(void*)GetProcAddress(libComctl32, "InitCommonControlsEx");
+                fInitCommonControlsEx = (f_InitCommonControlsEx)(void*)GetProcAddress(gdata->libComctl32, "InitCommonControlsEx");
                 if (fInitCommonControlsEx != 0) {
                         INITCOMMONCONTROLSEX icce;
                         icce.dwSize = sizeof(INITCOMMONCONTROLSEX);
                         icce.dwICC = ICC_BAR_CLASSES;
                         fInitCommonControlsEx(&icce);
+                }
                 else {
-                        fInitCommonControls = (f_InitCommonControls)(void*)GetProcAddress(libComctl32, "InitCommonControls");
+                        fInitCommonControls = (f_InitCommonControls)(void*)GetProcAddress(gdata->libComctl32, "InitCommonControls");
                         if (fInitCommonControls != 0) {
                                 fInitCommonControls();
+                        }
+                }
-                // There seems to be a bug in Windows NT 3.11 (if PLUGIN.DLL does not exist):
-                // If we call FreeLibrary, and then open Filter Foundry again,
-                // then you get an error message "BRUSHES" cannot initialize Comctl32.dll ...
-                // I am not sure if it is OK to do a FreeLibrary after you have called InitCommonControls.
-                // Isn't that a contradiction?
-                //FreeLibrary(libComctl32);
-        }
-        // Make "FoundrySlider" a subclass of "msctls_trackbar32" then
+                // Make "FoundrySlider" a subclass of "msctls_trackbar32" then
-        return MakeSimpleSubclass(targetClass, TEXT("msctls_trackbar32"));
+                return MakeSimpleSubclass(targetClass, TEXT("msctls_trackbar32"));
+        }
+        else {
+                return false;
+        }
+}
+void Slider_Uninit_MsTrackbar() {
+        if (gdata->libComctl32 != 0) {
+                FreeLibrary(gdata->libComctl32);
+                gdata->libComctl32 = 0;
+        }
+}
 Boolean Slider_Init_None(LPCTSTR targetClass) {
         // Make "FoundrySlider" a subclass of "STATIC" (making it invisible)
         return MakeSimpleSubclass(targetClass, WC_STATIC);
+}
+void Slider_Uninit_None() {
+        // Nothing here
+}

Subversion Repositories filter_foundry

filter_foundry/trunk/slider_win.c – Rev 471 → 476