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
bd4bc161
Commit
bd4bc161
authored
Nov 17, 2009
by
Hans Leidekker
Committed by
Alexandre Julliard
Nov 17, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Don't set the ALLUSERS property.
parent
fd549aa2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
71 additions
and
1 deletion
+71
-1
action.c
dlls/msi/action.c
+0
-1
install.c
dlls/msi/tests/install.c
+71
-0
No files found.
dlls/msi/action.c
View file @
bd4bc161
...
...
@@ -716,7 +716,6 @@ static UINT msi_set_context(MSIPACKAGE *package)
package
->
Context
=
MSIINSTALLCONTEXT_MACHINE
;
}
MSI_SetPropertyW
(
package
,
szAllUsers
,
szOne
);
return
ERROR_SUCCESS
;
}
...
...
dlls/msi/tests/install.c
View file @
bd4bc161
...
...
@@ -920,6 +920,32 @@ static const CHAR ip_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComm
"CustomAction
\t
Action
\n
"
"TestInstalledProp
\t
19
\t\t
Test failed
\t\n
"
;
static
const
CHAR
aup_install_exec_seq_dat
[]
=
"Action
\t
Condition
\t
Sequence
\n
"
"s72
\t
S255
\t
I2
\n
"
"InstallExecuteSequence
\t
Action
\n
"
"CostFinalize
\t\t
1000
\n
"
"ValidateProductID
\t\t
700
\n
"
"CostInitialize
\t\t
800
\n
"
"FileCost
\t\t
900
\n
"
"RemoveFiles
\t\t
3500
\n
"
"InstallFiles
\t\t
4000
\n
"
"RegisterUser
\t\t
6000
\n
"
"RegisterProduct
\t\t
6100
\n
"
"PublishFeatures
\t\t
6300
\n
"
"PublishProduct
\t\t
6400
\n
"
"InstallFinalize
\t\t
6600
\n
"
"InstallInitialize
\t\t
1500
\n
"
"ProcessComponents
\t\t
1600
\n
"
"UnpublishFeatures
\t\t
1800
\n
"
"InstallValidate
\t\t
1400
\n
"
"LaunchConditions
\t\t
100
\n
"
"TestAllUsersProp
\t
ALLUSERS AND NOT REMOVE
\t
50
\n
"
;
static
const
CHAR
aup_custom_action_dat
[]
=
"Action
\t
Type
\t
Source
\t
Target
\t
ISComments
\n
"
"s72
\t
i2
\t
S64
\t
S0
\t
S255
\n
"
"CustomAction
\t
Action
\n
"
"TestAllUsersProp
\t
19
\t\t
Test failed
\t\n
"
;
typedef
struct
_msi_table
{
const
CHAR
*
filename
;
...
...
@@ -1547,6 +1573,19 @@ static const msi_table ip_tables[] =
ADD_TABLE
(
property
)
};
static
const
msi_table
aup_tables
[]
=
{
ADD_TABLE
(
component
),
ADD_TABLE
(
directory
),
ADD_TABLE
(
feature
),
ADD_TABLE
(
feature_comp
),
ADD_TABLE
(
file
),
ADD_TABLE
(
aup_install_exec_seq
),
ADD_TABLE
(
aup_custom_action
),
ADD_TABLE
(
media
),
ADD_TABLE
(
property
)
};
static
const
msi_table
fiu_tables
[]
=
{
ADD_TABLE
(
rof_component
),
...
...
@@ -6730,6 +6769,37 @@ static void test_installed_prop(void)
delete_test_files
();
}
static
void
test_allusers_prop
(
void
)
{
UINT
r
;
create_test_files
();
create_database
(
msifile
,
aup_tables
,
sizeof
(
aup_tables
)
/
sizeof
(
msi_table
));
MsiSetInternalUI
(
INSTALLUILEVEL_NONE
,
NULL
);
r
=
MsiInstallProductA
(
msifile
,
"FULL=1"
);
ok
(
r
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %u
\n
"
,
r
);
ok
(
delete_pf
(
"msitest
\\
cabout
\\
new
\\
five.txt"
,
TRUE
),
"File not installed
\n
"
);
ok
(
delete_pf
(
"msitest
\\
cabout
\\
new"
,
FALSE
),
"File not installed
\n
"
);
ok
(
delete_pf
(
"msitest
\\
cabout
\\
four.txt"
,
TRUE
),
"File not installed
\n
"
);
ok
(
delete_pf
(
"msitest
\\
cabout"
,
FALSE
),
"File not installed
\n
"
);
ok
(
delete_pf
(
"msitest
\\
changed
\\
three.txt"
,
TRUE
),
"File not installed
\n
"
);
ok
(
delete_pf
(
"msitest
\\
changed"
,
FALSE
),
"File not installed
\n
"
);
ok
(
delete_pf
(
"msitest
\\
first
\\
two.txt"
,
TRUE
),
"File not installed
\n
"
);
ok
(
delete_pf
(
"msitest
\\
first"
,
FALSE
),
"File not installed
\n
"
);
ok
(
delete_pf
(
"msitest
\\
filename"
,
TRUE
),
"File not installed
\n
"
);
ok
(
delete_pf
(
"msitest
\\
one.txt"
,
TRUE
),
"File installed
\n
"
);
ok
(
delete_pf
(
"msitest
\\
service.exe"
,
TRUE
),
"File not installed
\n
"
);
ok
(
delete_pf
(
"msitest"
,
FALSE
),
"File not installed
\n
"
);
r
=
MsiInstallProductA
(
msifile
,
"REMOVE=ALL"
);
ok
(
r
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %u
\n
"
,
r
);
delete_test_files
();
}
static
char
session_manager
[]
=
"System
\\
CurrentControlSet
\\
Control
\\
Session Manager"
;
static
char
rename_ops
[]
=
"PendingFileRenameOperations"
;
...
...
@@ -7065,6 +7135,7 @@ START_TEST(install)
test_file_in_use
();
test_file_in_use_cab
();
test_MsiSetExternalUI
();
test_allusers_prop
();
DeleteFileA
(
log_file
);
...
...
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