Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
0ed51690
Commit
0ed51690
authored
Oct 20, 2008
by
James Hawkins
Committed by
Alexandre Julliard
Oct 20, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Only check the file signature if the candidate file is not a directory.
parent
1fb22654
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
14 deletions
+10
-14
appsearch.c
dlls/msi/appsearch.c
+9
-10
package.c
dlls/msi/tests/package.c
+1
-4
No files found.
dlls/msi/appsearch.c
View file @
0ed51690
...
...
@@ -760,18 +760,17 @@ static UINT ACTION_RecurseSearchDirectory(MSIPACKAGE *package, LPWSTR *appValue,
hFind
=
FindFirstFileW
(
buf
,
&
findData
);
if
(
hFind
!=
INVALID_HANDLE_VALUE
)
{
BOOL
matches
;
/* assuming Signature can't contain wildcards for the file name,
* so don't bother with FindNextFileW here.
*/
rc
=
ACTION_FileMatchesSig
(
sig
,
&
findData
,
buf
,
&
matches
);
if
(
rc
==
ERROR_SUCCESS
&&
matches
)
if
(
!
(
findData
.
dwFileAttributes
&
FILE_ATTRIBUTE_DIRECTORY
))
{
TRACE
(
"found file, returning %s
\n
"
,
debugstr_w
(
buf
));
*
appValue
=
buf
;
}
BOOL
matches
;
rc
=
ACTION_FileMatchesSig
(
sig
,
&
findData
,
buf
,
&
matches
);
if
(
rc
==
ERROR_SUCCESS
&&
matches
)
{
TRACE
(
"found file, returning %s
\n
"
,
debugstr_w
(
buf
));
*
appValue
=
buf
;
}
}
FindClose
(
hFind
);
}
...
...
dlls/msi/tests/package.c
View file @
0ed51690
...
...
@@ -7163,10 +7163,7 @@ static void test_appsearch_drlocator(void)
size
=
MAX_PATH
;
r
=
MsiGetPropertyA
(
hpkg
,
"SIGPROP6"
,
prop
,
&
size
);
ok
(
r
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %d
\n
"
,
r
);
todo_wine
{
ok
(
!
lstrcmpA
(
prop
,
""
),
"Expected
\"\"
, got
\"
%s
\"\n
"
,
prop
);
}
ok
(
!
lstrcmpA
(
prop
,
""
),
"Expected
\"\"
, got
\"
%s
\"\n
"
,
prop
);
size
=
MAX_PATH
;
sprintf
(
path
,
"%s
\\
one
\\
two
\\
three
\\
FileName2"
,
CURR_DIR
);
...
...
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