Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 07:56:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix 4 setupapi parser winetests

Browse source 
svn path=/trunk/; revision=40602
This commit is contained in:
Christoph von Wittich 2009-04-20 06:13:00 +00:00
parent 0856d51609
commit 3103b957bf
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
reactos/dll/win32/setupapi/parser.c
View file

@ -1494,11 +1494,9 @@ BOOL WINAPI SetupGetLineByIndexW( HINF hinf, PCWSTR section, DWORD index, INFCON
struct inf_file *file = hinf; struct inf_file *file = hinf;
int section_index; int section_index;
SetLastError( ERROR_SECTION_NOT_FOUND );
for (file = hinf; file; file = file->next) for (file = hinf; file; file = file->next)
{ {
if ((section_index = find_section( file, section )) == -1) continue; if ((section_index = find_section( file, section )) == -1) continue;
SetLastError( ERROR_LINE_NOT_FOUND );
if (index < file->sections[section_index]->nb_lines) if (index < file->sections[section_index]->nb_lines)
{ {
context->Inf = hinf; context->Inf = hinf;
@ -1513,6 +1511,7 @@ BOOL WINAPI SetupGetLineByIndexW( HINF hinf, PCWSTR section, DWORD index, INFCON
index -= file->sections[section_index]->nb_lines; index -= file->sections[section_index]->nb_lines;
} }
TRACE( "(%p,%s) not found\n", hinf, debugstr_w(section) ); TRACE( "(%p,%s) not found\n", hinf, debugstr_w(section) );
SetLastError( ERROR_LINE_NOT_FOUND );
return FALSE; return FALSE;
} }
@ -1554,7 +1553,6 @@ BOOL WINAPI SetupFindFirstLineW( HINF hinf, PCWSTR section, PCWSTR key, INFCONTE
struct inf_file *file; struct inf_file *file;
int section_index; int section_index;
SetLastError( ERROR_SECTION_NOT_FOUND );
for (file = hinf; file; file = file->next) for (file = hinf; file; file = file->next)
{ {
if ((section_index = find_section( file, section )) == -1) continue; if ((section_index = find_section( file, section )) == -1) continue;
@ -1567,7 +1565,6 @@ BOOL WINAPI SetupFindFirstLineW( HINF hinf, PCWSTR section, PCWSTR key, INFCONTE
ctx.Line = -1; ctx.Line = -1;
return SetupFindNextMatchLineW( &ctx, key, context ); return SetupFindNextMatchLineW( &ctx, key, context );
} }
SetLastError( ERROR_LINE_NOT_FOUND ); /* found at least one section */
if (file->sections[section_index]->nb_lines) if (file->sections[section_index]->nb_lines)
{ {
context->Inf = hinf; context->Inf = hinf;
@ -1581,6 +1578,7 @@ BOOL WINAPI SetupFindFirstLineW( HINF hinf, PCWSTR section, PCWSTR key, INFCONTE
} }
} }
TRACE( "(%p,%s,%s): not found\n", hinf, debugstr_w(section), debugstr_w(key) ); TRACE( "(%p,%s,%s): not found\n", hinf, debugstr_w(section), debugstr_w(key) );
SetLastError( ERROR_LINE_NOT_FOUND );
return FALSE; return FALSE;
} }