--- a/dwt/internal/win32/OS.d	Mon Feb 04 12:57:51 2008 +0100
+++ b/dwt/internal/win32/OS.d	Mon Feb 04 13:39:10 2008 +0100
@@ -4803,10 +4803,10 @@
     return ret;
 }
 
-public wchar[] StrToWCHARs(uint codepage , char[] sc) {
-    return StrToWCHARs( sc );
+public wchar[] StrToWCHARs(uint codepage , char[] sc, bool terminated = false ) {
+    return StrToWCHARs( sc, terminated );
 }
-public wchar[] StrToWCHARs(char[] sc) {
+public wchar[] StrToWCHARs(char[] sc, bool terminated = false ) {
     wchar[] ret;
     try{
         ret = toString16(sc);
@@ -4814,7 +4814,9 @@
         // do nothing
         ret = "";
     }
-
+    if( terminated ){
+        ret ~= \0;
+    }
     return ret;
 }
 
@@ -4823,7 +4825,7 @@
 }
 
 public wchar* StrToWCHARz(char[] sc, uint* length = null ) {
-    return toString16z( StrToWCHARs(sc));
+    return StrToWCHARs(sc, true ).ptr;
 }
 
 public char[] MBCSsToStr(char[] string, uint codepage = 0){