Skip to content

Commit d7e2a5e

Browse files
PierreRaybautPierreRaybaut
committed
Added missing NSIS plugin licences
1 parent da97342 commit d7e2a5e

File tree

2 files changed

+35
-33
lines changed

2 files changed

+35
-33
lines changed

‎nsis/include/EnumIni.nsh‎

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
@AUTHORS = Zinthose, Iceman_K
44
@REVISIONS = zenpoy[http://forums.winamp.com/member.php?u=401997]
55
@URL = http://nsis.sourceforge.net/mediawiki/index.php?title=Enumerate_INI
6+
@LICENSE = zlib/libpng License (https://nsis.sourceforge.io/License)
67
*/
78
!ifndef __EnumIni__
89
!define __EnumIni__
@@ -13,41 +14,41 @@
1314
!include "StrFunc.nsh"
1415
${StrLoc}
1516
!endif
16-
17+
1718
## Macro to remove leading and trailing whitespaces from a string.
18-
## Derived from the function originaly posted by Iceman_K at:
19+
## Derived from the function originaly posted by Iceman_K at:
1920
## http://nsis.sourceforge.net/Remove_leading_and_trailing_whitespaces_from_a_string
2021
!ifmacrondef _Trim
2122
!macro _Trim _UserVar _OriginalString
2223
!define Trim_UID ${__LINE__}
23-
24+
2425
Push $R1
2526
Push $R2
2627
Push `${_OriginalString}`
2728
Pop $R1
28-
29+
2930
Loop_${Trim_UID}:
3031
StrCpy $R2 "$R1" 1
3132
StrCmp "$R2" " " TrimLeft_${Trim_UID}
3233
StrCmp "$R2" "$\r" TrimLeft_${Trim_UID}
3334
StrCmp "$R2" "$\n" TrimLeft_${Trim_UID}
3435
StrCmp "$R2" "$\t" TrimLeft_${Trim_UID}
3536
GoTo Loop2_${Trim_UID}
36-
TrimLeft_${Trim_UID}:
37+
TrimLeft_${Trim_UID}:
3738
StrCpy $R1 "$R1" "" 1
3839
Goto Loop_${Trim_UID}
39-
40+
4041
Loop2_${Trim_UID}:
4142
StrCpy $R2 "$R1" 1 -1
4243
StrCmp "$R2" " " TrimRight_${Trim_UID}
4344
StrCmp "$R2" "$\r" TrimRight_${Trim_UID}
4445
StrCmp "$R2" "$\n" TrimRight_${Trim_UID}
4546
StrCmp "$R2" "$\t" TrimRight_${Trim_UID}
4647
GoTo Done_${Trim_UID}
47-
TrimRight_${Trim_UID}:
48+
TrimRight_${Trim_UID}:
4849
StrCpy $R1 "$R1" -1
4950
Goto Loop2_${Trim_UID}
50-
51+
5152
Done_${Trim_UID}:
5253
Pop $R2
5354
Exch $R1
@@ -60,21 +61,21 @@
6061
!define Trim `!insertmacro _Trim`
6162
!endif
6263
!endif
63-
64+
6465
## Global variable needed for indexing the enumerations
6566
!ifmacrondef EnumIni_IDX_VAR
6667
!macro EnumIni_IDX_VAR
6768
!ifndef EnumIni_IDX_VAR
6869
VAR /GLOBAL EnumIni_IDX_VAR
6970
!define EnumIni_IDX_VAR $EnumIni_IDX_VAR
7071
!endif
71-
!macroend
72+
!macroend
7273
!endif
73-
74+
7475
/* ## EnumIniKey ##
75-
Nearly identical in use to the builtin EnumRegKey function, the EnumIniKey macro
76+
Nearly identical in use to the builtin EnumRegKey function, the EnumIniKey macro
7677
allows for enumeration of an existing ini file's sections.
77-
78+
7879
## Example ##
7980
StrCpy $0 0
8081
loop:
@@ -89,18 +90,18 @@
8990
!macro _EnumIniKey _UserVar _IniFilePath _Index
9091
!define EnumIniKey_UID ${__LINE__}
9192
ClearErrors
92-
93+
9394
Push $R0
9495
Push $R1
95-
96+
9697
Push `${_IniFilePath}`
9798
Push `${_Index}`
98-
99+
99100
Pop $R1 ; ${_Index}
100101
Pop $R0 ; ${_IniFilePath}
101-
102+
102103
IfFileExists $R0 0 Else_IfFileExists_${EnumIniKey_UID}
103-
StrCpy $EnumIni_IDX_VAR -1
104+
StrCpy $EnumIni_IDX_VAR -1
104105
## PATCH Added to Correct 0 length file infinite loop issue discovered by zenpoy
105106
## [http://forums.winamp.com/member.php?u=401997] on January 9th 2012
106107
${LineSum} $R0 $R1
@@ -114,11 +115,11 @@
114115
StrCpy $R0 ''
115116
SetErrors
116117
EndIf_FileExists_${EnumIniKey_UID}:
117-
118+
118119
Pop $R1
119120
Exch $R0
120121
Pop ${_UserVar}
121-
122+
122123
!undef EnumIniKey_UID
123124
!macroend
124125
!ifndef EnumIniKey
@@ -129,7 +130,7 @@
129130
!verbose 0
130131
Function EnumIniKey_CALLBACK
131132
!insertmacro _Trim $R9 $R9
132-
133+
133134
StrCmp $R9 '' End
134135
StrCpy $R0 $R9 1
135136
StrCmp $R0 '[' 0 End
@@ -143,18 +144,18 @@
143144
Return
144145
End:
145146
StrCpy $R0 ''
146-
Push ''
147+
Push ''
147148
FunctionEnd
148149
!verbose pop
149150
!else
150151
!Error `An illegal attempt was made to insert the EnumIniValue_CALLBACK function outside the Global namespace!`
151152
!endif
152153
!endif
153-
154+
154155
/* ## EnumIniValue ##
155-
Nearly identical in use to the builtin EnumRegValue function, the EnumIniValue macro
156+
Nearly identical in use to the builtin EnumRegValue function, the EnumIniValue macro
156157
allows for enumeration of an existing ini file section.
157-
158+
158159
## Example ##
159160
StrCpy $0 0
160161
loop:
@@ -170,30 +171,30 @@
170171
!macro _EnumIniValue _UserVar _IniFilePath _Section _Index
171172
!define EnumIniValue_UID ${__LINE__}
172173
ClearErrors
173-
174+
174175
Push $R0
175176
Push $R1
176177
Push $R2
177178
Push $R3
178-
179+
179180
Push `${_IniFilePath}`
180181
Push `${_Section}`
181182
Push `${_Index}`
182-
183+
183184
Pop $R2 ; ${_Index}
184185
Pop $R1 ; ${_Section}
185186
Pop $R0 ; ${_IniFilePath}
186-
187+
187188
IfFileExists $R0 0 Else_IfFileExists_${EnumIniValue_UID}
188-
StrCpy $EnumIni_IDX_VAR -1
189+
StrCpy $EnumIni_IDX_VAR -1
189190
${LineFind} $R0 "/NUL" "1:-1" "EnumIniValue_CALLBACK"
190191
IfErrors Else_IfFileExists_${EnumIniValue_UID}
191192
Goto EndIf_FileExists_${EnumIniValue_UID}
192193
Else_IfFileExists_${EnumIniValue_UID}:
193194
StrCpy $R0 ''
194195
SetErrors
195196
EndIf_FileExists_${EnumIniValue_UID}:
196-
197+
197198
Pop $R3
198199
Pop $R2
199200
Pop $R1
@@ -209,7 +210,7 @@
209210
!verbose 0
210211
Function EnumIniValue_CALLBACK
211212
!insertmacro _Trim $R9 $R9
212-
213+
213214
StrCmp $R9 '' End
214215
StrCpy $R0 $R9 1
215216
StrCmp $R0 ';' End
@@ -229,7 +230,7 @@
229230
StrCpy $R3 $R9
230231
End:
231232
StrCpy $R0 ''
232-
Push ''
233+
Push ''
233234
FunctionEnd
234235
!verbose pop
235236
!else

‎nsis/include/UninstallExisting.nsh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
; https://nsis.sourceforge.io/Auto-uninstall_old_before_installing_new
2+
; License: zlib/libpng (https://nsis.sourceforge.io/License)
23

34
!include LogicLib.nsh
45

0 commit comments

Comments
 (0)