From 6720f24b8f4426eddd3f58070bb345dcfa793eb4 Mon Sep 17 00:00:00 2001 From: kichik Date: Tue, 9 Dec 2008 22:54:32 +0000 Subject: [PATCH] use api.h in exdll.h (part of patch #2359978) git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5816 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/ExDLL/exdll.h | 42 +----------------------------------------- 1 file changed, 1 insertion(+), 41 deletions(-) diff --git a/Contrib/ExDLL/exdll.h b/Contrib/ExDLL/exdll.h index f4d14317..bbccafb0 100644 --- a/Contrib/ExDLL/exdll.h +++ b/Contrib/ExDLL/exdll.h @@ -2,6 +2,7 @@ #define _EXDLL_H_ #include +#include "../../Source/exehead/api.h" #if defined(__GNUC__) #define UNUSED __attribute__((unused)) @@ -17,11 +18,6 @@ g_stacktop=stacktop; \ g_variables=variables; } -// For page showing plug-ins -#define WM_NOTIFY_OUTER_NEXT (WM_USER+0x8) -#define WM_NOTIFY_CUSTOM_READY (WM_USER+0xd) -#define NOTIFY_BYE_BYE 'x' - typedef struct _stack_t { struct _stack_t *next; char text[1]; // this should be the length of string_size @@ -67,42 +63,6 @@ INST_LANG, // $LANGUAGE __INST_LAST }; -typedef struct { - int autoclose; - int all_user_var; - int exec_error; - int abort; - int exec_reboot; - int reboot_called; - int XXX_cur_insttype; // deprecated - int plugin_api_version; // used to be XXX_insttype_changed, but that was deprecated - int silent; - int instdir_error; - int rtl; - int errlvl; - int alter_reg_view; - 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) static int __stdcall popstring(char *str) {