Attachment #477199: v3 w/nsis changes for bug #597911

View | Details | Raw Unified | Return to bug 597911
Collapse All | Expand All

(-)a/browser/installer/windows/nsis/defines.nsi.in (-12 / +12 lines)
Line     Link Here 
 Lines 1-19    Link Here 
1 
#filter substitution
 1 
#filter substitution
2 

          2
          

        

            

              
              
              3
              
# ARCH is used when it is necessary to differentiate the x64 registry keys from

            

            

              4
              
# the x86 registry keys (e.g. the uninstall registry key).

            

            

              5
              
#ifdef HAVE_64BIT_OS

            

            

              6
              
!define HAVE_64BIT_OS

            

            

              7
              
!define ARCH "x64"

            

            

              8
              
!define MinSupportedVer "Microsoft Windows Vista x64"

            

            

              9
              
#else

            

            

              10
              
!define ARCH "x86"

            

            

              11
              
!define MinSupportedVer "Microsoft Windows 2000"

            

            

              12
              
#endif

            

            

              13
              

            

        

          3
          
# Win7: AppVendor, AppName, and AppVersion must match the application.ini values

          14
          
# Win7: AppVendor, AppName, and AppVersion must match the application.ini values

        

        

          4
          
# of Vendor, Name, and Version. These values are used in registering shortcuts

          15
          
# of Vendor, Name, and Version. These values are used in registering shortcuts

        

        

          5
          
# with the taskbar. ExplicitAppUserModelID registration when the app launches is

          16
          
# with the taskbar. ExplicitAppUserModelID registration when the app launches is

        

        

          6
          
# handled in widget/src/windows/WinTaskbar.cpp.

          17
          
# handled in widget/src/windows/WinTaskbar.cpp.

        

        

          7
          

          18
          

        

        

          8
          
!define AppVendor             "Mozilla"

          19
          
!define AppVendor             "Mozilla"

        

        

          9
          
!define AppName               "Firefox"

          20
          
!define AppName               "Firefox"

        

        

          10
          
!define AppVersion            "@APP_VERSION@"

          21
          
!define AppVersion            "@APP_VERSION@"

        

          
            

              11
              
!define AppUserModelID        "${AppVendor}.${AppName}.${AppVersion}"


              22
              
!define AppUserModelID        "${AppVendor}.${AppName}.${AppVersion}.${ARCH}"

            

        

          12
          
!define GREVersion            @MOZILLA_VERSION@

          23
          
!define GREVersion            @MOZILLA_VERSION@

        

        

          13
          
!define AB_CD                 "@AB_CD@"

          24
          
!define AB_CD                 "@AB_CD@"

        

        

          14
          

          25
          

        

        

          15
          
!define FileMainEXE           "@MOZ_APP_NAME@.exe"

          26
          
!define FileMainEXE           "@MOZ_APP_NAME@.exe"

        

        

          16
          
!define WindowClass           "FirefoxMessageWindow"

          27
          
!define WindowClass           "FirefoxMessageWindow"

        

        

          17
          
!define DDEApplication        "Firefox"

          28
          
!define DDEApplication        "Firefox"

        

        

          18
          
!define AppRegName            "Firefox"

          29
          
!define AppRegName            "Firefox"

        

        

          19
          

          30
          

        

  

    

    

       Lines 33-59
      
    
  Link Here 
    

  

        

          33
          
# (e.g. Alpha X, Beta X, etc.) to prevent finding a non-default installation

          44
          
# (e.g. Alpha X, Beta X, etc.) to prevent finding a non-default installation

        

        

          34
          
# directory in the registry and using that as the default. This prevents

          45
          
# directory in the registry and using that as the default. This prevents

        

        

          35
          
# Beta releases built with official branding from finding an existing install

          46
          
# Beta releases built with official branding from finding an existing install

        

        

          36
          
# of an official release and defaulting to its installation directory.

          47
          
# of an official release and defaulting to its installation directory.

        

        

          37
          
!if "@PRE_RELEASE_SUFFIX@" != ""

          48
          
!if "@PRE_RELEASE_SUFFIX@" != ""

        

        

          38
          
!define NO_INSTDIR_FROM_REG

          49
          
!define NO_INSTDIR_FROM_REG

        

        

          39
          
!endif

          50
          
!endif

        

        

          40
          

          51
          

        

            

              41
              
# ARCH is used when it is necessary to differentiate the x64 registry keys from

              
              
            

            

              42
              
# the x86 registry keys (e.g. the uninstall registry key).

            

            

              43
              
#ifdef HAVE_64BIT_OS

            

            

              44
              
!define HAVE_64BIT_OS

            

            

              45
              
!define ARCH "x64"

            

            

              46
              
!define MinSupportedVer "Microsoft Windows Vista x64"

            

            

              47
              
#else

            

            

              48
              
!define ARCH "x86"

            

            

              49
              
!define MinSupportedVer "Microsoft Windows 2000"

            

            

              50
              
#endif

            

            

              51
              

            

        

          52
          
# File details shared by both the installer and uninstaller

          52
          
# File details shared by both the installer and uninstaller

        

        

          53
          
VIProductVersion "1.0.0.0"

          53
          
VIProductVersion "1.0.0.0"

        

        

          54
          
VIAddVersionKey "ProductName"     "${BrandShortName}"

          54
          
VIAddVersionKey "ProductName"     "${BrandShortName}"

        

        

          55
          
VIAddVersionKey "CompanyName"     "${CompanyName}"

          55
          
VIAddVersionKey "CompanyName"     "${CompanyName}"

        

        

          56
          
#ifdef MOZ_OFFICIAL_BRANDING

          56
          
#ifdef MOZ_OFFICIAL_BRANDING

        

        

          57
          
VIAddVersionKey "LegalTrademarks" "${BrandShortName} is a Trademark of The Mozilla Foundation."

          57
          
VIAddVersionKey "LegalTrademarks" "${BrandShortName} is a Trademark of The Mozilla Foundation."

        

        

          58
          
#endif

          58
          
#endif

        

        

          59
          
VIAddVersionKey "LegalCopyright"  "${CompanyName}"

          59
          
VIAddVersionKey "LegalCopyright"  "${CompanyName}"

        



(-)a/widget/src/windows/WinTaskbar.cpp
      (+10 lines)




  

    

    

      Line 
      
    
  Link Here 
    

  

  

    

    

       Lines 286-302
      WinTaskbar::GetAppUserModelID(nsAString 
    
  Link Here 
    

  

        

          286
          
    aDefaultGroupId.Append(PRUnichar('.'));

          286
          
    aDefaultGroupId.Append(PRUnichar('.'));

        

        

          287
          
  }

          287
          
  }

        

        

          288
          
  if (NS_SUCCEEDED(appInfo->GetName(val))) {

          288
          
  if (NS_SUCCEEDED(appInfo->GetName(val))) {

        

        

          289
          
    AppendASCIItoUTF16(val, aDefaultGroupId);

          289
          
    AppendASCIItoUTF16(val, aDefaultGroupId);

        

        

          290
          
    aDefaultGroupId.Append(PRUnichar('.'));

          290
          
    aDefaultGroupId.Append(PRUnichar('.'));

        

        

          291
          
  }

          291
          
  }

        

        

          292
          
  if (NS_SUCCEEDED(appInfo->GetVersion(val))) {

          292
          
  if (NS_SUCCEEDED(appInfo->GetVersion(val))) {

        

        

          293
          
    AppendASCIItoUTF16(val, aDefaultGroupId);

          293
          
    AppendASCIItoUTF16(val, aDefaultGroupId);

        

            

              
              
              294
              
    aDefaultGroupId.Append(PRUnichar('.'));

            

        

          294
          
  }

          295
          
  }

        

            

              
              
              296
              
#ifdef _WIN64

            

            

              297
              
  aDefaultGroupId.Append(PRUnichar('x'));

            

            

              298
              
  aDefaultGroupId.Append(PRUnichar('6'));

            

            

              299
              
  aDefaultGroupId.Append(PRUnichar('4'));

            

            

              300
              
#else 

            

            

              301
              
  aDefaultGroupId.Append(PRUnichar('x'));

            

            

              302
              
  aDefaultGroupId.Append(PRUnichar('8'));

            

            

              303
              
  aDefaultGroupId.Append(PRUnichar('6'));

            

            

              304
              
#endif

            

        

          295
          

          305
          

        

        

          296
          
  return aDefaultGroupId.IsEmpty() ? PR_FALSE : PR_TRUE;

          306
          
  return aDefaultGroupId.IsEmpty() ? PR_FALSE : PR_TRUE;

        

        

          297
          
}

          307
          
}

        

        

          298
          

          308
          

        

        

          299
          
/* readonly attribute AString defaultGroupId; */

          309
          
/* readonly attribute AString defaultGroupId; */

        

        

          300
          
NS_IMETHODIMP

          310
          
NS_IMETHODIMP

        

        

          301
          
WinTaskbar::GetDefaultGroupId(nsAString & aDefaultGroupId) {

          311
          
WinTaskbar::GetDefaultGroupId(nsAString & aDefaultGroupId) {

        

        

          302
          
  if (!GetAppUserModelID(aDefaultGroupId))

          312
          
  if (!GetAppUserModelID(aDefaultGroupId))

        







  


  Return to bug 597911