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

applied patch #1164307 - Fixes to allow building Contrib/ on debian (minus Makefiles)

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3923 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2005-03-17 21:26:59 +00:00
parent 38b94f19a5
commit ccf2bb96a5
15 changed files with 29 additions and 29 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 "../ExDLL/exdll.h"
HINSTANCE g_hInstance; HINSTANCE g_hInstance;

4
Contrib/Banner/Banner.c
View file

@ -1,5 +1,5 @@
#include <windows.h> #include <windows.h>
#include "../exdll/exdll.h" #include "../ExDLL/exdll.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
@ -168,4 +168,4 @@ unsigned int myatoi(char *s)
v+=c; v+=c;
} }
return v; return v;
} }

8
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 "../ExDLL/exdll.h"
#undef EXDLL_INIT #undef EXDLL_INIT
@ -648,4 +648,4 @@ BOOL WINAPI DllMain(HINSTANCE hInst, ULONG ul_reason_for_call, LPVOID lpReserved
break; break;
} }
return TRUE; return TRUE;
} }

6
Contrib/Dialer/dialer.c
View file

@ -1,8 +1,8 @@
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#include <WinInet.h> #include <wininet.h>
#include "../exdll/exdll.h" #include "../ExDLL/exdll.h"
#define NSISFunction(funcname) void __declspec(dllexport) funcname(HWND hwndParent, int string_size, char *variables, stack_t **stacktop) #define NSISFunction(funcname) void __declspec(dllexport) funcname(HWND hwndParent, int string_size, char *variables, stack_t **stacktop)
@ -57,4 +57,4 @@ NSISFunction(AutodialHangup) {
else else
pushstring("failure"); pushstring("failure");
} }

4
Contrib/InstallOptions/InstallerOptions.cpp
View file

@ -12,10 +12,10 @@
#include <commdlg.h> #include <commdlg.h>
#include <cderr.h> #include <cderr.h>
#include "resource.h" #include "resource.h"
#include "Shellapi.h" #include "shellapi.h"
#define popstring dontuseme #define popstring dontuseme
#include "../exdll/exdll.h" #include "../ExDLL/exdll.h"
#undef popstring #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

4
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 "../ExDLL/exdll.h"
int myatoi(char *s); int myatoi(char *s);
@ -160,4 +160,4 @@ int myatoi(char *s)
v+=c; v+=c;
} }
return (int)v; return (int)v;
} }

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

@ -6,7 +6,7 @@
*/ */
#include <windows.h> #include <windows.h>
#include "../../exdll/exdll.h" #include "../../ExDLL/exdll.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)
@ -120,4 +120,4 @@ NSISFunction(GetLibVersion) {
} }
} }

2
Contrib/Makensisw/makensisw.cpp
View file

@ -21,7 +21,7 @@
#define MAKENSISW_CPP #define MAKENSISW_CPP
#include <windows.h> #include <windows.h>
#include <WindowsX.h> #include <windowsx.h>
#include <stdio.h> #include <stdio.h>
#include "makensisw.h" #include "makensisw.h"
#include "resource.h" #include "resource.h"

2
Contrib/NSISdl/nsisdl.cpp
View file

@ -25,7 +25,7 @@
#include "netinc.h" #include "netinc.h"
#include "util.h" #include "util.h"
#include "httpget.h" #include "httpget.h"
#include "../exdll/exdll.h" #include "../ExDLL/exdll.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 "../ExDLL/exdll.h"
HINSTANCE g_hInstance; HINSTANCE g_hInstance;

4
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 "../ExDLL/exdll.h"
#include "resource.h" #include "resource.h"
HINSTANCE g_hInstance; HINSTANCE g_hInstance;
@ -433,4 +433,4 @@ void AddFolderFromReg(int nFolder)
} while (FindNextFile(hSearch, &FileData)); } while (FindNextFile(hSearch, &FileData));
FindClose(hSearch); FindClose(hSearch);
} }
} }

6
Contrib/UIs/UI Holder/ui.cpp
View file

@ -1,8 +1,8 @@
// ui.cpp : Defines the entry point for the application. // ui.cpp : Defines the entry point for the application.
// //
#include <Windows.h> #include <windows.h>
#include <CommCtrl.h> #include <commctrl.h>
#include "resource.h" #include "resource.h"
HINSTANCE g_hInstance; HINSTANCE g_hInstance;
@ -95,4 +95,4 @@ int APIENTRY WinMain(HINSTANCE hInstance,
ExitProcess(0); ExitProcess(0);
return 0; return 0;
} }

2
Contrib/UserInfo/UserInfo.c
View file

@ -1,5 +1,5 @@
#include <windows.h> #include <windows.h>
#include "..\exdll\exdll.h" #include "../ExDLL/exdll.h"
void __declspec(dllexport) GetName(HWND hwndParent, int string_size, void __declspec(dllexport) GetName(HWND hwndParent, int string_size,
char *variables, stack_t **stacktop) char *variables, stack_t **stacktop)

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

@ -1,6 +1,6 @@
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#include "..\..\..\ExDLL\exdll.h" #include "../../../ExDLL/exdll.h"
int DoPatch(HANDLE hPatch, HANDLE hSource, HANDLE hDest); int DoPatch(HANDLE hPatch, HANDLE hSource, HANDLE hDest);
void strcopy(char *tgt, const char *src); void strcopy(char *tgt, const char *src);
@ -107,7 +107,7 @@ BOOL WINAPI DllMain(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved)
UINT CRCTable[256]; UINT CRCTable[256];
BOOL bInitCRC = FALSE; BOOL bInitCRC = FALSE;
_inline void InitCRC() { inline void InitCRC() {
int i, j; unsigned long c; int i, j; unsigned long c;
for (c = i = 0; i < 256; c = ++i) { for (c = i = 0; i < 256; c = ++i) {
for (j = 0; j < 8; j++) { for (j = 0; j < 8; j++) {

4
Contrib/nsExec/nsexec.c
View file

@ -20,8 +20,8 @@ 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 "../ExDLL/exdll.h"
#ifndef true #ifndef true
#define true TRUE #define true TRUE