[SharpGen] StringToHGlobalUni is not necessary since it is already th…

…e same layout as .NET strings, use "fixed" instead
sharpdx · Mar 23, 2016 · b448930 · b448930
1 parent e4e820e
commit b448930
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/Source/Tools/SharpGen/Templates/Method.tt b/Source/Tools/SharpGen/Templates/Method.tt
@@ -225,13 +225,9 @@
 							}
 						}
 					// Handle Input String 
-					} else if (param.IsString) {
-						if (param.IsWideChar) {#>
-                IntPtr <#= param.TempName #> = Utilities.StringToHGlobalUni(<#= param.Name #>);
-<#+						} else {#>
+					} else if (param.IsString && !param.IsWideChar) {#>
                 IntPtr <#= param.TempName #> = Utilities.StringToHGlobalAnsi(<#= param.Name #>);
-<#+						}						
-					} else if ( param.IsRefIn && param.IsValueType && param.IsOptionnal) {#>
+<#+					} else if ( param.IsRefIn && param.IsValueType && param.IsOptionnal) {#>
                 <#= param.PublicType.QualifiedName #> <#= param.TempName #>;
                 if (<#= param.Name #>.HasValue)
                     <#= param.TempName #> = <#= param.Name #>.Value;				
@@ -272,7 +268,11 @@
 					} else if (param.IsFixed && param.IsValueType && !param.HasNativeValueType && !param.IsUsedAsReturnType) {#>
                 fixed (void* <#= param.TempName #> = &<#= param.Name #>)
 <#+						PushIndent("    ");
-					} 
+					// Handle Input String 
+					} else if (param.IsString && param.IsWideChar) {#>
+                fixed (char* <#= param.TempName #> = <#= param.Name #>)
+<#+						PushIndent("    ");
+					}						
 				}
 
 
@@ -335,7 +335,7 @@
                 <#= param.Name #> = <#= param.TempName #> != 0;
 <#+						}						
 					// Handle Input String 
-					} else if (param.IsString) {#>
+					} else if (param.IsString && !param.IsWideChar) {#>
                 Marshal.FreeHGlobal(<#= param.TempName #> );
 <#+						
 					} else if (param.HasNativeValueType) {