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
5b828212
Commit
5b828212
authored
Feb 07, 2007
by
James Hawkins
Committed by
Alexandre Julliard
Feb 08, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Don't skip files continued from a previous cabinet.
parent
3ea059c9
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
44 additions
and
1 deletion
+44
-1
files.c
dlls/msi/files.c
+1
-1
install.c
dlls/msi/tests/install.c
+43
-0
No files found.
dlls/msi/files.c
View file @
5b828212
...
...
@@ -716,7 +716,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package)
LIST_FOR_EACH_ENTRY
(
file
,
&
package
->
files
,
MSIFILE
,
entry
)
{
if
(
file
->
state
!=
msifs_missing
&&
file
->
state
!=
msifs_overwrite
)
if
(
file
->
state
!=
msifs_missing
&&
!
mi
->
is_continuous
&&
file
->
state
!=
msifs_overwrite
)
continue
;
if
(
file
->
Sequence
>
mi
->
last_sequence
||
mi
->
is_continuous
||
...
...
dlls/msi/tests/install.c
View file @
5b828212
...
...
@@ -214,6 +214,13 @@ static const CHAR mm_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tV
"Media
\t
DiskId
\n
"
"1
\t
3
\t\t
test1.cab
\t
DISK1
\t\n
"
;
static
const
CHAR
ss_media_dat
[]
=
"DiskId
\t
LastSequence
\t
DiskPrompt
\t
Cabinet
\t
VolumeLabel
\t
Source
\n
"
"i2
\t
i4
\t
L64
\t
S255
\t
S32
\t
S72
\n
"
"Media
\t
DiskId
\n
"
"1
\t
2
\t\t
test1.cab
\t
DISK1
\t\n
"
"2
\t
2
\t\t
test2.cab
\t
DISK2
\t\n
"
"3
\t
12
\t\t
test3.cab
\t
DISK3
\t\n
"
;
typedef
struct
_msi_table
{
const
CHAR
*
filename
;
...
...
@@ -286,6 +293,18 @@ static const msi_table mm_tables[] =
ADD_TABLE
(
property
),
};
static
const
msi_table
ss_tables
[]
=
{
ADD_TABLE
(
cc_component
),
ADD_TABLE
(
directory
),
ADD_TABLE
(
cc_feature
),
ADD_TABLE
(
cc_feature_comp
),
ADD_TABLE
(
cc_file
),
ADD_TABLE
(
install_exec_seq
),
ADD_TABLE
(
ss_media
),
ADD_TABLE
(
property
),
};
/* cabinet definitions */
/* make the max size large so there is only one cab file */
...
...
@@ -1021,6 +1040,29 @@ static void test_mixedmedia(void)
DeleteFile
(
msifile
);
}
static
void
test_samesequence
(
void
)
{
UINT
r
;
create_cc_test_files
();
create_database
(
msifile
,
ss_tables
,
sizeof
(
ss_tables
)
/
sizeof
(
msi_table
));
MsiSetInternalUI
(
INSTALLUILEVEL_NONE
,
NULL
);
r
=
MsiInstallProductA
(
msifile
,
NULL
);
todo_wine
{
ok
(
r
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %u
\n
"
,
r
);
ok
(
delete_pf
(
"msitest
\\
augustus"
,
TRUE
),
"File not installed
\n
"
);
ok
(
delete_pf
(
"msitest
\\
caesar"
,
TRUE
),
"File not installed
\n
"
);
}
ok
(
delete_pf
(
"msitest
\\
maximus"
,
TRUE
),
"File not installed
\n
"
);
ok
(
delete_pf
(
"msitest"
,
FALSE
),
"File not installed
\n
"
);
delete_cab_files
();
DeleteFile
(
msifile
);
}
START_TEST
(
install
)
{
DWORD
len
;
...
...
@@ -1044,6 +1086,7 @@ START_TEST(install)
test_continuouscabs
();
test_caborder
();
test_mixedmedia
();
test_samesequence
();
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