Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Zsolt Vadász
wine
Commits
9a0020ad
Commit
9a0020ad
authored
15 years ago
by
Hans Leidekker
Committed by
Alexandre Julliard
15 years ago
Browse files
Options
Downloads
Patches
Plain Diff
msi: Move some helpers to the module where they are used.
parent
29f47299
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dlls/msi/helpers.c
+0
-232
0 additions, 232 deletions
dlls/msi/helpers.c
dlls/msi/msipriv.h
+0
-1
0 additions, 1 deletion
dlls/msi/msipriv.h
dlls/msi/package.c
+232
-1
232 additions, 1 deletion
dlls/msi/package.c
with
232 additions
and
234 deletions
dlls/msi/helpers.c
+
0
−
232
View file @
9a0020ad
...
...
@@ -440,238 +440,6 @@ void msi_free_action_script(MSIPACKAGE *package, UINT script)
package
->
script
->
ActionCount
[
script
]
=
0
;
}
static
void
remove_tracked_tempfiles
(
MSIPACKAGE
*
package
)
{
struct
list
*
item
,
*
cursor
;
LIST_FOR_EACH_SAFE
(
item
,
cursor
,
&
package
->
tempfiles
)
{
MSITEMPFILE
*
temp
=
LIST_ENTRY
(
item
,
MSITEMPFILE
,
entry
);
list_remove
(
&
temp
->
entry
);
TRACE
(
"deleting temp file %s
\n
"
,
debugstr_w
(
temp
->
Path
));
if
(
!
DeleteFileW
(
temp
->
Path
))
ERR
(
"failed to delete %s
\n
"
,
debugstr_w
(
temp
->
Path
));
msi_free
(
temp
->
Path
);
msi_free
(
temp
);
}
}
static
void
free_feature
(
MSIFEATURE
*
feature
)
{
struct
list
*
item
,
*
cursor
;
LIST_FOR_EACH_SAFE
(
item
,
cursor
,
&
feature
->
Children
)
{
FeatureList
*
fl
=
LIST_ENTRY
(
item
,
FeatureList
,
entry
);
list_remove
(
&
fl
->
entry
);
msi_free
(
fl
);
}
LIST_FOR_EACH_SAFE
(
item
,
cursor
,
&
feature
->
Components
)
{
ComponentList
*
cl
=
LIST_ENTRY
(
item
,
ComponentList
,
entry
);
list_remove
(
&
cl
->
entry
);
msi_free
(
cl
);
}
msi_free
(
feature
->
Feature
);
msi_free
(
feature
->
Feature_Parent
);
msi_free
(
feature
->
Directory
);
msi_free
(
feature
->
Description
);
msi_free
(
feature
->
Title
);
msi_free
(
feature
);
}
static
void
free_extension
(
MSIEXTENSION
*
ext
)
{
struct
list
*
item
,
*
cursor
;
LIST_FOR_EACH_SAFE
(
item
,
cursor
,
&
ext
->
verbs
)
{
MSIVERB
*
verb
=
LIST_ENTRY
(
item
,
MSIVERB
,
entry
);
list_remove
(
&
verb
->
entry
);
msi_free
(
verb
->
Verb
);
msi_free
(
verb
->
Command
);
msi_free
(
verb
->
Argument
);
msi_free
(
verb
);
}
msi_free
(
ext
->
Extension
);
msi_free
(
ext
->
ProgIDText
);
msi_free
(
ext
);
}
/* Called when the package is being closed */
void
ACTION_free_package_structures
(
MSIPACKAGE
*
package
)
{
INT
i
;
struct
list
*
item
,
*
cursor
;
TRACE
(
"Freeing package action data
\n
"
);
remove_tracked_tempfiles
(
package
);
LIST_FOR_EACH_SAFE
(
item
,
cursor
,
&
package
->
features
)
{
MSIFEATURE
*
feature
=
LIST_ENTRY
(
item
,
MSIFEATURE
,
entry
);
list_remove
(
&
feature
->
entry
);
free_feature
(
feature
);
}
LIST_FOR_EACH_SAFE
(
item
,
cursor
,
&
package
->
folders
)
{
MSIFOLDER
*
folder
=
LIST_ENTRY
(
item
,
MSIFOLDER
,
entry
);
list_remove
(
&
folder
->
entry
);
msi_free
(
folder
->
Parent
);
msi_free
(
folder
->
Directory
);
msi_free
(
folder
->
TargetDefault
);
msi_free
(
folder
->
SourceLongPath
);
msi_free
(
folder
->
SourceShortPath
);
msi_free
(
folder
->
ResolvedTarget
);
msi_free
(
folder
->
ResolvedSource
);
msi_free
(
folder
->
Property
);
msi_free
(
folder
);
}
LIST_FOR_EACH_SAFE
(
item
,
cursor
,
&
package
->
components
)
{
MSICOMPONENT
*
comp
=
LIST_ENTRY
(
item
,
MSICOMPONENT
,
entry
);
list_remove
(
&
comp
->
entry
);
msi_free
(
comp
->
Component
);
msi_free
(
comp
->
ComponentId
);
msi_free
(
comp
->
Directory
);
msi_free
(
comp
->
Condition
);
msi_free
(
comp
->
KeyPath
);
msi_free
(
comp
->
FullKeypath
);
msi_free
(
comp
);
}
LIST_FOR_EACH_SAFE
(
item
,
cursor
,
&
package
->
files
)
{
MSIFILE
*
file
=
LIST_ENTRY
(
item
,
MSIFILE
,
entry
);
list_remove
(
&
file
->
entry
);
msi_free
(
file
->
File
);
msi_free
(
file
->
FileName
);
msi_free
(
file
->
ShortName
);
msi_free
(
file
->
LongName
);
msi_free
(
file
->
Version
);
msi_free
(
file
->
Language
);
msi_free
(
file
->
TargetPath
);
msi_free
(
file
);
}
/* clean up extension, progid, class and verb structures */
LIST_FOR_EACH_SAFE
(
item
,
cursor
,
&
package
->
classes
)
{
MSICLASS
*
cls
=
LIST_ENTRY
(
item
,
MSICLASS
,
entry
);
list_remove
(
&
cls
->
entry
);
msi_free
(
cls
->
clsid
);
msi_free
(
cls
->
Context
);
msi_free
(
cls
->
Description
);
msi_free
(
cls
->
FileTypeMask
);
msi_free
(
cls
->
IconPath
);
msi_free
(
cls
->
DefInprocHandler
);
msi_free
(
cls
->
DefInprocHandler32
);
msi_free
(
cls
->
Argument
);
msi_free
(
cls
->
ProgIDText
);
msi_free
(
cls
);
}
LIST_FOR_EACH_SAFE
(
item
,
cursor
,
&
package
->
extensions
)
{
MSIEXTENSION
*
ext
=
LIST_ENTRY
(
item
,
MSIEXTENSION
,
entry
);
list_remove
(
&
ext
->
entry
);
free_extension
(
ext
);
}
LIST_FOR_EACH_SAFE
(
item
,
cursor
,
&
package
->
progids
)
{
MSIPROGID
*
progid
=
LIST_ENTRY
(
item
,
MSIPROGID
,
entry
);
list_remove
(
&
progid
->
entry
);
msi_free
(
progid
->
ProgID
);
msi_free
(
progid
->
Description
);
msi_free
(
progid
->
IconPath
);
msi_free
(
progid
);
}
LIST_FOR_EACH_SAFE
(
item
,
cursor
,
&
package
->
mimes
)
{
MSIMIME
*
mt
=
LIST_ENTRY
(
item
,
MSIMIME
,
entry
);
list_remove
(
&
mt
->
entry
);
msi_free
(
mt
->
clsid
);
msi_free
(
mt
->
ContentType
);
msi_free
(
mt
);
}
LIST_FOR_EACH_SAFE
(
item
,
cursor
,
&
package
->
appids
)
{
MSIAPPID
*
appid
=
LIST_ENTRY
(
item
,
MSIAPPID
,
entry
);
list_remove
(
&
appid
->
entry
);
msi_free
(
appid
->
AppID
);
msi_free
(
appid
->
RemoteServerName
);
msi_free
(
appid
->
LocalServer
);
msi_free
(
appid
->
ServiceParameters
);
msi_free
(
appid
->
DllSurrogate
);
msi_free
(
appid
);
}
LIST_FOR_EACH_SAFE
(
item
,
cursor
,
&
package
->
sourcelist_info
)
{
MSISOURCELISTINFO
*
info
=
LIST_ENTRY
(
item
,
MSISOURCELISTINFO
,
entry
);
list_remove
(
&
info
->
entry
);
msi_free
(
info
->
value
);
msi_free
(
info
);
}
LIST_FOR_EACH_SAFE
(
item
,
cursor
,
&
package
->
sourcelist_media
)
{
MSIMEDIADISK
*
info
=
LIST_ENTRY
(
item
,
MSIMEDIADISK
,
entry
);
list_remove
(
&
info
->
entry
);
msi_free
(
info
->
volume_label
);
msi_free
(
info
->
disk_prompt
);
msi_free
(
info
);
}
if
(
package
->
script
)
{
for
(
i
=
0
;
i
<
TOTAL_SCRIPTS
;
i
++
)
msi_free_action_script
(
package
,
i
);
for
(
i
=
0
;
i
<
package
->
script
->
UniqueActionsCount
;
i
++
)
msi_free
(
package
->
script
->
UniqueActions
[
i
]);
msi_free
(
package
->
script
->
UniqueActions
);
msi_free
(
package
->
script
);
}
if
(
package
->
patch
)
{
msi_free
(
package
->
patch
->
patchcode
);
msi_free
(
package
->
patch
->
transforms
);
msi_free
(
package
->
patch
);
}
msi_free
(
package
->
BaseURL
);
msi_free
(
package
->
PackagePath
);
msi_free
(
package
->
ProductCode
);
msi_free
(
package
->
ActionFormat
);
msi_free
(
package
->
LastAction
);
/* cleanup control event subscriptions */
ControlEvent_CleanupSubscriptions
(
package
);
}
/*
* build_directory_name()
*
...
...
This diff is collapsed.
Click to expand it.
dlls/msi/msipriv.h
+
0
−
1
View file @
9a0020ad
...
...
@@ -689,7 +689,6 @@ extern UINT msi_check_patch_applicable( MSIPACKAGE *package, MSISUMMARYINFO *si
/* action internals */
extern
UINT
MSI_InstallPackage
(
MSIPACKAGE
*
,
LPCWSTR
,
LPCWSTR
);
extern
void
ACTION_free_package_structures
(
MSIPACKAGE
*
);
extern
UINT
ACTION_DialogBox
(
MSIPACKAGE
*
,
LPCWSTR
);
extern
UINT
ACTION_ForceReboot
(
MSIPACKAGE
*
package
);
extern
UINT
MSI_Sequence
(
MSIPACKAGE
*
package
,
LPCWSTR
szTable
,
INT
iSequenceMode
);
...
...
This diff is collapsed.
Click to expand it.
dlls/msi/package.c
+
232
−
1
View file @
9a0020ad
...
...
@@ -49,6 +49,237 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
msi
);
static
void
remove_tracked_tempfiles
(
MSIPACKAGE
*
package
)
{
struct
list
*
item
,
*
cursor
;
LIST_FOR_EACH_SAFE
(
item
,
cursor
,
&
package
->
tempfiles
)
{
MSITEMPFILE
*
temp
=
LIST_ENTRY
(
item
,
MSITEMPFILE
,
entry
);
list_remove
(
&
temp
->
entry
);
TRACE
(
"deleting temp file %s
\n
"
,
debugstr_w
(
temp
->
Path
));
if
(
!
DeleteFileW
(
temp
->
Path
))
ERR
(
"failed to delete %s
\n
"
,
debugstr_w
(
temp
->
Path
));
msi_free
(
temp
->
Path
);
msi_free
(
temp
);
}
}
static
void
free_feature
(
MSIFEATURE
*
feature
)
{
struct
list
*
item
,
*
cursor
;
LIST_FOR_EACH_SAFE
(
item
,
cursor
,
&
feature
->
Children
)
{
FeatureList
*
fl
=
LIST_ENTRY
(
item
,
FeatureList
,
entry
);
list_remove
(
&
fl
->
entry
);
msi_free
(
fl
);
}
LIST_FOR_EACH_SAFE
(
item
,
cursor
,
&
feature
->
Components
)
{
ComponentList
*
cl
=
LIST_ENTRY
(
item
,
ComponentList
,
entry
);
list_remove
(
&
cl
->
entry
);
msi_free
(
cl
);
}
msi_free
(
feature
->
Feature
);
msi_free
(
feature
->
Feature_Parent
);
msi_free
(
feature
->
Directory
);
msi_free
(
feature
->
Description
);
msi_free
(
feature
->
Title
);
msi_free
(
feature
);
}
static
void
free_extension
(
MSIEXTENSION
*
ext
)
{
struct
list
*
item
,
*
cursor
;
LIST_FOR_EACH_SAFE
(
item
,
cursor
,
&
ext
->
verbs
)
{
MSIVERB
*
verb
=
LIST_ENTRY
(
item
,
MSIVERB
,
entry
);
list_remove
(
&
verb
->
entry
);
msi_free
(
verb
->
Verb
);
msi_free
(
verb
->
Command
);
msi_free
(
verb
->
Argument
);
msi_free
(
verb
);
}
msi_free
(
ext
->
Extension
);
msi_free
(
ext
->
ProgIDText
);
msi_free
(
ext
);
}
static
void
free_package_structures
(
MSIPACKAGE
*
package
)
{
INT
i
;
struct
list
*
item
,
*
cursor
;
TRACE
(
"Freeing package action data
\n
"
);
remove_tracked_tempfiles
(
package
);
LIST_FOR_EACH_SAFE
(
item
,
cursor
,
&
package
->
features
)
{
MSIFEATURE
*
feature
=
LIST_ENTRY
(
item
,
MSIFEATURE
,
entry
);
list_remove
(
&
feature
->
entry
);
free_feature
(
feature
);
}
LIST_FOR_EACH_SAFE
(
item
,
cursor
,
&
package
->
folders
)
{
MSIFOLDER
*
folder
=
LIST_ENTRY
(
item
,
MSIFOLDER
,
entry
);
list_remove
(
&
folder
->
entry
);
msi_free
(
folder
->
Parent
);
msi_free
(
folder
->
Directory
);
msi_free
(
folder
->
TargetDefault
);
msi_free
(
folder
->
SourceLongPath
);
msi_free
(
folder
->
SourceShortPath
);
msi_free
(
folder
->
ResolvedTarget
);
msi_free
(
folder
->
ResolvedSource
);
msi_free
(
folder
->
Property
);
msi_free
(
folder
);
}
LIST_FOR_EACH_SAFE
(
item
,
cursor
,
&
package
->
components
)
{
MSICOMPONENT
*
comp
=
LIST_ENTRY
(
item
,
MSICOMPONENT
,
entry
);
list_remove
(
&
comp
->
entry
);
msi_free
(
comp
->
Component
);
msi_free
(
comp
->
ComponentId
);
msi_free
(
comp
->
Directory
);
msi_free
(
comp
->
Condition
);
msi_free
(
comp
->
KeyPath
);
msi_free
(
comp
->
FullKeypath
);
msi_free
(
comp
);
}
LIST_FOR_EACH_SAFE
(
item
,
cursor
,
&
package
->
files
)
{
MSIFILE
*
file
=
LIST_ENTRY
(
item
,
MSIFILE
,
entry
);
list_remove
(
&
file
->
entry
);
msi_free
(
file
->
File
);
msi_free
(
file
->
FileName
);
msi_free
(
file
->
ShortName
);
msi_free
(
file
->
LongName
);
msi_free
(
file
->
Version
);
msi_free
(
file
->
Language
);
msi_free
(
file
->
TargetPath
);
msi_free
(
file
);
}
/* clean up extension, progid, class and verb structures */
LIST_FOR_EACH_SAFE
(
item
,
cursor
,
&
package
->
classes
)
{
MSICLASS
*
cls
=
LIST_ENTRY
(
item
,
MSICLASS
,
entry
);
list_remove
(
&
cls
->
entry
);
msi_free
(
cls
->
clsid
);
msi_free
(
cls
->
Context
);
msi_free
(
cls
->
Description
);
msi_free
(
cls
->
FileTypeMask
);
msi_free
(
cls
->
IconPath
);
msi_free
(
cls
->
DefInprocHandler
);
msi_free
(
cls
->
DefInprocHandler32
);
msi_free
(
cls
->
Argument
);
msi_free
(
cls
->
ProgIDText
);
msi_free
(
cls
);
}
LIST_FOR_EACH_SAFE
(
item
,
cursor
,
&
package
->
extensions
)
{
MSIEXTENSION
*
ext
=
LIST_ENTRY
(
item
,
MSIEXTENSION
,
entry
);
list_remove
(
&
ext
->
entry
);
free_extension
(
ext
);
}
LIST_FOR_EACH_SAFE
(
item
,
cursor
,
&
package
->
progids
)
{
MSIPROGID
*
progid
=
LIST_ENTRY
(
item
,
MSIPROGID
,
entry
);
list_remove
(
&
progid
->
entry
);
msi_free
(
progid
->
ProgID
);
msi_free
(
progid
->
Description
);
msi_free
(
progid
->
IconPath
);
msi_free
(
progid
);
}
LIST_FOR_EACH_SAFE
(
item
,
cursor
,
&
package
->
mimes
)
{
MSIMIME
*
mt
=
LIST_ENTRY
(
item
,
MSIMIME
,
entry
);
list_remove
(
&
mt
->
entry
);
msi_free
(
mt
->
clsid
);
msi_free
(
mt
->
ContentType
);
msi_free
(
mt
);
}
LIST_FOR_EACH_SAFE
(
item
,
cursor
,
&
package
->
appids
)
{
MSIAPPID
*
appid
=
LIST_ENTRY
(
item
,
MSIAPPID
,
entry
);
list_remove
(
&
appid
->
entry
);
msi_free
(
appid
->
AppID
);
msi_free
(
appid
->
RemoteServerName
);
msi_free
(
appid
->
LocalServer
);
msi_free
(
appid
->
ServiceParameters
);
msi_free
(
appid
->
DllSurrogate
);
msi_free
(
appid
);
}
LIST_FOR_EACH_SAFE
(
item
,
cursor
,
&
package
->
sourcelist_info
)
{
MSISOURCELISTINFO
*
info
=
LIST_ENTRY
(
item
,
MSISOURCELISTINFO
,
entry
);
list_remove
(
&
info
->
entry
);
msi_free
(
info
->
value
);
msi_free
(
info
);
}
LIST_FOR_EACH_SAFE
(
item
,
cursor
,
&
package
->
sourcelist_media
)
{
MSIMEDIADISK
*
info
=
LIST_ENTRY
(
item
,
MSIMEDIADISK
,
entry
);
list_remove
(
&
info
->
entry
);
msi_free
(
info
->
volume_label
);
msi_free
(
info
->
disk_prompt
);
msi_free
(
info
);
}
if
(
package
->
script
)
{
for
(
i
=
0
;
i
<
TOTAL_SCRIPTS
;
i
++
)
msi_free_action_script
(
package
,
i
);
for
(
i
=
0
;
i
<
package
->
script
->
UniqueActionsCount
;
i
++
)
msi_free
(
package
->
script
->
UniqueActions
[
i
]
);
msi_free
(
package
->
script
->
UniqueActions
);
msi_free
(
package
->
script
);
}
if
(
package
->
patch
)
{
msi_free
(
package
->
patch
->
patchcode
);
msi_free
(
package
->
patch
->
transforms
);
msi_free
(
package
->
patch
);
}
msi_free
(
package
->
BaseURL
);
msi_free
(
package
->
PackagePath
);
msi_free
(
package
->
ProductCode
);
msi_free
(
package
->
ActionFormat
);
msi_free
(
package
->
LastAction
);
/* cleanup control event subscriptions */
ControlEvent_CleanupSubscriptions
(
package
);
}
static
void
MSI_FreePackage
(
MSIOBJECTHDR
*
arg
)
{
MSIPACKAGE
*
package
=
(
MSIPACKAGE
*
)
arg
;
...
...
@@ -57,7 +288,7 @@ static void MSI_FreePackage( MSIOBJECTHDR *arg)
msi_dialog_destroy
(
package
->
dialog
);
msiobj_release
(
&
package
->
db
->
hdr
);
ACTION_
free_package_structures
(
package
);
free_package_structures
(
package
);
}
static
UINT
create_temp_property_table
(
MSIPACKAGE
*
package
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment