Bug 1199118 - Don't use pragma comment in certificatecheck.cpp. r=glandium
authorJacek Caban <jacek@codeweavers.com>
Fri, 28 Aug 2015 13:17:54 +0200
changeset 292395 34bbc3cb3e790ac777d1853a4f9bf16f4102640b
parent 292394 c59612f82a95c89661dbbaf28e04854b7e1c7e19
child 292396 d977d6508ad3138c85a209c6ec61e50dfa51be12
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1199118
milestone43.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1199118 - Don't use pragma comment in certificatecheck.cpp. r=glandium
toolkit/mozapps/update/common/certificatecheck.cpp
toolkit/mozapps/update/common/sources.mozbuild
toolkit/mozapps/update/tests/moz.build
--- a/toolkit/mozapps/update/common/certificatecheck.cpp
+++ b/toolkit/mozapps/update/common/certificatecheck.cpp
@@ -6,19 +6,16 @@
 #include <stdlib.h>
 #include <windows.h>
 #include <softpub.h>
 #include <wintrust.h>
 
 #include "certificatecheck.h"
 #include "updatelogging.h"
 
-#pragma comment(lib, "wintrust.lib")
-#pragma comment(lib, "crypt32.lib")
-
 static const int ENCODING = X509_ASN_ENCODING | PKCS_7_ASN_ENCODING;
 
 /**
  * Checks to see if a file stored at filePath matches the specified info.
  *
  * @param  filePath    The PE file path to check
  * @param  infoToMatch The acceptable information to match
  * @return ERROR_SUCCESS if successful, ERROR_NOT_FOUND if the info 
--- a/toolkit/mozapps/update/common/sources.mozbuild
+++ b/toolkit/mozapps/update/common/sources.mozbuild
@@ -7,15 +7,19 @@ sources = []
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     sources += [
         'certificatecheck.cpp',
         'pathhash.cpp',
         'registrycertificates.cpp',
         'uachelper.cpp',
         'updatehelper.cpp',
     ]
+    OS_LIBS += [
+        'crypt32',
+        'wintrust',
+    ]
 
 sources += [
     'readstrings.cpp',
     'updatelogging.cpp',
 ]
 
 SOURCES += sorted(['%s/%s' % (srcdir, s) for s in sources])
--- a/toolkit/mozapps/update/tests/moz.build
+++ b/toolkit/mozapps/update/tests/moz.build
@@ -27,17 +27,16 @@ LOCAL_INCLUDES += [
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     USE_LIBS += [
         'updatecommon-standalone',
     ]
 
     OS_LIBS += [
-        'wintrust',
         'shlwapi',
       ]
 else:
     USE_LIBS += [
         'updatecommon',
     ]
 
 for var in ('MOZ_APP_NAME', 'MOZ_APP_BASENAME', 'MOZ_APP_DISPLAYNAME',