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
2750ed16
Commit
2750ed16
authored
Feb 11, 2008
by
James Hawkins
Committed by
Alexandre Julliard
Feb 11, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Don't check for the existence of the msi package when running a concurrent install.
parent
a8d87a86
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
custom.c
dlls/msi/custom.c
+0
-6
install.c
dlls/msi/tests/install.c
+9
-3
No files found.
dlls/msi/custom.c
View file @
2750ed16
...
@@ -857,12 +857,6 @@ static UINT HANDLE_CustomType23(MSIPACKAGE *package, LPCWSTR source,
...
@@ -857,12 +857,6 @@ static UINT HANDLE_CustomType23(MSIPACKAGE *package, LPCWSTR source,
lstrcatW
(
package_path
,
backslash
);
lstrcatW
(
package_path
,
backslash
);
lstrcatW
(
package_path
,
source
);
lstrcatW
(
package_path
,
source
);
if
(
GetFileAttributesW
(
package_path
)
==
INVALID_FILE_ATTRIBUTES
)
{
ERR
(
"Source package does not exist: %s
\n
"
,
debugstr_w
(
package_path
));
return
ERROR_FUNCTION_FAILED
;
}
TRACE
(
"Installing package %s concurrently
\n
"
,
debugstr_w
(
package_path
));
TRACE
(
"Installing package %s concurrently
\n
"
,
debugstr_w
(
package_path
));
info
=
do_msidbCAConcurrentInstall
(
package
,
type
,
package_path
,
target
,
action
);
info
=
do_msidbCAConcurrentInstall
(
package
,
type
,
package_path
,
target
,
action
);
...
...
dlls/msi/tests/install.c
View file @
2750ed16
...
@@ -352,7 +352,7 @@ static const CHAR ci_install_exec_seq_dat[] = "Action\tCondition\tSequence\n"
...
@@ -352,7 +352,7 @@ static const CHAR ci_install_exec_seq_dat[] = "Action\tCondition\tSequence\n"
static
const
CHAR
ci_custom_action_dat
[]
=
"Action
\t
Type
\t
Source
\t
Target
\t
ISComments
\n
"
static
const
CHAR
ci_custom_action_dat
[]
=
"Action
\t
Type
\t
Source
\t
Target
\t
ISComments
\n
"
"s72
\t
i2
\t
S64
\t
S0
\t
S255
\n
"
"s72
\t
i2
\t
S64
\t
S0
\t
S255
\n
"
"CustomAction
\t
Action
\n
"
"CustomAction
\t
Action
\n
"
"RunInstall
\t
23
\t
msitest
\\
concurrent.msi
\t
MYPROP=[UILevel]
\t\n
"
;
"RunInstall
\t
87
\t
msitest
\\
concurrent.msi
\t
MYPROP=[UILevel]
\t\n
"
;
static
const
CHAR
ci_component_dat
[]
=
"Component
\t
ComponentId
\t
Directory_
\t
Attributes
\t
Condition
\t
KeyPath
\n
"
static
const
CHAR
ci_component_dat
[]
=
"Component
\t
ComponentId
\t
Directory_
\t
Attributes
\t
Condition
\t
KeyPath
\n
"
"s72
\t
S38
\t
s72
\t
i2
\t
S255
\t
S72
\n
"
"s72
\t
S38
\t
s72
\t
i2
\t
S255
\t
S72
\n
"
...
@@ -1848,9 +1848,15 @@ static void test_concurrentinstall(void)
...
@@ -1848,9 +1848,15 @@ static void test_concurrentinstall(void)
ok
(
delete_pf
(
"msitest
\\
augustus"
,
TRUE
),
"File not installed
\n
"
);
ok
(
delete_pf
(
"msitest
\\
augustus"
,
TRUE
),
"File not installed
\n
"
);
ok
(
delete_pf
(
"msitest"
,
FALSE
),
"File not installed
\n
"
);
ok
(
delete_pf
(
"msitest"
,
FALSE
),
"File not installed
\n
"
);
/* Delete the files in the temp (current) folder */
DeleteFile
(
msifile
);
DeleteFile
(
path
);
DeleteFile
(
path
);
r
=
MsiInstallProductA
(
msifile
,
NULL
);
ok
(
r
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %u
\n
"
,
r
);
ok
(
delete_pf
(
"msitest
\\
maximus"
,
TRUE
),
"File not installed
\n
"
);
ok
(
!
delete_pf
(
"msitest
\\
augustus"
,
TRUE
),
"File installed
\n
"
);
ok
(
delete_pf
(
"msitest"
,
FALSE
),
"File not installed
\n
"
);
DeleteFile
(
msifile
);
DeleteFile
(
"msitest
\\
msitest
\\
augustus"
);
DeleteFile
(
"msitest
\\
msitest
\\
augustus"
);
DeleteFile
(
"msitest
\\
maximus"
);
DeleteFile
(
"msitest
\\
maximus"
);
RemoveDirectory
(
"msitest
\\
msitest"
);
RemoveDirectory
(
"msitest
\\
msitest"
);
...
...
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