Cast vdata to appropriate type in reg state

Creates a `cast_vdata` function in the reg util
Calls that function from the state to put the data in the appropriate
type

salt/states/reg.py

@@ -192,11 +192,8 @@ def present(name,
                                    salt.utils.stringutils.to_unicode(name, 'utf-8'))
         return ret
 
-    try:
-        vdata_decoded = salt.utils.stringutils.to_unicode(vdata, 'utf-8')
-    except UnicodeDecodeError:
-        # vdata contains binary data that can't be decoded
-        vdata_decoded = vdata
+    vdata_decoded = __utils__['reg.cast_vdata'](vdata=vdata, vtype=vtype)
+
     add_change = {'Key': r'{0}\{1}'.format(hive, key),
                   'Entry': '{0}'.format(salt.utils.stringutils.to_unicode(vname, 'utf-8') if vname else '(Default)'),
                   'Value': vdata_decoded}

salt/utils/win_reg.py

@@ -528,22 +528,7 @@ def set_value(hive,
     vtype_value = registry.vtype[local_vtype]
     access_mask = registry.registry_32[use_32bit_registry] | win32con.KEY_ALL_ACCESS
 
-    # Check data type and cast to expected type
-    # int will automatically become long on 64bit numbers
-    # https://www.python.org/dev/peps/pep-0237/
-
-    # String Types to Unicode
-    if vtype_value in [win32con.REG_SZ, win32con.REG_EXPAND_SZ]:
-        local_vdata = _to_unicode(vdata)
-    # Don't touch binary...
-    elif vtype_value == win32con.REG_BINARY:
-        local_vdata = vdata
-    # Make sure REG_MULTI_SZ is a list of strings
-    elif vtype_value == win32con.REG_MULTI_SZ:
-        local_vdata = [_to_unicode(i) for i in vdata]
-    # Everything else is int
-    else:
-        local_vdata = int(vdata)
+    local_vdata = cast_vdata(vdata=vdata, vtype=local_vtype)
 
     if volatile:
         create_options = registry.opttype['REG_OPTION_VOLATILE']
@@ -563,6 +548,49 @@ def set_value(hive,
         return False
 
 
+def cast_vdata(vdata=None, vtype='REG_SZ'):
+    '''
+    Cast the ``vdata` value to the appropriate data type for the registry type
+    specified in ``vtype``
+
+    Args:
+
+        vdata (str, list, bin): The data to cast
+
+        vtype (str):
+            The type of data to be written to the registry. Must be one of the
+            following:
+                - REG_BINARY
+                - REG_DWORD
+                - REG_EXPAND_SZ
+                - REG_MULTI_SZ
+                - REG_SZ
+
+    Returns:
+        The vdata cast to the appropriate type. Will be unicode string, binary,
+        list of unicode strings, or int
+    '''
+    # Check data type and cast to expected type
+    # int will automatically become long on 64bit numbers
+    # https://www.python.org/dev/peps/pep-0237/
+
+    registry = Registry()
+    vtype_value = registry.vtype[vtype]
+
+    # String Types to Unicode
+    if vtype_value in [win32con.REG_SZ, win32con.REG_EXPAND_SZ]:
+        return _to_unicode(vdata)
+    # Don't touch binary...
+    elif vtype_value == win32con.REG_BINARY:
+        return vdata
+    # Make sure REG_MULTI_SZ is a list of strings
+    elif vtype_value == win32con.REG_MULTI_SZ:
+        return [_to_unicode(i) for i in vdata]
+    # Everything else is int
+    else:
+        return int(vdata)
+
+
 def delete_key_recursive(hive, key, use_32bit_registry=False):
     '''
     .. versionadded:: 2015.5.4