commit 4d7946464a104f49b12e059fbafbe56c843484cb
author Robert Shearman <rob@codeweavers.com> Wed Apr 26 15:42:14 2006 +0100
committer Alexandre Julliard <julliard@winehq.org> Fri May 05 21:58:28 2006 +0200
tree 566e893b7613276252f3fcd1525fcafd9cf98b95
parent 32d39ea6ed40c38d5096fc349efeba6cb8ec06b2

setupapi: Fix parsing of UCS-16 files.

Fix parsing of UCS-16 files prefixed with the Unicode BOM. Based on a 
patch by Hervé Poussineau.

dlls/setupapi/parser.c

diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c
index e6587c7..514e85a 100644
--- a/dlls/setupapi/parser.c
+++ b/dlls/setupapi/parser.c
@@ -967,7 +967,14 @@
             HeapFree( GetProcessHeap(), 0, new_buff );
         }
     }
-    else err = parse_buffer( file, buffer, (WCHAR *)((char *)buffer + size), error_line );
+    else
+    {
+        WCHAR *new_buff = (WCHAR *)buffer;
+        /* UCS-16 files should start with the Unicode BOM; we should skip it */
+        if (*new_buff == 0xfeff)
+            new_buff++;
+        err = parse_buffer( file, new_buff, (WCHAR *)((char *)buffer + size), error_line );
+    }
 
     if (!err)  /* now check signature */
     {