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
9d46ba41
Commit
9d46ba41
authored
Nov 12, 2010
by
Hans Leidekker
Committed by
Alexandre Julliard
Nov 12, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Don't use a temporary directory for local assemblies.
parent
41bd5d4e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
action.c
dlls/msi/action.c
+1
-1
files.c
dlls/msi/files.c
+6
-4
No files found.
dlls/msi/action.c
View file @
9d46ba41
...
...
@@ -2170,7 +2170,7 @@ static void set_target_path( MSIPACKAGE *package, MSIFILE *file )
TRACE
(
"file %s is named %s
\n
"
,
debugstr_w
(
file
->
File
),
debugstr_w
(
file
->
FileName
));
msi_free
(
file
->
TargetPath
);
if
(
assembly
)
if
(
assembly
&&
!
assembly
->
application
)
{
if
(
!
assembly
->
tempdir
)
assembly
->
tempdir
=
get_temp_dir
();
file
->
TargetPath
=
build_directory_name
(
2
,
assembly
->
tempdir
,
file
->
FileName
);
...
...
dlls/msi/files.c
View file @
9d46ba41
...
...
@@ -186,9 +186,10 @@ static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action,
return
FALSE
;
msi_file_update_ui
(
package
,
f
,
szInstallFiles
);
if
(
!
f
->
Component
->
assembly
)
if
(
!
f
->
Component
->
assembly
||
f
->
Component
->
assembly
->
application
)
{
msi_create_directory
(
package
,
f
->
Component
->
Directory
);
}
*
path
=
strdupW
(
f
->
TargetPath
);
*
attrs
=
f
->
Attributes
;
}
...
...
@@ -268,9 +269,10 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package)
TRACE
(
"copying %s to %s
\n
"
,
debugstr_w
(
source
),
debugstr_w
(
file
->
TargetPath
));
msi_file_update_ui
(
package
,
file
,
szInstallFiles
);
if
(
!
file
->
Component
->
assembly
)
if
(
!
file
->
Component
->
assembly
||
file
->
Component
->
assembly
->
application
)
{
msi_create_directory
(
package
,
file
->
Component
->
Directory
);
}
rc
=
copy_install_file
(
package
,
file
,
source
);
if
(
rc
!=
ERROR_SUCCESS
)
{
...
...
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