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
2d0ff974
Commit
2d0ff974
authored
Mar 11, 2008
by
James Hawkins
Committed by
Alexandre Julliard
Mar 11, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Ignore the custom action type 51 if the source field is empty.
parent
776a7d70
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
68 additions
and
0 deletions
+68
-0
custom.c
dlls/msi/custom.c
+3
-0
install.c
dlls/msi/tests/install.c
+65
-0
No files found.
dlls/msi/custom.c
View file @
2d0ff974
...
...
@@ -331,6 +331,9 @@ UINT ACTION_CustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script, BOOL
msi_free
(
deformated
);
break
;
case
51
:
/* Property set with formatted text. */
if
(
!
source
)
break
;
deformat_string
(
package
,
target
,
&
deformated
);
rc
=
MSI_SetPropertyW
(
package
,
source
,
deformated
);
msi_free
(
deformated
);
...
...
dlls/msi/tests/install.c
View file @
2d0ff974
...
...
@@ -603,6 +603,36 @@ static const CHAR wrv_registry_dat[] = "Registry\tRoot\tKey\tName\tValue\tCompon
"Registry
\t
Registry
\n
"
"regdata
\t
2
\t
SOFTWARE
\\
Wine
\\
msitest
\t
Value
\t
[~]one[~]two[~]three
\t
augustus"
;
static
const
CHAR
ca51_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
"
"Component
\t
Component
\n
"
"augustus
\t\t
MSITESTDIR
\t
0
\t
MYPROP=42
\t
augustus
\n
"
;
static
const
CHAR
ca51_install_exec_seq_dat
[]
=
"Action
\t
Condition
\t
Sequence
\n
"
"s72
\t
S255
\t
I2
\n
"
"InstallExecuteSequence
\t
Action
\n
"
"ValidateProductID
\t\t
700
\n
"
"GoodSetProperty
\t\t
725
\n
"
"BadSetProperty
\t\t
750
\n
"
"CostInitialize
\t\t
800
\n
"
"FileCost
\t\t
900
\n
"
"CostFinalize
\t\t
1000
\n
"
"InstallValidate
\t\t
1400
\n
"
"InstallInitialize
\t\t
1500
\n
"
"ProcessComponents
\t\t
1600
\n
"
"UnpublishFeatures
\t\t
1800
\n
"
"InstallFiles
\t\t
4000
\n
"
"RegisterProduct
\t\t
6100
\n
"
"PublishFeatures
\t\t
6300
\n
"
"PublishProduct
\t\t
6400
\n
"
"InstallFinalize
\t\t
6600"
;
static
const
CHAR
ca51_custom_action_dat
[]
=
"Action
\t
Type
\t
Source
\t
Target
\n
"
"s72
\t
i2
\t
S64
\t
S0
\n
"
"CustomAction
\t
Action
\n
"
"GoodSetProperty
\t
51
\t
MYPROP
\t
42
\n
"
"BadSetProperty
\t
51
\t\t
MYPROP
\n
"
;
typedef
struct
_msi_table
{
const
CHAR
*
filename
;
...
...
@@ -928,6 +958,19 @@ static const msi_table sf_tables[] =
ADD_TABLE
(
property
),
};
static
const
msi_table
ca51_tables
[]
=
{
ADD_TABLE
(
ca51_component
),
ADD_TABLE
(
directory
),
ADD_TABLE
(
rof_feature
),
ADD_TABLE
(
ci2_feature_comp
),
ADD_TABLE
(
ci2_file
),
ADD_TABLE
(
ca51_install_exec_seq
),
ADD_TABLE
(
rof_media
),
ADD_TABLE
(
property
),
ADD_TABLE
(
ca51_custom_action
),
};
/* cabinet definitions */
/* make the max size large so there is only one cab file */
...
...
@@ -4250,6 +4293,27 @@ static void test_sourcefolder(void)
DeleteFile
(
"augustus"
);
}
static
void
test_customaction51
(
void
)
{
UINT
r
;
CreateDirectoryA
(
"msitest"
,
NULL
);
create_file
(
"msitest
\\
augustus"
,
500
);
create_database
(
msifile
,
ca51_tables
,
sizeof
(
ca51_tables
)
/
sizeof
(
msi_table
));
MsiSetInternalUI
(
INSTALLUILEVEL_NONE
,
NULL
);
r
=
MsiInstallProductA
(
msifile
,
NULL
);
ok
(
r
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %u
\n
"
,
r
);
ok
(
delete_pf
(
"msitest
\\
augustus"
,
TRUE
),
"File installed
\n
"
);
ok
(
delete_pf
(
"msitest"
,
FALSE
),
"File installed
\n
"
);
DeleteFile
(
msifile
);
DeleteFile
(
"msitest
\\
augustus"
);
RemoveDirectory
(
"msitest"
);
}
START_TEST
(
install
)
{
DWORD
len
;
...
...
@@ -4299,6 +4363,7 @@ START_TEST(install)
test_duplicatefiles
();
test_writeregistryvalues
();
test_sourcefolder
();
test_customaction51
();
SetCurrentDirectoryA
(
prev_path
);
}
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