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
01433f0f
Commit
01433f0f
authored
May 17, 2011
by
Hans Leidekker
Committed by
Alexandre Julliard
May 17, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Make sure that the target root directory has a trailing backslash.
parent
c5ab1c37
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
1 deletion
+20
-1
action.c
dlls/msi/action.c
+20
-1
No files found.
dlls/msi/action.c
View file @
01433f0f
...
...
@@ -2990,6 +2990,25 @@ void msi_clean_path( WCHAR *p )
}
}
static
WCHAR
*
get_target_dir_property
(
MSIDATABASE
*
db
)
{
int
len
;
WCHAR
*
path
,
*
target_dir
=
msi_dup_property
(
db
,
szTargetDir
);
if
(
!
target_dir
)
return
NULL
;
len
=
strlenW
(
target_dir
);
if
(
target_dir
[
len
-
1
]
==
'\\'
)
return
target_dir
;
if
((
path
=
msi_alloc
(
(
len
+
2
)
*
sizeof
(
WCHAR
)
)))
{
strcpyW
(
path
,
target_dir
);
path
[
len
]
=
'\\'
;
path
[
len
+
1
]
=
0
;
}
msi_free
(
target_dir
);
return
path
;
}
void
msi_resolve_target_folder
(
MSIPACKAGE
*
package
,
const
WCHAR
*
name
,
BOOL
load_prop
)
{
FolderList
*
fl
;
...
...
@@ -3002,7 +3021,7 @@ void msi_resolve_target_folder( MSIPACKAGE *package, const WCHAR *name, BOOL loa
if
(
!
strcmpW
(
folder
->
Directory
,
szTargetDir
))
/* special resolving for target root dir */
{
if
(
!
load_prop
||
!
(
path
=
msi_dup_property
(
package
->
db
,
szTargetDir
)))
if
(
!
load_prop
||
!
(
path
=
get_target_dir_property
(
package
->
db
)))
{
path
=
msi_dup_property
(
package
->
db
,
szRootDrive
);
}
...
...
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