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.

setupapi: Fix parsing of UCS-16 files.
4d794646 · Robert Shearman · Alexandre Julliard · 32d39ea6 · 4d794646
Commit 4d794646 authored Apr 26, 2006 by Robert Shearman Committed by Alexandre Julliard May 05, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

parser.c dlls/setupapi/parser.c +8 -1

No files found.
--- a/dlls/setupapi/parser.c
+++ b/dlls/setupapi/parser.c
@@ -967,7 +967,14 @@ static struct inf_file *parse_file( HANDLE handle, const WCHAR *class, UINT *err
            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 */
    {