diff --git a/Contrib/System/Source/Call.S b/Contrib/System/Source/Call.S index e9645031..a6e74a9c 100644 --- a/Contrib/System/Source/Call.S +++ b/Contrib/System/Source/Call.S @@ -1,4 +1,5 @@ ;# Copyright (c) 2008 Thomas Gaugler +;# Copyright (c) 2008-2015 NSIS Contributors ;# ;# Permission is hereby granted, free of charge, to any person ;# obtaining a copy of this software and associated documentation diff --git a/Contrib/System/System.html b/Contrib/System/System.html index fa0753e4..f7f75c64 100644 --- a/Contrib/System/System.html +++ b/Contrib/System/System.html @@ -6,7 +6,9 @@

NSIS System Plug-in

-

© brainsucker (Nik Medved), 2002

+

+Copyright © 2002 brainsucker (Nik Medved)
Copyright © 2002-2015 NSIS Contributors +

Table of Contents

diff --git a/Include/Win/WinDef.nsh b/Include/Win/WinDef.nsh index 4333e505..1fcb51b5 100644 --- a/Include/Win/WinDef.nsh +++ b/Include/Win/WinDef.nsh @@ -58,7 +58,7 @@ IntOp ${_tmpvar} "${_whi}" << 16 IntOp ${_outvar} ${_outvar} | ${_tmpvar} !macroend !define MAKELONG "!insertmacro _Win_MAKELONG32 " -!if "${__WIN_PTRSIZE}" <= 4 +!if "${NSIS_PTR_SIZE}" <= 4 !define MAKEWPARAM "${MAKELONG}" !define MAKELPARAM "${MAKELONG}" !define MAKELRESULT "${MAKELONG}" diff --git a/Include/Win/WinUser.nsh b/Include/Win/WinUser.nsh index c1bc1e81..50a9921c 100644 --- a/Include/Win/WinUser.nsh +++ b/Include/Win/WinUser.nsh @@ -95,8 +95,8 @@ !define /ifndef GWLP_USERDATA -21 !define /ifndef GWLP_ID -12 !define DWLP_MSGRESULT 0 -!define /math DWLP_DLGPROC ${DWLP_MSGRESULT} + ${__WIN_PTRSIZE} ;DWLP_MSGRESULT + sizeof(LRESULT) -!define /math DWLP_USER ${DWLP_DLGPROC} + ${__WIN_PTRSIZE} ;DWLP_DLGPROC + sizeof(DLGPROC) +!define /math DWLP_DLGPROC ${DWLP_MSGRESULT} + ${NSIS_PTR_SIZE} ;DWLP_MSGRESULT + sizeof(LRESULT) +!define /math DWLP_USER ${DWLP_DLGPROC} + ${NSIS_PTR_SIZE} ;DWLP_DLGPROC + sizeof(DLGPROC) !endif !ifndef __WIN_MS_NONCMESSAGES diff --git a/Include/WinCore.nsh b/Include/WinCore.nsh index 14a9fd53..b062b506 100644 --- a/Include/WinCore.nsh +++ b/Include/WinCore.nsh @@ -13,8 +13,6 @@ WinCore.nsh & Win\*.nsh - Collection of common windows defines !verbose 3 -!define __WIN_PTRSIZE 4 ;will we ever see a 64 bit version? - !include Win\WinDef.nsh !include Win\WinError.nsh diff --git a/Source/DialogTemplate.cpp b/Source/DialogTemplate.cpp index 910f9385..8f008141 100644 --- a/Source/DialogTemplate.cpp +++ b/Source/DialogTemplate.cpp @@ -3,7 +3,7 @@ * * This file is a part of NSIS. * - * Copyright (C) 2002 Amir Szekely + * Copyright (C) 2002-2015 Amir Szekely and Contributors * * Licensed under the zlib/libpng license (the "License"); * you may not use this file except in compliance with the License. diff --git a/Source/DialogTemplate.h b/Source/DialogTemplate.h index ab59236b..b15ae38d 100644 --- a/Source/DialogTemplate.h +++ b/Source/DialogTemplate.h @@ -3,7 +3,7 @@ * * This file is a part of NSIS. * - * Copyright (C) 2002 Amir Szekely + * Copyright (C) 2002-2015 Amir Szekely and Contributors * * Licensed under the zlib/libpng license (the "License"); * you may not use this file except in compliance with the License. diff --git a/Source/ShConstants.h b/Source/ShConstants.h index e73ea1a5..dd62914a 100644 --- a/Source/ShConstants.h +++ b/Source/ShConstants.h @@ -4,6 +4,7 @@ * This file is a part of NSIS. * * Copyright (C) 2003 Ramon + * Copyright (C) 2003-2015 NSIS Contributors * * Licensed under the zlib/libpng license (the "License"); * you may not use this file except in compliance with the License. diff --git a/Source/icon.cpp b/Source/icon.cpp index 48522457..834d2269 100644 --- a/Source/icon.cpp +++ b/Source/icon.cpp @@ -1,4 +1,19 @@ -// Unicode support by Jim Park -- 11/16/2007 +/* + * icon.cpp + * + * This file is a part of NSIS. + * + * Copyright (C) 1999-2015 Nullsoft and Contributors + * + * Licensed under the zlib/libpng license (the "License"); + * you may not use this file except in compliance with the License. + * + * Licence details can be found in the file COPYING. + * + * This software is provided 'as-is', without any express or implied + * warranty. + */ + #include "Platform.h" #include "icon.h" diff --git a/Source/uservars.h b/Source/uservars.h index 2c45efc9..1e611036 100644 --- a/Source/uservars.h +++ b/Source/uservars.h @@ -4,6 +4,7 @@ * This file is a part of NSIS. * * Copyright (C) 2003 Ramon + * Copyright (C) 2003-2015 NSIS Contributors * * Licensed under the zlib/libpng license (the "License"); * you may not use this file except in compliance with the License.