Changeset 8667 for trunk/src/setupapi/parser.c

Timestamp:

Jun 15, 2002, 12:44:06 PM (23 years ago)

Author:

sandervl

Message:

wine update

File:

• trunk/src/setupapi/parser.c (modified) (5 diffs)

trunk/src/setupapi/parser.c

@@ -19 +19 @@
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <assert.h>
 #include <limits.h>
@@ -325 +328 @@
         memcpy( dirid_str, str, *len * sizeof(WCHAR) );
         dirid_str[*len] = 0;
-        dirid = wcstol( dirid_str, &end, 10 );
+        dirid = strtolW( dirid_str, &end, 10 );
         if (!*end) ret = get_dirid_subst( dirid, len );
         HeapFree( GetProcessHeap(), 0, dirid_str );
@@ -535 +538 @@
 
 
+/* close the current line and prepare for parsing a new one */
+static void close_current_line( struct parser *parser )
+{
+    struct line *cur_line = parser->line;
+
+    if (cur_line)
+    {
+        /* if line has a single field and no key, the field is the key too */
+        if (cur_line->nb_fields == 1 && cur_line->key_field == -1)
+            cur_line->key_field = cur_line->first_field;
+    }
+    parser->line = NULL;
+}
+
+
 /* handler for parser LINE_START state */
 static const WCHAR *line_start_state( struct parser *parser, const WCHAR *pos )
@@ -546 +564 @@
         case '\n':
             parser->line_pos++;
-            parser->line = NULL;  /* start a new line */
+            close_current_line( parser );
             break;
         case ';':
@@ -566 +584 @@
         }
     }
+    close_current_line( parser );
     return NULL;
 }