Import Upstream version 2.35

2 files changed, 230 insertions, 230 deletions

diff --git a/Source/Tests/preprocessor.nsi b/Source/Tests/preprocessor.nsi
index 9f25c9b..751fdce 100755
--- a/Source/Tests/preprocessor.nsi
+++ b/Source/Tests/preprocessor.nsi
@@ -1,224 +1,224 @@
-!ifndef file_is_included
-!define file_is_included
-
-Name preprocessor
-OutFile preprocessor.exe
-
-!ifdef some_define_that_doesnt_exist
-this should not be executed, so no error should be raised
-/*
-code inside comments should not be executed
-!ifdef
-*/
-# invalid preprocessor should be ignored
-!hello
-!endif
-
-!ifdef d1
-!error "d1 is not defined!"
-!else ifdef d2
-!error "d2 is not defined!"
-!else
-# this should be compiled
-!endif
-
-!define d1
-
-!ifdef d1
-# this should be compiled
-!else ifdef d2
-!error "d2 is not defined!"
-!else
-!error "d1 is defined!"
-!endif
-
-!undef d1
-!define d2
-
-!ifdef d1
-!error "d1 is not defined!"
-!else ifdef d2
-# this should be compiled
-!else
-!error "d2 is defined!"
-!endif
-
-!ifdef some_define_that_doesnt_exist
-the next !endif should be part of this line\
-!endif
-!\
-e\
-n\
-d\
-i\
-f
-
-!if 0
-/*
-this shouldn't be compiled
-!endif
-*/
-!endif
-
-# tests for !if statement
-!if 'test' == 'test'
- !if 1 <= 2
-  !if ! 100 < 99.99
-   !if 2.2 > 1.12
-    !if ! 23 >= 37
-     !if 1 && 1
-      !if ! 0 || 0
-
-        # this should be compiled
-
-      !else
-       !error "!if ! 0 || 0 is true!"
-      !endif
-     !else
-      !error "!if 1 && 1 is true!"
-     !endif
-    !else
-     !error "!if ! 23 >= 37 is true!"
-    !endif
-   !else
-    !error "!if 2.2 > 1.12 is true!"
-   !endif
-  !else
-   !error "!if ! 100 < 99.99 is true!"
-  !endif
- !else
-  !error "!if 1 <= 2 is true!"
- !endif
-!else
- !error "!if 'test' == 'test' is true!"
-!endif
-
-; testing of two math functions and a macro hack :)
-!define increase "!insertmacro increase"
-!macro increase DEFINE
-  !define /math ${DEFINE}_MACROTEMP ${${DEFINE}} + 1
-  !undef ${DEFINE}
-  !define ${DEFINE} ${${DEFINE}_MACROTEMP}
-  !undef ${DEFINE}_MACROTEMP
-!macroend
-
-!define number1 1 #  1
-!define /math number2 2 + 3
-!define /math number3 ${number2} - ${number1}
-${increase} number3
-!define /math number4 2 * ${number3}
-!define /math number5 ${number4} % 3
-
-!if ${number1} != 1
-  !error "number1 != 1"
-!endif
-
-!if ${number2} != 5
-  !error "number2 != 5"
-!endif
-
-!if ${number3} != 5
-  !error "number3 != 5"
-!endif
-
-!if ${number4} != 10
-  !error "number4 != 10"
-!endif
-
-!if ${number5} != 1
-  !error "number5 != 1"
-!endif
-
-; end math functions
-
-# this should just give a warning, not an error
-!include /NONFATAL file_that_doesnt_exist.nsh
-
-# this should include this file just one time.
-!include preprocessor.nsi
-
-Section
-Return
-WriteUninstaller uninst.exe # avoid warning
-SectionEnd
-
-# test scopes
-
-!macro TEST_SCOPE scope def should_exist
-
-  !if ${should_exist} == y
-    !ifndef ${def}
-      !error "${def} not defined in ${scope} scope"
-    !endif
-  !else
-    !ifdef ${def}
-      !error "${def} defined in ${scope} scope"
-    !endif
-  !endif
-
-!macroend
-
-!macro TEST_SCOPES scope global section function pageex uninstall
-
-  !insertmacro TEST_SCOPE "${scope}" __GLOBAL__    ${global}
-  !insertmacro TEST_SCOPE "${scope}" __SECTION__   ${section}
-  !insertmacro TEST_SCOPE "${scope}" __FUNCTION__  ${function}
-  !insertmacro TEST_SCOPE "${scope}" __PAGEEX__    ${pageex}
-  !insertmacro TEST_SCOPE "${scope}" __UNINSTALL__ ${uninstall}
-
-!macroend
-
-!insertmacro TEST_SCOPES "global" y n n n n
-
-Section test
-!insertmacro TEST_SCOPES "section" n y n n n
-!if ${__SECTION__} != test
-  !error "invalid __SECTION__ value"
-!endif
-SectionEnd
-
-Section un.test
-!insertmacro TEST_SCOPES "uninstall section" n y n n y
-!if ${__SECTION__} != test
-  !error "invalid __SECTION__ value"
-!endif
-SectionEnd
-
-Function test
-Call test # avoid warning
-!insertmacro TEST_SCOPES "function" n n y n n
-!if ${__FUNCTION__} != test
-  !error "invalid __FUNCTION__ value"
-!endif
-FunctionEnd
-
-Function un.test
-Call un.test # avoid warning
-!insertmacro TEST_SCOPES "uninstall function" n n y n y
-!if ${__FUNCTION__} != test
-  !error "invalid __FUNCTION__ value"
-!endif
-FunctionEnd
-
-PageEx instfiles
-!insertmacro TEST_SCOPES "pageex" n n n y n
-!if ${__PAGEEX__} != instfiles
-  !error "invalid __PAGEEX__ value"
-!endif
-PageExEnd
-
-PageEx un.instfiles
-!insertmacro TEST_SCOPES "uninstall pageex" n n n y y
-!if ${__PAGEEX__} != instfiles
-  !error "invalid __PAGEEX__ value"
-!endif
-PageExEnd
-
-!insertmacro TEST_SCOPES "global" y n n n n
-
-!else
-
-# this should just give a warning, not an error
-!include /NONFATAL another_file_that_doesnt_exist.nsh
-
-!endif
+!ifndef file_is_included

+!define file_is_included

+

+Name preprocessor

+OutFile preprocessor.exe

+

+!ifdef some_define_that_doesnt_exist

+this should not be executed, so no error should be raised

+/*

+code inside comments should not be executed

+!ifdef

+*/

+# invalid preprocessor should be ignored

+!hello

+!endif

+

+!ifdef d1

+!error "d1 is not defined!"

+!else ifdef d2

+!error "d2 is not defined!"

+!else

+# this should be compiled

+!endif

+

+!define d1

+

+!ifdef d1

+# this should be compiled

+!else ifdef d2

+!error "d2 is not defined!"

+!else

+!error "d1 is defined!"

+!endif

+

+!undef d1

+!define d2

+

+!ifdef d1

+!error "d1 is not defined!"

+!else ifdef d2

+# this should be compiled

+!else

+!error "d2 is defined!"

+!endif

+

+!ifdef some_define_that_doesnt_exist

+the next !endif should be part of this line\

+!endif

+!\

+e\

+n\

+d\

+i\

+f

+

+!if 0

+/*

+this shouldn't be compiled

+!endif

+*/

+!endif

+

+# tests for !if statement

+!if 'test' == 'test'

+ !if 1 <= 2

+  !if ! 100 < 99.99

+   !if 2.2 > 1.12

+    !if ! 23 >= 37

+     !if 1 && 1

+      !if ! 0 || 0

+

+        # this should be compiled

+

+      !else

+       !error "!if ! 0 || 0 is true!"

+      !endif

+     !else

+      !error "!if 1 && 1 is true!"

+     !endif

+    !else

+     !error "!if ! 23 >= 37 is true!"

+    !endif

+   !else

+    !error "!if 2.2 > 1.12 is true!"

+   !endif

+  !else

+   !error "!if ! 100 < 99.99 is true!"

+  !endif

+ !else

+  !error "!if 1 <= 2 is true!"

+ !endif

+!else

+ !error "!if 'test' == 'test' is true!"

+!endif

+

+; testing of two math functions and a macro hack :)

+!define increase "!insertmacro increase"

+!macro increase DEFINE

+  !define /math ${DEFINE}_MACROTEMP ${${DEFINE}} + 1

+  !undef ${DEFINE}

+  !define ${DEFINE} ${${DEFINE}_MACROTEMP}

+  !undef ${DEFINE}_MACROTEMP

+!macroend

+

+!define number1 1 #  1

+!define /math number2 2 + 3

+!define /math number3 ${number2} - ${number1}

+${increase} number3

+!define /math number4 2 * ${number3}

+!define /math number5 ${number4} % 3

+

+!if ${number1} != 1

+  !error "number1 != 1"

+!endif

+

+!if ${number2} != 5

+  !error "number2 != 5"

+!endif

+

+!if ${number3} != 5

+  !error "number3 != 5"

+!endif

+

+!if ${number4} != 10

+  !error "number4 != 10"

+!endif

+

+!if ${number5} != 1

+  !error "number5 != 1"

+!endif

+

+; end math functions

+

+# this should just give a warning, not an error

+!include /NONFATAL file_that_doesnt_exist.nsh

+

+# this should include this file just one time.

+!include preprocessor.nsi

+

+Section

+Return

+WriteUninstaller uninst.exe # avoid warning

+SectionEnd

+

+# test scopes

+

+!macro TEST_SCOPE scope def should_exist

+

+  !if ${should_exist} == y

+    !ifndef ${def}

+      !error "${def} not defined in ${scope} scope"

+    !endif

+  !else

+    !ifdef ${def}

+      !error "${def} defined in ${scope} scope"

+    !endif

+  !endif

+

+!macroend

+

+!macro TEST_SCOPES scope global section function pageex uninstall

+

+  !insertmacro TEST_SCOPE "${scope}" __GLOBAL__    ${global}

+  !insertmacro TEST_SCOPE "${scope}" __SECTION__   ${section}

+  !insertmacro TEST_SCOPE "${scope}" __FUNCTION__  ${function}

+  !insertmacro TEST_SCOPE "${scope}" __PAGEEX__    ${pageex}

+  !insertmacro TEST_SCOPE "${scope}" __UNINSTALL__ ${uninstall}

+

+!macroend

+

+!insertmacro TEST_SCOPES "global" y n n n n

+

+Section test

+!insertmacro TEST_SCOPES "section" n y n n n

+!if ${__SECTION__} != test

+  !error "invalid __SECTION__ value"

+!endif

+SectionEnd

+

+Section un.test

+!insertmacro TEST_SCOPES "uninstall section" n y n n y

+!if ${__SECTION__} != test

+  !error "invalid __SECTION__ value"

+!endif

+SectionEnd

+

+Function test

+Call test # avoid warning

+!insertmacro TEST_SCOPES "function" n n y n n

+!if ${__FUNCTION__} != test

+  !error "invalid __FUNCTION__ value"

+!endif

+FunctionEnd

+

+Function un.test

+Call un.test # avoid warning

+!insertmacro TEST_SCOPES "uninstall function" n n y n y

+!if ${__FUNCTION__} != test

+  !error "invalid __FUNCTION__ value"

+!endif

+FunctionEnd

+

+PageEx instfiles

+!insertmacro TEST_SCOPES "pageex" n n n y n

+!if ${__PAGEEX__} != instfiles

+  !error "invalid __PAGEEX__ value"

+!endif

+PageExEnd

+

+PageEx un.instfiles

+!insertmacro TEST_SCOPES "uninstall pageex" n n n y y

+!if ${__PAGEEX__} != instfiles

+  !error "invalid __PAGEEX__ value"

+!endif

+PageExEnd

+

+!insertmacro TEST_SCOPES "global" y n n n n

+

+!else

+

+# this should just give a warning, not an error

+!include /NONFATAL another_file_that_doesnt_exist.nsh

+

+!endif

diff --git a/Source/Tests/root.txt b/Source/Tests/root.txt
index 3e09f16..e3629ef 100755
--- a/Source/Tests/root.txt
+++ b/Source/Tests/root.txt
@@ -1,6 +1,6 @@
-this is a list of bugs related to root directories, which can not yet be tested automatically
-
-* bug #1331292 - browsing for root network directory disables next button
-
-* root with space after it, without AllowRootDirInstall
-  http://forums.winamp.com/showthread.php?threadid=222727
+this is a list of bugs related to root directories, which can not yet be tested automatically

+

+* bug #1331292 - browsing for root network directory disables next button

+

+* root with space after it, without AllowRootDirInstall

+  http://forums.winamp.com/showthread.php?threadid=222727