Stop delay loading user32.dll from chrome.dll on x86/Windows.

build/win/importlibs/filter_export_list.py

Index: build/win/importlibs/filter_export_list.py
diff --git a/build/win/importlibs/filter_export_list.py b/build/win/importlibs/filter_export_list.py
new file mode 100644
index 0000000000000000000000000000000000000000..95682dfbc2a8c4d5b551d0dc08ccc54aa29015c1
--- /dev/null
+++ b/build/win/importlibs/filter_export_list.py
@@ -0,0 +1,83 @@
+#!/usr/bin/env python
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+#
+"""A utility script to help with maintaining DLL import lists."""

[M-A Ruel, 2013/03/26 12:59:14]

"""Helps maintaining DLL import lists."""

but I'd expand "helps"

[Sigurður Ásgeirsson, 2013/03/26 15:35:35]

The "how" is in the script's usage string.

+import ast
+import optparse
+import re
+import sys
+
+
+_EXPORT_RE = re.compile("""

[M-A Ruel, 2013/03/26 12:59:14]

It should be a r"""

otherwise you'll get caught by an \ escape eventually.

[Sigurður Ásgeirsson, 2013/03/26 15:35:35]

Done.

+  ^\s*(?P<ordinal>[0-9]+)  # The ordinal field.
+  \s+(?P<hint>[0-9A-F]+)   # The hint field.
+  \s(?P<rva>........)      # The RVA field.
+  \s+(?P<name>[^ ]+)       # And finally the name we're really after.
+""", re.VERBOSE)
+
+
+_USAGE = """\
+Usage: %prog [options] [master-file]
+
+This script filters a list of exports from a DLL, generated from something
+like the following command line:
+
+C:\> dumpbin /exports dllname.dllname
+
+against a master list of imports built from e.g.
+
+C:\> dumpbin /exports importlibname.lib
+
+The point of this is to trim non-public exports from the list, and to
+normalize the names to their stdcall-mangled form for the generation of
+import libraries.
+Note that the export names from the latter incanatation are stdcall-mangled,
+e.g. they are suffixed with "@" and the number of argument bytes to the
+function.
+"""
+
+def _ReadMasterFile(master_file):
+  # Slurp the master file.

[M-A Ruel, 2013/03/26 12:59:14]

with open(master_file) as f:
  master_exports = ast.literal_eval(f.read())
return dict((i.split('@', 1)[0], i) for i in master_exports)

[Sigurður Ásgeirsson, 2013/03/26 15:35:35]

I generally prefer readability to terseness, do you consider this more readable?
(Not being facetious - I don't write enough python to consider myself an
expert).

[M-A Ruel, 2013/03/26 15:44:37]

This is intermediate python but I don't really mind, it's more FYI. One day,
you'll embrace generators.

+  master_exports = ast.literal_eval(open(master_file).read())
+  master_mapping = {}
+  for export in master_exports:
+    name = export.split('@')[0]
+    master_mapping[name] = export
+
+  return master_mapping
+
+
+def main():
+  parser = optparse.OptionParser(usage=_USAGE)
+  parser.add_option('-r', '--reverse',
+                    action='store_true',
+                    help='Reverse the matching, e.g. return the functions '
+                         'in the master list that aren\'t in the input.')
+
+  options, args = parser.parse_args()
+  if len(args) != 1:
+    parser.error('Must provide a master file.')
+    return 1
+
+  master_mapping = _ReadMasterFile(args[0])
+
+  found_exports = []
+  for line in sys.stdin:
+    match = _EXPORT_RE.match(line)
+    if match:
+      export_name = master_mapping.get(match.group('name'), None)
+      if export_name:
+          found_exports.append(export_name)
+
+  if options.reverse:
+    # Invert the found_exports list.
+    found_exports = list(set(master_mapping.values()) - set(found_exports))

[M-A Ruel, 2013/03/26 12:59:14]

not necessary to convert back into a list.

[Sigurður Ásgeirsson, 2013/03/26 15:35:35]

Done.

+
+  # Sort the found exports for tidy output.
+  '\n'.join(sorted(found_exports))

[M-A Ruel, 2013/03/26 12:59:14]

Did you intent to print it?

Then return 0

[Sigurður Ásgeirsson, 2013/03/26 15:35:35]

Done.

+
+
+if __name__ == '__main__':
+  sys.exit(main())