From: Elizabeth Figura zfigura@codeweavers.com
--- dlls/setupapi/parser.c | 11 +++++++++-- dlls/setupapi/tests/parser.c | 4 ++-- 2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index 1c09d39a0fe..a9c49ffe2e4 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -1825,10 +1825,17 @@ BOOL WINAPI SetupGetBinaryField( PINFCONTEXT context, DWORD index, BYTE *buffer, field = &file->fields[line->first_field + index]; for (i = index; i < line->nb_fields; i++, field++) { - const WCHAR *p; + const WCHAR *p = field->text; DWORD value = 0; int d; - for (p = field->text; *p && (d = xdigit_to_int(*p)) != -1; p++) + + if (*p == '0') + { + ++p; + if (*p == 'X' || *p == 'x') + ++p; + } + for (; *p && (d = xdigit_to_int(*p)) != -1; p++) { if ((value <<= 4) > 255) { diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index 6658ff703bd..a2da215ec33 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -850,8 +850,8 @@ static void test_SetupGetBinaryField(void) ok(size == 4, "got size %lu\n", size); ok(buffer[0] == 0x11, "got %#x\n", buffer[0]); ok(buffer[1] == 0x22, "got %#x\n", buffer[1]); - todo_wine ok(buffer[2] == 0xaa, "got %#x\n", buffer[2]); - todo_wine ok(buffer[3] == 0xff, "got %#x\n", buffer[3]); + ok(buffer[2] == 0xaa, "got %#x\n", buffer[2]); + ok(buffer[3] == 0xff, "got %#x\n", buffer[3]);
ret = SetupFindFirstLineA(hinf, "section", "key2", &context); ok(ret == TRUE, "got error %lu\n", GetLastError());