deprecate SetPluginUnload and /NOUNLOAD
plug-ins are now responsible to keeping themselves loaded using the new api git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5855 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik
parent
d04cece9be
commit
5ac5b3f95b
24 changed files with 72 additions and 110 deletions
|
|
@ -746,7 +746,7 @@ RefreshShellIcons
|
|||
StrCmp $6 '' +2
|
||||
IntCmp $R6 $6 0 0 FileFunc_GetSize_findnext
|
||||
IntOp $R4 $R4 + 1
|
||||
System::Int64Op /NOUNLOAD $R3 + $R6
|
||||
System::Int64Op $R3 + $R6
|
||||
Pop $R3
|
||||
|
||||
FileFunc_GetSize_findnext:
|
||||
|
|
@ -756,7 +756,7 @@ RefreshShellIcons
|
|||
|
||||
FileFunc_GetSize_show:
|
||||
StrCmp $5$6 '' FileFunc_GetSize_nosize
|
||||
System::Int64Op /NOUNLOAD $R3 / $1
|
||||
System::Int64Op $R3 / $1
|
||||
Pop $9
|
||||
DetailPrint 'Size:$9 $2 Files:$R4 Folders:$R5'
|
||||
goto FileFunc_GetSize_subdir
|
||||
|
|
@ -910,13 +910,13 @@ RefreshShellIcons
|
|||
StrCpy $6 1073741824
|
||||
|
||||
FileFunc_DriveSpace_getspace:
|
||||
System::Call /NOUNLOAD 'kernel32::GetDiskFreeSpaceExA(t, *l, *l, *l)i(r0,.r2,.r3,.)'
|
||||
System::Call 'kernel32::GetDiskFreeSpaceExA(t, *l, *l, *l)i(r0,.r2,.r3,.)'
|
||||
|
||||
StrCmp $5 T 0 +3
|
||||
StrCpy $0 $3
|
||||
goto FileFunc_DriveSpace_getsize
|
||||
StrCmp $5 O 0 +4
|
||||
System::Int64Op /NOUNLOAD $3 - $2
|
||||
System::Int64Op $3 - $2
|
||||
Pop $0
|
||||
goto FileFunc_DriveSpace_getsize
|
||||
StrCmp $5 F 0 +2
|
||||
|
|
@ -968,9 +968,9 @@ RefreshShellIcons
|
|||
Push $8
|
||||
Push $9
|
||||
|
||||
System::Alloc /NOUNLOAD 1024
|
||||
System::Alloc 1024
|
||||
Pop $2
|
||||
System::Call /NOUNLOAD 'kernel32::GetLogicalDriveStringsA(i,i) i(1024, r2)'
|
||||
System::Call 'kernel32::GetLogicalDriveStringsA(i,i) i(1024, r2)'
|
||||
|
||||
StrCmp $0 ALL FileFunc_GetDrives_drivestring
|
||||
StrCmp $0 '' 0 FileFunc_GetDrives_typeset
|
||||
|
|
@ -1007,10 +1007,10 @@ RefreshShellIcons
|
|||
StrCpy $3 $2
|
||||
|
||||
FileFunc_GetDrives_enumok:
|
||||
System::Call /NOUNLOAD 'kernel32::lstrlenA(t) i(i r3) .r4'
|
||||
System::Call 'kernel32::lstrlenA(t) i(i r3) .r4'
|
||||
StrCmp $4$0 '0ALL' FileFunc_GetDrives_enumex
|
||||
StrCmp $4 0 FileFunc_GetDrives_typeset
|
||||
System::Call /NOUNLOAD 'kernel32::GetDriveTypeA(t) i(i r3) .r5'
|
||||
System::Call 'kernel32::GetDriveTypeA(t) i(i r3) .r5'
|
||||
|
||||
StrCmp $0 ALL +2
|
||||
StrCmp $5 $6 FileFunc_GetDrives_letter FileFunc_GetDrives_enumnext
|
||||
|
|
@ -1030,7 +1030,7 @@ RefreshShellIcons
|
|||
StrCpy $8 RAM
|
||||
|
||||
FileFunc_GetDrives_letter:
|
||||
System::Call /NOUNLOAD '*$3(&t1024 .r9)'
|
||||
System::Call '*$3(&t1024 .r9)'
|
||||
|
||||
Push $0
|
||||
Push $1
|
||||
|
|
@ -1110,23 +1110,23 @@ RefreshShellIcons
|
|||
|
||||
FileFunc_GetTime_getfile:
|
||||
IfFileExists $0 0 FileFunc_GetTime_error
|
||||
System::Call /NOUNLOAD '*(i,l,l,l,i,i,i,i,&t260,&t14) i .r6'
|
||||
System::Call /NOUNLOAD 'kernel32::FindFirstFileA(t,i)i(r0,r6) .r2'
|
||||
System::Call /NOUNLOAD 'kernel32::FindClose(i)i(r2)'
|
||||
System::Call '*(i,l,l,l,i,i,i,i,&t260,&t14) i .r6'
|
||||
System::Call 'kernel32::FindFirstFileA(t,i)i(r0,r6) .r2'
|
||||
System::Call 'kernel32::FindClose(i)i(r2)'
|
||||
|
||||
FileFunc_GetTime_gettime:
|
||||
System::Call /NOUNLOAD '*(&i2,&i2,&i2,&i2,&i2,&i2,&i2,&i2) i .r7'
|
||||
System::Call '*(&i2,&i2,&i2,&i2,&i2,&i2,&i2,&i2) i .r7'
|
||||
StrCmp $1 'L' 0 FileFunc_GetTime_systemtime
|
||||
System::Call /NOUNLOAD 'kernel32::GetLocalTime(i)i(r7)'
|
||||
System::Call 'kernel32::GetLocalTime(i)i(r7)'
|
||||
goto FileFunc_GetTime_convert
|
||||
FileFunc_GetTime_systemtime:
|
||||
StrCmp $1 'LS' 0 FileFunc_GetTime_filetime
|
||||
System::Call /NOUNLOAD 'kernel32::GetSystemTime(i)i(r7)'
|
||||
System::Call 'kernel32::GetSystemTime(i)i(r7)'
|
||||
goto FileFunc_GetTime_convert
|
||||
|
||||
FileFunc_GetTime_filetime:
|
||||
System::Call /NOUNLOAD '*$6(i,l,l,l,i,i,i,i,&t260,&t14)i(,.r4,.r3,.r2)'
|
||||
System::Free /NOUNLOAD $6
|
||||
System::Call '*$6(i,l,l,l,i,i,i,i,&t260,&t14)i(,.r4,.r3,.r2)'
|
||||
System::Free $6
|
||||
StrCmp $1 'A' 0 +3
|
||||
StrCpy $2 $3
|
||||
goto FileFunc_GetTime_tolocal
|
||||
|
|
@ -1144,12 +1144,12 @@ RefreshShellIcons
|
|||
goto FileFunc_GetTime_tosystem
|
||||
|
||||
FileFunc_GetTime_tolocal:
|
||||
System::Call /NOUNLOAD 'kernel32::FileTimeToLocalFileTime(*l,*l)i(r2,.r3)'
|
||||
System::Call 'kernel32::FileTimeToLocalFileTime(*l,*l)i(r2,.r3)'
|
||||
FileFunc_GetTime_tosystem:
|
||||
System::Call /NOUNLOAD 'kernel32::FileTimeToSystemTime(*l,i)i(r3,r7)'
|
||||
System::Call 'kernel32::FileTimeToSystemTime(*l,i)i(r3,r7)'
|
||||
|
||||
FileFunc_GetTime_convert:
|
||||
System::Call /NOUNLOAD '*$7(&i2,&i2,&i2,&i2,&i2,&i2,&i2,&i2)i(.r5,.r6,.r4,.r0,.r3,.r2,.r1,)'
|
||||
System::Call '*$7(&i2,&i2,&i2,&i2,&i2,&i2,&i2,&i2)i(.r5,.r6,.r4,.r0,.r3,.r2,.r1,)'
|
||||
System::Free $7
|
||||
|
||||
IntCmp $0 9 0 0 +2
|
||||
|
|
@ -1401,7 +1401,7 @@ RefreshShellIcons
|
|||
Push $0
|
||||
Push $1
|
||||
Push $2
|
||||
System::Call /NOUNLOAD 'kernel32::GetModuleFileNameA(i 0, t .r0, i 1024)'
|
||||
System::Call 'kernel32::GetModuleFileNameA(i 0, t .r0, i 1024)'
|
||||
System::Call 'kernel32::GetLongPathNameA(t r0, t .r1, i 1024)i .r2'
|
||||
StrCmp $2 error +2
|
||||
StrCpy $0 $1
|
||||
|
|
|
|||
|
|
@ -1044,15 +1044,15 @@ TrimNewLines
|
|||
FileSeek $3 0 END $6
|
||||
IntOp $6 $6 - $5
|
||||
|
||||
System::Alloc /NOUNLOAD $6
|
||||
System::Alloc $6
|
||||
Pop $0
|
||||
FileSeek $3 $5 SET
|
||||
System::Call /NOUNLOAD 'kernel32::ReadFile(i r3, i r0, i $6, t.,)'
|
||||
System::Call 'kernel32::ReadFile(i r3, i r0, i $6, t.,)'
|
||||
FileSeek $3 $4 SET
|
||||
StrCmp${_TEXTFUNC_S} $2 '' +2
|
||||
FileWrite $3 '$1$2$\r$\n'
|
||||
System::Call /NOUNLOAD 'kernel32::WriteFile(i r3, i r0, i $6, t.,)'
|
||||
System::Call /NOUNLOAD 'kernel32::SetEndOfFile(i r3)'
|
||||
System::Call 'kernel32::WriteFile(i r3, i r0, i $6, t.,)'
|
||||
System::Call 'kernel32::SetEndOfFile(i r3)'
|
||||
System::Free $0
|
||||
StrCmp${_TEXTFUNC_S} $2 '' +3
|
||||
StrCpy $0 CHANGED
|
||||
|
|
@ -1154,13 +1154,13 @@ TrimNewLines
|
|||
|
||||
FileOpen $2 $0 a
|
||||
FileSeek $2 0 END $3
|
||||
System::Alloc /NOUNLOAD $3
|
||||
System::Alloc $3
|
||||
Pop $4
|
||||
FileSeek $2 0 SET
|
||||
System::Call /NOUNLOAD 'kernel32::ReadFile(i r2, i r4, i $3, t.,)'
|
||||
System::Call /NOUNLOAD 'user32::$1Buff(i r4, i r4, i $3)'
|
||||
System::Call 'kernel32::ReadFile(i r2, i r4, i $3, t.,)'
|
||||
System::Call 'user32::$1Buff(i r4, i r4, i $3)'
|
||||
FileSeek $2 0 SET
|
||||
System::Call /NOUNLOAD 'kernel32::WriteFile(i r2, i r4, i $3, t.,)'
|
||||
System::Call 'kernel32::WriteFile(i r2, i r4, i $3, t.,)'
|
||||
System::Free $4
|
||||
FileClose $2
|
||||
goto TextFunc_FileRecode_end
|
||||
|
|
|
|||
|
|
@ -175,8 +175,8 @@
|
|||
|
||||
!macro __WinVer_Call_GetVersionEx STRUCT_SIZE
|
||||
|
||||
System::Call /NoUnload '*$0(i ${STRUCT_SIZE})'
|
||||
System::Call /NoUnload kernel32::GetVersionEx(ir0)i.r3
|
||||
System::Call '*$0(i ${STRUCT_SIZE})'
|
||||
System::Call kernel32::GetVersionEx(ir0)i.r3
|
||||
|
||||
!macroend
|
||||
|
||||
|
|
@ -199,7 +199,7 @@
|
|||
Push $R0 ;temp
|
||||
|
||||
# allocate memory
|
||||
System::Alloc /NoUnload ${OSVERSIONINFOEXA_SIZE}
|
||||
System::Alloc ${OSVERSIONINFOEXA_SIZE}
|
||||
Pop $0
|
||||
|
||||
# use OSVERSIONINFOEX
|
||||
|
|
@ -211,7 +211,7 @@
|
|||
_winver_ex:
|
||||
|
||||
# get results from struct
|
||||
System::Call /NoUnload '*$0(i.s,i.r1,i.r2,i.r3,i.s,&t128.s,&i2.s,&i2,&i2,&i1.s,&i1)'
|
||||
System::Call '*$0(i.s,i.r1,i.r2,i.r3,i.s,&t128.s,&i2.s,&i2,&i2,&i1.s,&i1)'
|
||||
|
||||
# free struct
|
||||
System::Free $0
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue