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
ebf27335
Commit
ebf27335
authored
Nov 20, 2006
by
Mike McCormack
Committed by
Alexandre Julliard
Nov 20, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Clean up parameters of msi_media_get_disk_info().
parent
18db6078
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
8 deletions
+7
-8
files.c
dlls/msi/files.c
+7
-8
No files found.
dlls/msi/files.c
View file @
ebf27335
...
@@ -243,9 +243,8 @@ static void msi_file_update_ui( MSIPACKAGE *package, MSIFILE *f, const WCHAR *ac
...
@@ -243,9 +243,8 @@ static void msi_file_update_ui( MSIPACKAGE *package, MSIFILE *f, const WCHAR *ac
ui_progress
(
package
,
2
,
f
->
FileSize
,
0
,
0
);
ui_progress
(
package
,
2
,
f
->
FileSize
,
0
,
0
);
}
}
static
UINT
msi_media_get_disk_info
(
CabData
*
data
)
static
UINT
msi_media_get_disk_info
(
MSIPACKAGE
*
package
,
struct
media_info
*
mi
)
{
{
MSIPACKAGE
*
package
=
data
->
package
;
MSIRECORD
*
row
;
MSIRECORD
*
row
;
LPWSTR
ptr
;
LPWSTR
ptr
;
...
@@ -254,18 +253,18 @@ static UINT msi_media_get_disk_info( CabData *data )
...
@@ -254,18 +253,18 @@ static UINT msi_media_get_disk_info( CabData *data )
'`'
,
'M'
,
'e'
,
'd'
,
'i'
,
'a'
,
'`'
,
' '
,
'W'
,
'H'
,
'E'
,
'R'
,
'E'
,
' '
,
'`'
,
'M'
,
'e'
,
'd'
,
'i'
,
'a'
,
'`'
,
' '
,
'W'
,
'H'
,
'E'
,
'R'
,
'E'
,
' '
,
'`'
,
'D'
,
'i'
,
's'
,
'k'
,
'I'
,
'd'
,
'`'
,
' '
,
'='
,
' '
,
'%'
,
'i'
,
0
};
'`'
,
'D'
,
'i'
,
's'
,
'k'
,
'I'
,
'd'
,
'`'
,
' '
,
'='
,
' '
,
'%'
,
'i'
,
0
};
row
=
MSI_QueryGetRecord
(
package
->
db
,
query
,
data
->
mi
->
disk_id
);
row
=
MSI_QueryGetRecord
(
package
->
db
,
query
,
mi
->
disk_id
);
if
(
!
row
)
if
(
!
row
)
{
{
TRACE
(
"Unable to query row
\n
"
);
TRACE
(
"Unable to query row
\n
"
);
return
ERROR_FUNCTION_FAILED
;
return
ERROR_FUNCTION_FAILED
;
}
}
data
->
mi
->
disk_prompt
=
strdupW
(
MSI_RecordGetString
(
row
,
3
));
mi
->
disk_prompt
=
strdupW
(
MSI_RecordGetString
(
row
,
3
));
data
->
mi
->
cabinet
=
strdupW
(
MSI_RecordGetString
(
row
,
4
));
mi
->
cabinet
=
strdupW
(
MSI_RecordGetString
(
row
,
4
));
ptr
=
strrchrW
(
data
->
mi
->
source
,
'\\'
)
+
1
;
ptr
=
strrchrW
(
mi
->
source
,
'\\'
)
+
1
;
lstrcpyW
(
ptr
,
data
->
mi
->
cabinet
);
lstrcpyW
(
ptr
,
mi
->
cabinet
);
msiobj_release
(
&
row
->
hdr
);
msiobj_release
(
&
row
->
hdr
);
return
ERROR_SUCCESS
;
return
ERROR_SUCCESS
;
...
@@ -295,7 +294,7 @@ static INT_PTR cabinet_notify(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin)
...
@@ -295,7 +294,7 @@ static INT_PTR cabinet_notify(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin)
mi
->
disk_id
++
;
mi
->
disk_id
++
;
mi
->
is_continuous
=
TRUE
;
mi
->
is_continuous
=
TRUE
;
rc
=
msi_media_get_disk_info
(
data
);
rc
=
msi_media_get_disk_info
(
data
->
package
,
mi
);
if
(
rc
!=
ERROR_SUCCESS
)
if
(
rc
!=
ERROR_SUCCESS
)
{
{
ERR
(
"Failed to get next cabinet information: %d
\n
"
,
rc
);
ERR
(
"Failed to get next cabinet information: %d
\n
"
,
rc
);
...
...
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