diff --git a/Contrib/AdvSplash/advsplash.c b/Contrib/AdvSplash/advsplash.c index d523cde6..f8f92618 100644 --- a/Contrib/AdvSplash/advsplash.c +++ b/Contrib/AdvSplash/advsplash.c @@ -3,7 +3,7 @@ #include #include -#include // nsis plugin.h +#include // nsis plugin HINSTANCE g_hInstance; diff --git a/Contrib/Banner/Banner.c b/Contrib/Banner/Banner.c index d3ed2cbf..a5498ee1 100644 --- a/Contrib/Banner/Banner.c +++ b/Contrib/Banner/Banner.c @@ -1,5 +1,5 @@ #include -#include // nsis plugin.h +#include // nsis plugin #include "../../Source/exehead/resource.h" // Turn a pair of chars into a word diff --git a/Contrib/BgImage/BgImage.cpp b/Contrib/BgImage/BgImage.cpp index 0f8c841a..b411266c 100644 --- a/Contrib/BgImage/BgImage.cpp +++ b/Contrib/BgImage/BgImage.cpp @@ -1,6 +1,6 @@ #include #include -#include // nsis plugin.h +#include // nsis plugin #undef EXDLL_INIT diff --git a/Contrib/Dialer/dialer.c b/Contrib/Dialer/dialer.c index 3abf14e8..c6c7067c 100644 --- a/Contrib/Dialer/dialer.c +++ b/Contrib/Dialer/dialer.c @@ -2,7 +2,7 @@ #include #include -#include // nsis plugin.h +#include // nsis plugin #define NSISFunction(funcname) void __declspec(dllexport) funcname(HWND hwndParent, int string_size, char *variables, stack_t **stacktop, extra_parameters *extra) diff --git a/Contrib/ExDLL/SConscript b/Contrib/ExDLL/SConscript index 9994cc16..80b9f5fa 100644 --- a/Contrib/ExDLL/SConscript +++ b/Contrib/ExDLL/SConscript @@ -1,14 +1,14 @@ # FIXME: install assembly and pascal includes into the correct locations -lib_target = "plugin" +lib_target = "pluginapi" lib_files = Split(""" - plugin.c + pluginapi.c """) api_files = Split(""" - plugin.h - plugin.lib + pluginapi.h + pluginapi.lib #Source/exehead/api.h """) diff --git a/Contrib/ExDLL/exdll.c b/Contrib/ExDLL/exdll.c index d7335dfd..6c6a2cf1 100644 --- a/Contrib/ExDLL/exdll.c +++ b/Contrib/ExDLL/exdll.c @@ -1,5 +1,5 @@ #include -#include // nsis plugin.h +#include // nsis plugin HINSTANCE g_hInstance; diff --git a/Contrib/ExDLL/exdll.dsp b/Contrib/ExDLL/exdll.dsp index ec47e5b8..ae046792 100644 --- a/Contrib/ExDLL/exdll.dsp +++ b/Contrib/ExDLL/exdll.dsp @@ -101,7 +101,7 @@ SOURCE=.\exdll.c # PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File -SOURCE=.\plugin.h +SOURCE=.\pluginapi.h # End Source File # End Group # Begin Group "Resource Files" diff --git a/Contrib/ExDLL/exdll.h b/Contrib/ExDLL/exdll.h index 6d3f0b9d..258f38f9 100644 --- a/Contrib/ExDLL/exdll.h +++ b/Contrib/ExDLL/exdll.h @@ -5,7 +5,7 @@ #define _EXDLL_H_ #include -#include // nsis plugin.h +#include // nsis plugin // this may not work if /NODEFAULTLIB is used #ifdef _MSC_VER diff --git a/Contrib/ExDLL/plugin.c b/Contrib/ExDLL/pluginapi.c similarity index 93% rename from Contrib/ExDLL/plugin.c rename to Contrib/ExDLL/pluginapi.c index 0a55af19..906f16a0 100644 --- a/Contrib/ExDLL/plugin.c +++ b/Contrib/ExDLL/pluginapi.c @@ -1,6 +1,6 @@ #include -#include "plugin.h" +#include "pluginapi.h" unsigned int g_stringsize; stack_t **g_stacktop; diff --git a/Contrib/ExDLL/plugin.h b/Contrib/ExDLL/pluginapi.h similarity index 100% rename from Contrib/ExDLL/plugin.h rename to Contrib/ExDLL/pluginapi.h diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp index 9b41b4a7..ab7e73ec 100644 --- a/Contrib/InstallOptions/InstallerOptions.cpp +++ b/Contrib/InstallOptions/InstallerOptions.cpp @@ -14,7 +14,7 @@ #include "resource.h" #include "shellapi.h" -#include // nsis plugin.h +#include // nsis plugin // Use for functions only called from one place to possibly reduce some code // size. Allows the source code to remain readable by leaving the function diff --git a/Contrib/LangDLL/LangDLL.c b/Contrib/LangDLL/LangDLL.c index c34a24c7..321e81d2 100644 --- a/Contrib/LangDLL/LangDLL.c +++ b/Contrib/LangDLL/LangDLL.c @@ -10,7 +10,7 @@ // LangDLL:LangDialog "Language Selection" "Choose a language" 2F French 1036 English 1033 12 Garamond -#include // nsis plugin.h +#include // nsis plugin HINSTANCE g_hInstance; HWND g_hwndParent; diff --git a/Contrib/Library/TypeLib/TypeLib.cpp b/Contrib/Library/TypeLib/TypeLib.cpp index d03594b1..2726357e 100644 --- a/Contrib/Library/TypeLib/TypeLib.cpp +++ b/Contrib/Library/TypeLib/TypeLib.cpp @@ -6,7 +6,7 @@ */ #include -#include // nsis plugin.h +#include // nsis plugin #define NSISFunction(funcname) extern "C" void __declspec(dllexport) funcname(HWND hwndParent, int string_size, char *variables, stack_t **stacktop) diff --git a/Contrib/Math/Source/Math.c b/Contrib/Math/Source/Math.c index 96e6fc55..275d0ae2 100644 --- a/Contrib/Math/Source/Math.c +++ b/Contrib/Math/Source/Math.c @@ -1,5 +1,5 @@ #include -#include // nsis plugin library +#include // nsis plugin #include "MyMath.h" #include "Math.h" diff --git a/Contrib/Math/Source/Math.h b/Contrib/Math/Source/Math.h index f80b11b6..165161a0 100644 --- a/Contrib/Math/Source/Math.h +++ b/Contrib/Math/Source/Math.h @@ -1,6 +1,6 @@ #pragma once -#include // nsis plugin api +#include // nsis plugin #ifdef _DEBUG //#define _DEBUG_LEAKS diff --git a/Contrib/NSISdl/nsisdl.cpp b/Contrib/NSISdl/nsisdl.cpp index 634d1cfa..f3e6ae93 100644 --- a/Contrib/NSISdl/nsisdl.cpp +++ b/Contrib/NSISdl/nsisdl.cpp @@ -26,7 +26,7 @@ #include "util.h" #include "httpget.h" -#include // nsis plugin.h +#include // nsis plugin void *operator new( unsigned int num_bytes ) { diff --git a/Contrib/Splash/splash.c b/Contrib/Splash/splash.c index 25924bc4..c72978ab 100644 --- a/Contrib/Splash/splash.c +++ b/Contrib/Splash/splash.c @@ -1,5 +1,5 @@ #include -#include // nsis plugin.h +#include // nsis plugin HINSTANCE g_hInstance; diff --git a/Contrib/StartMenu/StartMenu.c b/Contrib/StartMenu/StartMenu.c index d1275ed1..691d99f5 100644 --- a/Contrib/StartMenu/StartMenu.c +++ b/Contrib/StartMenu/StartMenu.c @@ -1,6 +1,6 @@ #include #include -#include // nsis plugin.h +#include // nsis plugin #include "resource.h" HINSTANCE g_hInstance; diff --git a/Contrib/System/Source/Plugin.h b/Contrib/System/Source/Plugin.h index 741b6ea9..7dee9df8 100644 --- a/Contrib/System/Source/Plugin.h +++ b/Contrib/System/Source/Plugin.h @@ -1,7 +1,7 @@ #ifndef ___PLUGIN__H___ #define ___PLUGIN__H___ -#include // nsis plug-in... +#include // nsis plugin #define PLUGINFUNCTION(name) \ void __declspec(dllexport) name( \ diff --git a/Contrib/UserInfo/UserInfo.c b/Contrib/UserInfo/UserInfo.c index a5879888..abaf639e 100644 --- a/Contrib/UserInfo/UserInfo.c +++ b/Contrib/UserInfo/UserInfo.c @@ -1,5 +1,5 @@ #include -#include // nsis plugin.h +#include // nsis plugin typedef BOOL (WINAPI*CHECKTOKENMEMBERSHIP)(HANDLE TokenHandle,PSID SidToCheck,PBOOL IsMember); CHECKTOKENMEMBERSHIP _CheckTokenMembership=NULL; diff --git a/Contrib/VPatch/Source/Plugin/vpatchdll.c b/Contrib/VPatch/Source/Plugin/vpatchdll.c index cc624b03..726b1ece 100644 --- a/Contrib/VPatch/Source/Plugin/vpatchdll.c +++ b/Contrib/VPatch/Source/Plugin/vpatchdll.c @@ -25,7 +25,7 @@ #define WIN32_LEAN_AND_MEAN #include -#include // nsis plugin.h +#include // nsis plugin #include "apply_patch.h" #include "checksum.h" diff --git a/Contrib/nsDialogs/browse.c b/Contrib/nsDialogs/browse.c index 1fc85cc8..f16885cf 100644 --- a/Contrib/nsDialogs/browse.c +++ b/Contrib/nsDialogs/browse.c @@ -1,7 +1,7 @@ #include #include -#include // nsis plugin.h +#include // nsis plugin #include "defs.h" diff --git a/Contrib/nsDialogs/input.c b/Contrib/nsDialogs/input.c index 35e42ac6..abf52841 100644 --- a/Contrib/nsDialogs/input.c +++ b/Contrib/nsDialogs/input.c @@ -1,6 +1,6 @@ #include -#include // nsis plugin.h +#include // nsis plugin #include "input.h" #include "defs.h" diff --git a/Contrib/nsDialogs/nsDialogs.c b/Contrib/nsDialogs/nsDialogs.c index e3d6aae5..755783e6 100644 --- a/Contrib/nsDialogs/nsDialogs.c +++ b/Contrib/nsDialogs/nsDialogs.c @@ -1,6 +1,6 @@ #include -#include // nsis plugin.h +#include // nsis plugin #include "defs.h" #include "input.h" diff --git a/Contrib/nsDialogs/rtl.c b/Contrib/nsDialogs/rtl.c index fef44a11..6dda123b 100644 --- a/Contrib/nsDialogs/rtl.c +++ b/Contrib/nsDialogs/rtl.c @@ -1,7 +1,7 @@ #include #include -#include // nsis plugin.h +#include // nsis plugin #include "defs.h" diff --git a/Contrib/nsExec/nsexec.c b/Contrib/nsExec/nsexec.c index ead27595..f4c60e7b 100644 --- a/Contrib/nsExec/nsexec.c +++ b/Contrib/nsExec/nsexec.c @@ -21,7 +21,7 @@ freely, subject to the following restrictions: #include #include #include -#include // nsis plugin.h +#include // nsis plugin #ifndef true #define true TRUE