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
094915ae
Commit
094915ae
authored
Jul 12, 2006
by
James Hawkins
Committed by
Alexandre Julliard
Jul 13, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Update the files target paths as well, because a parent directory might have been changed.
parent
724dd10e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
5 deletions
+18
-5
install.c
dlls/msi/install.c
+16
-0
package.c
dlls/msi/tests/package.c
+2
-5
No files found.
dlls/msi/install.c
View file @
094915ae
...
...
@@ -331,6 +331,7 @@ UINT MSI_SetTargetPathW(MSIPACKAGE *package, LPCWSTR szFolder,
LPWSTR
path
=
NULL
;
LPWSTR
path2
=
NULL
;
MSIFOLDER
*
folder
;
MSIFILE
*
file
;
TRACE
(
"(%p %s %s)
\n
"
,
package
,
debugstr_w
(
szFolder
),
debugstr_w
(
szFolderPath
));
...
...
@@ -374,6 +375,21 @@ UINT MSI_SetTargetPathW(MSIPACKAGE *package, LPCWSTR szFolder,
path2
=
resolve_folder
(
package
,
f
->
Directory
,
FALSE
,
TRUE
,
NULL
);
msi_free
(
path2
);
}
LIST_FOR_EACH_ENTRY
(
file
,
&
package
->
files
,
MSIFILE
,
entry
)
{
MSICOMPONENT
*
comp
=
file
->
Component
;
LPWSTR
p
;
if
(
!
comp
)
continue
;
p
=
resolve_folder
(
package
,
comp
->
Directory
,
FALSE
,
FALSE
,
NULL
);
msi_free
(
file
->
TargetPath
);
file
->
TargetPath
=
build_directory_name
(
2
,
p
,
file
->
FileName
);
msi_free
(
p
);
}
}
msi_free
(
path
);
...
...
dlls/msi/tests/package.c
View file @
094915ae
...
...
@@ -499,11 +499,8 @@ static void test_settargetpath(void)
ok
(
r
==
ERROR_SUCCESS
,
"MsiSetTargetPath returned %d
\n
"
,
r
);
query_file_path
(
hpkg
,
"[#TestFile]"
,
buffer
);
todo_wine
{
ok
(
!
lstrcmp
(
buffer
,
"C:
\\
one
\\
two
\\
TestDir
\\
testfile.txt"
),
"Expected C:
\\
one
\\
two
\\
TestDir
\\
testfile.txt, got %s
\n
"
,
buffer
);
}
ok
(
!
lstrcmp
(
buffer
,
"C:
\\
one
\\
two
\\
TestDir
\\
testfile.txt"
),
"Expected C:
\\
one
\\
two
\\
TestDir
\\
testfile.txt, got %s
\n
"
,
buffer
);
MsiCloseHandle
(
hpkg
);
}
...
...
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