dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

applied patch #1912699 - "Pinned" / always loaded plugins support

Browse source 
this patch also adds plugin_api_version to exec_flags so your plug-in can now tell if features it needs are available
more plug-ins that need this will be converted once the patch to make both the stubs and the plug-ins use the same header file is in place

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5809 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2008-11-29 22:03:33 +00:00
parent 9ac4ab0891
commit 4c30821aa5
10 changed files with 173 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Contrib/ExDLL/exdll.h
View file

@ -75,7 +75,7 @@ typedef struct {
int exec_reboot;
int reboot_called;
int XXX_cur_insttype; // deprecated
int XXX_insttype_changed; // deprecated
int plugin_api_version; // used to be XXX_insttype_changed, but that was deprecated
int silent;
int instdir_error;
int rtl;
@ -84,10 +84,23 @@ typedef struct {
int status_update;
} exec_flags_type;
// NSIS Plug-In Callback Messages
enum NSPIM
{
NSPIM_UNLOAD, // This is the last message a plugin gets, do final cleanup
NSPIM_GUIUNLOAD, // Called after .onGUIEnd
};
// Prototype for callbacks registered with extra_parameters->RegisterPluginCallback()
// Return NULL for unknown messages
// Should always be __cdecl for future expansion possibilities
typedef UINT_PTR (*NSISPLUGINCALLBACK)(NSPIM);
typedef struct {
exec_flags_type *exec_flags;
int (__stdcall *ExecuteCodeSegment)(int, HWND);
void (__stdcall *validate_filename)(char *);
BOOL (__stdcall *RegisterPluginCallback)(HMODULE, NSISPLUGINCALLBACK);
} extra_parameters;
// utility functions (not required but often useful)

5
Contrib/System/Source/Plugin.c
View file

@ -166,6 +166,11 @@ HANDLE GlobalCopy(HANDLE Old)
return copymem(GlobalAlloc(GPTR, size), Old, (int) size);
}
UINT_PTR NSISCallback(UINT msg)
{
return (UINT_PTR) NULL;
}
#ifdef _DEBUG
void main()
{

21
Contrib/System/Source/Plugin.h
View file

@ -36,11 +36,23 @@ INST_LANG, // $LANGUAGE
__INST_LAST
};
#define PLUGINFUNCTION(name) void __declspec(dllexport) name(HWND hwndParent, int string_size, char *variables, stack_t **stacktop) { \
/* g_hwndParent=hwndParent; */\
typedef UINT_PTR (*NSISPLUGINCALLBACK)(UINT);
typedef struct {
void *exec_flags;
int (__stdcall *ExecuteCodeSegment)(int, HWND);
void (__stdcall *validate_filename)(char *);
BOOL (__stdcall *RegisterPluginCallback)(HMODULE, NSISPLUGINCALLBACK);
} extra_parameters;
#define PLUGINFUNCTION(name) \
void __declspec(dllexport) name( \
HWND hwndParent, int string_size, char *variables, stack_t **stacktop, extra_parameters *extra) { \
/*g_hwndParent=hwndParent;*/ \
g_stringsize=string_size; \
g_stacktop=stacktop; \
g_variables=variables;
g_variables=variables; \
extra->RegisterPluginCallback(g_hInstance, NSISCallback);
#define PLUGINFUNCTIONEND }
#define PLUGINFUNCTIONSHORT(name) void __declspec(dllexport) name(HWND hwndParent, int string_size, char *variables, stack_t **stacktop) { \
@ -61,9 +73,12 @@ extern void pushint(int value);
extern HANDLE GlobalCopy(HANDLE Old);
extern char *copymem(char *output, char *input, int size);
extern UINT_PTR NSISCallback(UINT);
extern HWND g_hwndParent;
extern int g_stringsize;
extern stack_t **g_stacktop;
extern char *g_variables;
extern HINSTANCE g_hInstance;
#endif