wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 801853. r=rstrong

Browse Source
This commit is contained in:
Brian R. Bondy 2012-10-25 22:07:04 -04:00
parent 21bae2dc23
commit 6a5c2170f7
5 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/installer/windows/nsis/installer.nsi
View File

@ -1031,6 +1031,10 @@ FunctionEnd
# Initialization Functions
Function .onInit
; Remove the current exe directory from the search order.
; This only effects LoadLibrary calls and not implicitly loaded DLLs.
System::Call 'kernel32::SetDllDirectoryW(w "")'
StrCpy $PageName ""
StrCpy $LANGUAGE 0
${SetBrandNameVars} "$EXEDIR\core\distribution\setup.ini"

9
browser/installer/windows/nsis/maintenanceservice_installer.nsi
View File

@ -106,7 +106,12 @@ ShowUnInstDetails nevershow
BrandingText " "
Function .onInit
; Remove the current exe directory from the search order.
; This only effects LoadLibrary calls and not implicitly loaded DLLs.
System::Call 'kernel32::SetDllDirectoryW(w "")'
SetSilent silent
!ifdef HAVE_64BIT_OS
; We plan to eventually enable 64bit native builds to use the maintenance
; service, but for the initial release, to reduce testing and development,
@ -123,6 +128,10 @@ Function .onInit
FunctionEnd
Function un.onInit
; Remove the current exe directory from the search order.
; This only effects LoadLibrary calls and not implicitly loaded DLLs.
System::Call 'kernel32::SetDllDirectoryW(w "")'
StrCpy $BrandFullNameDA "${MaintFullName}"
StrCpy $BrandFullName "${MaintFullName}"
FunctionEnd

4
browser/installer/windows/nsis/stub.nsi
View File

@ -183,6 +183,10 @@ Page custom createOptions leaveOptions ; Options page
Page custom createInstall leaveInstall ; Download / Installation page
Function .onInit
; Remove the current exe directory from the search order.
; This only effects LoadLibrary calls and not implicitly loaded DLLs.
System::Call 'kernel32::SetDllDirectoryW(w "")'
StrCpy $LANGUAGE 0
; This macro is used to set the brand name variables but the ini file method
; isn't supported for the stub installer.

8
browser/installer/windows/nsis/uninstaller.nsi
View File

@ -666,6 +666,10 @@ FunctionEnd
# Initialization Functions
Function .onInit
; Remove the current exe directory from the search order.
; This only effects LoadLibrary calls and not implicitly loaded DLLs.
System::Call 'kernel32::SetDllDirectoryW(w "")'
; We need this set up for most of the helper.exe operations.
!ifdef AppName
${InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
@ -674,6 +678,10 @@ Function .onInit
FunctionEnd
Function un.onInit
; Remove the current exe directory from the search order.
; This only effects LoadLibrary calls and not implicitly loaded DLLs.
System::Call 'kernel32::SetDllDirectoryW(w "")'
StrCpy $LANGUAGE 0
${un.UninstallUnOnInitCommon}

8
webapprt/win/webapp-uninstaller.nsi.in
View File

@ -131,6 +131,10 @@ BrandingText " "
# Initialization Functions
Function .onInit
; Remove the current exe directory from the search order.
; This only effects LoadLibrary calls and not implicitly loaded DLLs.
System::Call 'kernel32::SetDllDirectoryW(w "")'
GetTempFileName $0
Delete "$0"
CreateDirectory "$0"
@ -146,6 +150,10 @@ Function .onInit
FunctionEnd
Function un.onInit
; Remove the current exe directory from the search order.
; This only effects LoadLibrary calls and not implicitly loaded DLLs.
System::Call 'kernel32::SetDllDirectoryW(w "")'
StrCpy $LANGUAGE 0
${un.GetParent} "$INSTDIR" $INSTDIR