Index: dll/win32/dnsapi/dnsapi/query.c
===================================================================
--- dll/win32/dnsapi/dnsapi/query.c	(revision 74168)
+++ dll/win32/dnsapi/dnsapi/query.c	(working copy)
@@ -303,25 +303,25 @@
     {
         /* Use defalt path */
         GetSystemDirectoryW(ExpandedPath, MAX_PATH);
-        StringCchLength(ExpandedPath, MAX_PATH, &StringLength);
+        StringCchLengthW(ExpandedPath, MAX_PATH, &StringLength);
         if (ExpandedPath[StringLength - 1] != L'\\')
         {
             /* It isn't, so add it ourselves */
-            StringCchCat(ExpandedPath, MAX_PATH, L"\\");
+            StringCchCatW(ExpandedPath, MAX_PATH, L"\\");
         }
-        StringCchCat(ExpandedPath, MAX_PATH, L"DRIVERS\\ETC\\");
+        StringCchCatW(ExpandedPath, MAX_PATH, L"DRIVERS\\ETC\\");
     }
 
     /* Make sure that the path is backslash-terminated */
-    StringCchLength(ExpandedPath, MAX_PATH, &StringLength);
+    StringCchLengthW(ExpandedPath, MAX_PATH, &StringLength);
     if (ExpandedPath[StringLength - 1] != L'\\')
     {
         /* It isn't, so add it ourselves */
-        StringCchCat(ExpandedPath, MAX_PATH, L"\\");
+        StringCchCatW(ExpandedPath, MAX_PATH, L"\\");
     }
 
     /* Add the database name */
-    StringCchCat(ExpandedPath, MAX_PATH, Name);
+    StringCchCatW(ExpandedPath, MAX_PATH, Name);
 
     /* Return a handle to the file */
     ret = CreateFileW(ExpandedPath,
Index: sdk/include/ndk/umtypes.h
===================================================================
--- sdk/include/ndk/umtypes.h	(revision 74168)
+++ sdk/include/ndk/umtypes.h	(working copy)
@@ -28,12 +28,12 @@
 #include <no_sal2.h>
 #endif
 
-//
-// NDK Applications must use Unicode
-//
-#ifndef UNICODE
-#define UNICODE
-#endif
+// //
+// // NDK Applications must use Unicode
+// //
+// #ifndef UNICODE
+// #define UNICODE
+// #endif
 
 //
 // Don't use the SDK status values