Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-09 14:07:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Temp fix, because setupapi takes a wrong guess (RtlIsTextUnicode) whether the text is unicode and doesn't work. For now it's assumed all .inf-files are not-unicode.

Browse source 
svn path=/trunk/; revision=8150
This commit is contained in:
Aleksey Bragin 2004-02-11 12:40:01 +00:00
parent 1765aab70d
commit 3d647705b7
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
reactos/lib/setupapi/parser.c
View file

@ -568,7 +568,7 @@ static void close_current_line( struct parser *parser )
static const WCHAR *line_start_state( struct parser *parser, const WCHAR *pos ) static const WCHAR *line_start_state( struct parser *parser, const WCHAR *pos )
{ {
const WCHAR *p; const WCHAR *p;
for (p = pos; !is_eof( parser, p ); p++) for (p = pos; !is_eof( parser, p ); p++)
{ {
switch(*p) switch(*p)
@ -795,7 +795,7 @@ static const WCHAR *quotes_state( struct parser *parser, const WCHAR *pos )
static const WCHAR *leading_spaces_state( struct parser *parser, const WCHAR *pos ) static const WCHAR *leading_spaces_state( struct parser *parser, const WCHAR *pos )
{ {
const WCHAR *p; const WCHAR *p;
for (p = pos; !is_eol( parser, p ); p++) for (p = pos; !is_eol( parser, p ); p++)
{ {
if (*p == '\\') if (*p == '\\')
@ -945,7 +945,7 @@ static struct inf_file *parse_file( HANDLE handle, const WCHAR *class, UINT *err
file->string_pos = file->strings; file->string_pos = file->strings;
file->strings_section = -1; file->strings_section = -1;
if (!RtlIsTextUnicode( buffer, size, NULL )) if (TRUE)//(!RtlIsTextUnicode( buffer, size, NULL )) // Fireball, 07 Feb 04, temp fix
{ {
WCHAR *new_buff = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ); WCHAR *new_buff = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) );
if (new_buff) if (new_buff)
@ -1067,7 +1067,6 @@ HINF WINAPI SetupOpenInfFileW( PCWSTR name, PCWSTR class, DWORD style, UINT *err
handle = CreateFileW( path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); handle = CreateFileW( path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 );
} }
} }
if (handle != INVALID_HANDLE_VALUE) if (handle != INVALID_HANDLE_VALUE)
{ {
file = parse_file( handle, class, error ); file = parse_file( handle, class, error );