Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
50e81d0e
Commit
50e81d0e
authored
Mar 28, 2008
by
Paul Vriens
Committed by
Alexandre Julliard
Mar 28, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
setupapi: Fix some last errors for SetupFindFirstLine.
parent
84308ffc
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
5 deletions
+1
-5
parser.c
dlls/setupapi/parser.c
+1
-2
parser.c
dlls/setupapi/tests/parser.c
+0
-3
No files found.
dlls/setupapi/parser.c
View file @
50e81d0e
...
@@ -1371,7 +1371,6 @@ BOOL WINAPI SetupFindFirstLineW( HINF hinf, PCWSTR section, PCWSTR key, INFCONTE
...
@@ -1371,7 +1371,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
;
...
@@ -1384,7 +1383,6 @@ BOOL WINAPI SetupFindFirstLineW( HINF hinf, PCWSTR section, PCWSTR key, INFCONTE
...
@@ -1384,7 +1383,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
;
...
@@ -1398,6 +1396,7 @@ BOOL WINAPI SetupFindFirstLineW( HINF hinf, PCWSTR section, PCWSTR key, INFCONTE
...
@@ -1398,6 +1396,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
;
}
}
...
...
dlls/setupapi/tests/parser.c
View file @
50e81d0e
...
@@ -499,14 +499,12 @@ static void test_GLE(void)
...
@@ -499,14 +499,12 @@ static void test_GLE(void)
SetLastError
(
0xdeadbeef
);
SetLastError
(
0xdeadbeef
);
retb
=
SetupFindFirstLineA
(
hinf
,
"ImNotThere"
,
NULL
,
&
context
);
retb
=
SetupFindFirstLineA
(
hinf
,
"ImNotThere"
,
NULL
,
&
context
);
ok
(
!
retb
,
"Expected failure
\n
"
);
ok
(
!
retb
,
"Expected failure
\n
"
);
todo_wine
ok
(
GetLastError
()
==
ERROR_LINE_NOT_FOUND
,
ok
(
GetLastError
()
==
ERROR_LINE_NOT_FOUND
,
"Expected ERROR_LINE_NOT_FOUND, got %08x
\n
"
,
GetLastError
());
"Expected ERROR_LINE_NOT_FOUND, got %08x
\n
"
,
GetLastError
());
SetLastError
(
0xdeadbeef
);
SetLastError
(
0xdeadbeef
);
retb
=
SetupFindFirstLineA
(
hinf
,
"ImNotThere"
,
"ImNotThere"
,
&
context
);
retb
=
SetupFindFirstLineA
(
hinf
,
"ImNotThere"
,
"ImNotThere"
,
&
context
);
ok
(
!
retb
,
"Expected failure
\n
"
);
ok
(
!
retb
,
"Expected failure
\n
"
);
todo_wine
ok
(
GetLastError
()
==
ERROR_LINE_NOT_FOUND
,
ok
(
GetLastError
()
==
ERROR_LINE_NOT_FOUND
,
"Expected ERROR_LINE_NOT_FOUND, got %08x
\n
"
,
GetLastError
());
"Expected ERROR_LINE_NOT_FOUND, got %08x
\n
"
,
GetLastError
());
...
@@ -555,7 +553,6 @@ static void test_GLE(void)
...
@@ -555,7 +553,6 @@ static void test_GLE(void)
SetLastError
(
0xdeadbeef
);
SetLastError
(
0xdeadbeef
);
retb
=
SetupGetLineTextA
(
NULL
,
hinf
,
"ImNotThere"
,
"ImNotThere"
,
buf
,
bufsize
,
&
retsize
);
retb
=
SetupGetLineTextA
(
NULL
,
hinf
,
"ImNotThere"
,
"ImNotThere"
,
buf
,
bufsize
,
&
retsize
);
ok
(
!
retb
,
"Expected failure
\n
"
);
ok
(
!
retb
,
"Expected failure
\n
"
);
todo_wine
ok
(
GetLastError
()
==
ERROR_LINE_NOT_FOUND
,
ok
(
GetLastError
()
==
ERROR_LINE_NOT_FOUND
,
"Expected ERROR_LINE_NOT_FOUND, got %08x
\n
"
,
GetLastError
());
"Expected ERROR_LINE_NOT_FOUND, got %08x
\n
"
,
GetLastError
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment