@@ -1,3 +1,6 @@ +!ifndef GET_EXECUTABLE_PATH_NSH +!define GET_EXECUTABLE_PATH_NSH + Function GetExecutablePath exch $0 ; Execution string - Top element in stack is now what ever value $0 had before push $R0 @@ -54,4 +57,6 @@ FunctionEnd Pop "${Var}" !macroend -!define ExePath "!insertmacro ExePath" \ No newline at end of file +!define ExePath "!insertmacro ExePath" + +!endif \ No newline at end of file GetExecutablePath.nsh @@ -1,3 +1,6 @@ +!ifndef GET_IN_QUOTES_NSH +!define GET_IN_QUOTES_NSH + ; Push 'a string containing "quotes"!' ; Call GetInQuotes ; Pop $R0 ; = quotes @@ -38,4 +41,6 @@ Pop $R3 Pop $R2 Pop $R1 Exch $R0 -FunctionEnd \ No newline at end of file +FunctionEnd + +!endif \ No newline at end of file GetInQuotes.nsh @@ -1,3 +1,5 @@ +!ifndef INDEX_OF_NSH +!define INDEX_OF_NSH ; IndexOf & RIndexOf: Find index of character in string ; ----------------------------------------------------- ; @@ -75,4 +77,5 @@ FunctionEnd Pop "${Var}" !macroend -!define RIndexOf "!insertmacro RIndexOf" \ No newline at end of file +!define RIndexOf "!insertmacro RIndexOf" +!endif \ No newline at end of file IndexOf.nsh @@ -152,10 +152,6 @@ Function .onInit StrCpy $whereprofiles "default" !endif - !ifndef PAGE_SEC_CORE - ;SetRebootFlag true - !endif - UserInfo::GetName Pop $username ClearErrors ; UserInfo might genrate an error, but we don't care @@ -391,22 +387,22 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${SecConfigEvars} $(DESC_SecConfigEvars) !insertmacro MUI_FUNCTION_DESCRIPTION_END +!include FinishPage.nsh +!include Kill.nsh +!include ieversion.nsh + !ifdef PAGE_DIRECTORY !include BadPathsCheck.nsh !endif !ifdef PAGE_CONFIG_EVARS - !ifndef PAGE_SEC_CORE - !include GetInQuotes.nsh - !include IndexOf.nsh - !include GetExecutablePath.nsh - !endif + !include GetInQuotes.nsh + !include IndexOf.nsh + !include GetExecutablePath.nsh !include Evars.nsh !endif -!include FinishPage.nsh !ifdef PAGE_HOW_LS !include GetWindowsVersion.nsh !endif -!include Kill.nsh !ifdef PAGE_SEC_CORE !include Shell9x.nsh !include ShellNT.nsh @@ -416,12 +412,9 @@ SectionEnd !ifdef WRITE_UNINSTALLER !include uninstShell9x.nsh !endif -!include ieversion.nsh !ifdef PAGE_FILE_ASSOC !include RegisterExtension.nsh - !ifndef PAGE_SEC_CORE - !include refreshShellIcons.nsh - !endif + !include refreshShellIcons.nsh !endif !ifdef PAGE_WHERE_PROFILES !include SetFocus.nsh LOSI.nsi @@ -1,3 +1,6 @@ +!ifndef REFRESH_SHELL_ICONS_NSH +!define REFRESH_SHELL_ICONS_NSH + !define SHCNE_ASSOCCHANGED 0x08000000 !define SHCNF_IDLIST 0 @@ -5,4 +8,6 @@ Function RefreshShellIcons ; By jerome tremblay - april 2003 System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v \ (${SHCNE_ASSOCCHANGED}, ${SHCNF_IDLIST}, 0, 0)' -FunctionEnd \ No newline at end of file +FunctionEnd + +!endif \ No newline at end of file refreshShellIcons.nsh 2dd78cdc9b45ca58b4fdbb4c1fe36363b597b30d Tobbe Lundberg tobbesweden@gmail.com http://github.com/Tobbe/losi/commit/2d4434cee71e8fe75a6eb346c315db8d1f7bccc3 2d4434cee71e8fe75a6eb346c315db8d1f7bccc3 2008-05-29T07:42:32-07:00 2008-05-29T07:42:32-07:00 Added C-style ifndef/define/endif to a few header files to make the code in LOSI.nsi more straight forward 2b9584d15f910a5be8db167132ce322c07b1f5a9 Tobbe Lundberg tobbesweden@gmail.com