Fix duplicated strings in ADMX templates.

grit/format/policy_templates/writers/adm_writer.py

 #!/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.
 
 
 from grit.format.policy_templates.writers import template_writer
 
 
 NEWLINE = '\r\n'
@@ skipping 57 matching lines @@
   TYPE_TO_INPUT = {
     'string': 'EDITTEXT',
     'int': 'NUMERIC',
     'string-enum': 'DROPDOWNLIST',
     'int-enum': 'DROPDOWNLIST',
     'list': 'LISTBOX',
     'string-enum-list': 'LISTBOX',
     'dict': 'EDITTEXT'
   }
 
+  def _Escape(self, string):
+    return string.replace('.', '_')
+
   def _AddGuiString(self, name, value):
+    # The |name| must be escaped.
+    assert name == self._Escape(name)
     # Escape newlines in the value.
     value = value.replace('\n', '\\n')
     if name in self.strings_seen:
       err = ('%s was added as "%s" and now added again as "%s"' %
              (name, self.strings_seen[name], value))
       assert value == self.strings_seen[name], err
     else:
       self.strings_seen[name] = value
       line = '%s="%s"' % (name, value)
       self.strings.AddLine(line)
 
   def _WriteSupported(self, builder):
     builder.AddLine('#if version >= 4', 1)
     builder.AddLine('SUPPORTED !!SUPPORTED_WINXPSP2')
     builder.AddLine('#endif', -1)
 
   def _WritePart(self, policy, key_name, builder):
     '''Writes the PART ... END PART section of a policy.
 
     Args:
       policy: The policy to write to the output.
       key_name: The registry key backing the policy.
       builder: Builder to append lines to.
     '''
-    policy_part_name = policy['name'] + '_Part'
+    policy_part_name = self._Escape(policy['name'] + '_Part')
     self._AddGuiString(policy_part_name, policy['label'])
 
     # Print the PART ... END PART section:
     builder.AddLine()
     adm_type = self.TYPE_TO_INPUT[policy['type']]
     builder.AddLine('PART !!%s  %s' % (policy_part_name, adm_type), 1)
     if policy['type'] in ('list', 'string-enum-list'):
       # Note that the following line causes FullArmor ADMX Migrator to create
       # corrupt ADMX files. Please use admx_writer to get ADMX files.
       builder.AddLine('KEYNAME "%s\\%s"' % (key_name, policy['name']))
       builder.AddLine('VALUEPREFIX ""')
     else:
       builder.AddLine('VALUENAME "%s"' % policy['name'])
     if policy['type'] == 'int':
       # The default max for NUMERIC values is 9999 which is too small for us.
       builder.AddLine('MIN 0 MAX 2000000000')
     if policy['type'] in ('int-enum', 'string-enum'):
       builder.AddLine('ITEMLIST', 1)
       for item in policy['items']:
         if policy['type'] == 'int-enum':
           value_text = 'NUMERIC ' + str(item['value'])
         else:
           value_text = '"' + item['value'] + '"'
-        builder.AddLine('NAME !!%s_DropDown VALUE %s' %
-            (item['name'], value_text))
-        self._AddGuiString(item['name'] + '_DropDown', item['caption'])
+        string_id = self._Escape(item['name'] + '_DropDown')
+        builder.AddLine('NAME !!%s VALUE %s' % (string_id, value_text))
+        self._AddGuiString(string_id, item['caption'])
       builder.AddLine('END ITEMLIST', -1)
     builder.AddLine('END PART', -1)
 
   def _WritePolicy(self, policy, key_name, builder):
     if policy['type'] == 'external':
       # This type can only be set through cloud policy.
       return
 
-    self._AddGuiString(policy['name'] + '_Policy', policy['caption'])
-    builder.AddLine('POLICY !!%s_Policy' % policy['name'], 1)
+    policy_name = self._Escape(policy['name'] + '_Policy')
+    self._AddGuiString(policy_name, policy['caption'])
+    builder.AddLine('POLICY !!%s' % policy_name, 1)
     self._WriteSupported(builder)
-    policy_explain_name = policy['name'] + '_Explain'
+    policy_explain_name = self._Escape(policy['name'] + '_Explain')
     self._AddGuiString(policy_explain_name, policy['desc'])
     builder.AddLine('EXPLAIN !!' + policy_explain_name)
 
     if policy['type'] == 'main':
       builder.AddLine('VALUENAME "%s"' % policy['name'])
       builder.AddLine('VALUEON NUMERIC 1')
       builder.AddLine('VALUEOFF NUMERIC 0')
     else:
       self._WritePart(policy, key_name, builder)
 
     builder.AddLine('END POLICY', -1)
     builder.AddLine()
 
   def WritePolicy(self, policy):
     if self.CanBeMandatory(policy):
       self._WritePolicy(policy,
                         self.config['win_reg_mandatory_key_name'],
                         self.policies)
 
   def WriteRecommendedPolicy(self, policy):
     self._WritePolicy(policy,
                       self.config['win_reg_recommended_key_name'],
                       self.recommended_policies)
 
   def BeginPolicyGroup(self, group):
-    category_name = group['name'] + '_Category'
+    category_name = self._Escape(group['name'] + '_Category')
     self._AddGuiString(category_name, group['caption'])
     self.policies.AddLine('CATEGORY !!' + category_name, 1)
 
   def EndPolicyGroup(self):
     self.policies.AddLine('END CATEGORY', -1)
     self.policies.AddLine('')
 
   def BeginRecommendedPolicyGroup(self, group):
-    category_name = group['name'] + '_Category'
+    category_name = self._Escape(group['name'] + '_Category')
     self._AddGuiString(category_name, group['caption'])
     self.recommended_policies.AddLine('CATEGORY !!' + category_name, 1)
 
   def EndRecommendedPolicyGroup(self):
     self.recommended_policies.AddLine('END CATEGORY', -1)
     self.recommended_policies.AddLine('')
 
   def _CreateTemplate(self, category_path, key_name, policies):
     '''Creates the whole ADM template except for the [Strings] section, and
     returns it as an |IndentedStringBuilder|.
@@ skipping 62 matching lines @@
     self.strings = IndentedStringBuilder()
     # Map of strings seen, to avoid duplicates.
     self.strings_seen = {}
     # String buffer for building the policies of the ADM file.
     self.policies = IndentedStringBuilder()
     # String buffer for building the recommended policies of the ADM file.
     self.recommended_policies = IndentedStringBuilder()
 
   def GetTemplateText(self):
     return self.lines.ToString()