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

switch to plugin.h

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5832 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2008-12-12 17:18:43 +00:00
parent f6800c8052
commit 4ba8da04fd
14 changed files with 15 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Contrib/AdvSplash/advsplash.c
View file

@ -3,7 +3,7 @@
#include <windows.h> #include <windows.h>
#include <windowsx.h> #include <windowsx.h>
#include "../ExDLL/exdll.h" #include <plugin.h> // nsis plugin.h
HINSTANCE g_hInstance; HINSTANCE g_hInstance;

2
Contrib/Banner/Banner.c
View file

@ -1,5 +1,5 @@
#include <windows.h> #include <windows.h>
#include "../ExDLL/exdll.h" #include <plugin.h> // nsis plugin.h
#include "../../Source/exehead/resource.h" #include "../../Source/exehead/resource.h"
// Turn a pair of chars into a word // Turn a pair of chars into a word

2
Contrib/BgImage/BgImage.cpp
View file

@ -1,6 +1,6 @@
#include <windows.h> #include <windows.h>
#include <mmsystem.h> #include <mmsystem.h>
#include "../ExDLL/exdll.h" #include <plugin.h> // nsis plugin.h
#undef EXDLL_INIT #undef EXDLL_INIT

2
Contrib/Dialer/dialer.c
View file

@ -2,7 +2,7 @@
#include <windows.h> #include <windows.h>
#include <wininet.h> #include <wininet.h>
#include "../ExDLL/exdll.h" #include <plugin.h> // nsis plugin.h
#define NSISFunction(funcname) void __declspec(dllexport) funcname(HWND hwndParent, int string_size, char *variables, stack_t **stacktop, extra_parameters *extra) #define NSISFunction(funcname) void __declspec(dllexport) funcname(HWND hwndParent, int string_size, char *variables, stack_t **stacktop, extra_parameters *extra)

2
Contrib/ExDLL/exdll.c
View file

@ -1,5 +1,5 @@
#include <windows.h> #include <windows.h>
#include "exdll.h" #include <plugin.h> // nsis plugin.h
HINSTANCE g_hInstance; HINSTANCE g_hInstance;

16
Contrib/InstallOptions/InstallerOptions.cpp
View file

@ -14,9 +14,7 @@
#include "resource.h" #include "resource.h"
#include "shellapi.h" #include "shellapi.h"
#define popstring dontuseme #include <plugin.h> // nsis plugin.h
#include "../ExDLL/exdll.h"
#undef popstring
// Use for functions only called from one place to possibly reduce some code // 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 // size. Allows the source code to remain readable by leaving the function
@ -30,18 +28,6 @@
void *WINAPI MALLOC(int len) { return (void*)GlobalAlloc(GPTR,len); } void *WINAPI MALLOC(int len) { return (void*)GlobalAlloc(GPTR,len); }
void WINAPI FREE(void *d) { if (d) GlobalFree((HGLOBAL)d); } void WINAPI FREE(void *d) { if (d) GlobalFree((HGLOBAL)d); }
void WINAPI popstring(char *str)
{
if (g_stacktop && *g_stacktop)
{
stack_t *th = *g_stacktop;
*g_stacktop = th->next;
if (str)
lstrcpy(str, th->text);
FREE(th);
}
}
#define strcpy(x,y) lstrcpy(x,y) #define strcpy(x,y) lstrcpy(x,y)
//#define strncpy(x,y,z) lstrcpyn(x,y,z) //#define strncpy(x,y,z) lstrcpyn(x,y,z)
#define strdup(x) STRDUP(x) #define strdup(x) STRDUP(x)

2
Contrib/LangDLL/LangDLL.c
View file

@ -10,7 +10,7 @@
// LangDLL:LangDialog "Language Selection" "Choose a language" 2F French 1036 English 1033 12 Garamond // LangDLL:LangDialog "Language Selection" "Choose a language" 2F French 1036 English 1033 12 Garamond
#include "../ExDLL/exdll.h" #include <plugin.h> // nsis plugin.h
int myatoi(char *s); int myatoi(char *s);

2
Contrib/Library/TypeLib/TypeLib.cpp
View file

@ -6,7 +6,7 @@
*/ */
#include <windows.h> #include <windows.h>
#include "../../ExDLL/exdll.h" #include <plugin.h> // nsis plugin.h
#define NSISFunction(funcname) extern "C" void __declspec(dllexport) funcname(HWND hwndParent, int string_size, char *variables, stack_t **stacktop) #define NSISFunction(funcname) extern "C" void __declspec(dllexport) funcname(HWND hwndParent, int string_size, char *variables, stack_t **stacktop)

3
Contrib/NSISdl/nsisdl.cpp
View file

@ -25,7 +25,8 @@
#include "netinc.h" #include "netinc.h"
#include "util.h" #include "util.h"
#include "httpget.h" #include "httpget.h"
#include "../ExDLL/exdll.h"
#include <plugin.h> // nsis plugin.h
void *operator new( unsigned int num_bytes ) void *operator new( unsigned int num_bytes )
{ {

2
Contrib/Splash/splash.c
View file

@ -1,5 +1,5 @@
#include <windows.h> #include <windows.h>
#include "../ExDLL/exdll.h" #include <plugin.h> // nsis plugin.h
HINSTANCE g_hInstance; HINSTANCE g_hInstance;

2
Contrib/StartMenu/StartMenu.c
View file

@ -1,6 +1,6 @@
#include <windows.h> #include <windows.h>
#include <shlobj.h> #include <shlobj.h>
#include "../ExDLL/exdll.h" #include <plugin.h> // nsis plugin.h
#include "resource.h" #include "resource.h"
HINSTANCE g_hInstance; HINSTANCE g_hInstance;

2
Contrib/UserInfo/UserInfo.c
View file

@ -1,5 +1,5 @@
#include <windows.h> #include <windows.h>
#include "../ExDLL/exdll.h" #include <plugin.h> // nsis plugin.h
typedef BOOL (WINAPI*CHECKTOKENMEMBERSHIP)(HANDLE TokenHandle,PSID SidToCheck,PBOOL IsMember); typedef BOOL (WINAPI*CHECKTOKENMEMBERSHIP)(HANDLE TokenHandle,PSID SidToCheck,PBOOL IsMember);
CHECKTOKENMEMBERSHIP _CheckTokenMembership=NULL; CHECKTOKENMEMBERSHIP _CheckTokenMembership=NULL;

2
Contrib/VPatch/Source/Plugin/vpatchdll.c
View file

@ -25,9 +25,9 @@
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#include <plugin.h> // nsis plugin.h
#include "apply_patch.h" #include "apply_patch.h"
#include "checksum.h" #include "checksum.h"
#include "../../../ExDLL/exdll.h"
/* ------------------------ Plug-in code ------------------------- */ /* ------------------------ Plug-in code ------------------------- */

2
Contrib/nsExec/nsexec.c
View file

@ -21,7 +21,7 @@ freely, subject to the following restrictions:
#include <windows.h> #include <windows.h>
#include <commctrl.h> #include <commctrl.h>
#include <winnt.h> #include <winnt.h>
#include "../ExDLL/exdll.h" #include <plugin.h> // nsis plugin.h
#ifndef true #ifndef true
#define true TRUE #define true TRUE