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
Alexey Alyaev
wine
Commits
06df9f79
Commit
06df9f79
authored
17 years ago
by
James Hawkins
Committed by
Alexandre Julliard
17 years ago
Browse files
Options
Downloads
Patches
Plain Diff
msi: Generalize the msi_custom_action_info struct so other custom actions can use it.
parent
4cc48b77
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/msi/custom.c
+13
-13
13 additions, 13 deletions
dlls/msi/custom.c
with
13 additions
and
13 deletions
dlls/msi/custom.c
+
13
−
13
View file @
06df9f79
...
...
@@ -412,8 +412,8 @@ static UINT wait_process_handle(MSIPACKAGE* package, UINT type,
typedef
struct
_msi_custom_action_info
{
struct
list
entry
;
MSIPACKAGE
*
package
;
LPWSTR
dllnam
e
;
LPWSTR
function
;
LPWSTR
sourc
e
;
LPWSTR
target
;
HANDLE
handle
;
LPWSTR
action
;
INT
type
;
...
...
@@ -428,8 +428,8 @@ static void free_custom_action_data( msi_custom_action_info *info )
if
(
info
->
handle
)
CloseHandle
(
info
->
handle
);
msi_free
(
info
->
action
);
msi_free
(
info
->
dllnam
e
);
msi_free
(
info
->
function
);
msi_free
(
info
->
sourc
e
);
msi_free
(
info
->
target
);
msiobj_release
(
&
info
->
package
->
hdr
);
msi_free
(
info
);
}
...
...
@@ -497,16 +497,16 @@ static DWORD WINAPI ACTION_CallDllFunction( const GUID *guid )
return
r
;
}
TRACE
(
"%s %s
\n
"
,
debugstr_w
(
info
->
dllnam
e
),
debugstr_w
(
info
->
function
)
);
TRACE
(
"%s %s
\n
"
,
debugstr_w
(
info
->
sourc
e
),
debugstr_w
(
info
->
target
)
);
hModule
=
LoadLibraryW
(
info
->
dllnam
e
);
hModule
=
LoadLibraryW
(
info
->
sourc
e
);
if
(
!
hModule
)
{
ERR
(
"failed to load dll %s
\n
"
,
debugstr_w
(
info
->
dllnam
e
)
);
ERR
(
"failed to load dll %s
\n
"
,
debugstr_w
(
info
->
sourc
e
)
);
return
r
;
}
proc
=
strdupWtoA
(
info
->
function
);
proc
=
strdupWtoA
(
info
->
target
);
fn
=
(
MsiCustomActionEntryPoint
)
GetProcAddress
(
hModule
,
proc
);
msi_free
(
proc
);
if
(
fn
)
...
...
@@ -514,7 +514,7 @@ static DWORD WINAPI ACTION_CallDllFunction( const GUID *guid )
hPackage
=
alloc_msihandle
(
&
info
->
package
->
hdr
);
if
(
hPackage
)
{
TRACE
(
"calling %s
\n
"
,
debugstr_w
(
info
->
function
)
);
TRACE
(
"calling %s
\n
"
,
debugstr_w
(
info
->
target
)
);
r
=
fn
(
hPackage
);
MsiCloseHandle
(
hPackage
);
}
...
...
@@ -522,7 +522,7 @@ static DWORD WINAPI ACTION_CallDllFunction( const GUID *guid )
ERR
(
"failed to create handle for %p
\n
"
,
info
->
package
);
}
else
ERR
(
"GetProcAddress(%s) failed
\n
"
,
debugstr_w
(
info
->
function
)
);
ERR
(
"GetProcAddress(%s) failed
\n
"
,
debugstr_w
(
info
->
target
)
);
FreeLibrary
(
hModule
);
...
...
@@ -549,7 +549,7 @@ static DWORD WINAPI DllThread( LPVOID arg )
}
static
msi_custom_action_info
*
do_msidbCustomActionTypeDll
(
MSIPACKAGE
*
package
,
INT
type
,
LPCWSTR
dllnam
e
,
LPCWSTR
function
,
LPCWSTR
action
)
MSIPACKAGE
*
package
,
INT
type
,
LPCWSTR
sourc
e
,
LPCWSTR
target
,
LPCWSTR
action
)
{
msi_custom_action_info
*
info
;
...
...
@@ -560,8 +560,8 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll(
msiobj_addref
(
&
package
->
hdr
);
info
->
package
=
package
;
info
->
type
=
type
;
info
->
function
=
strdupW
(
function
);
info
->
dllnam
e
=
strdupW
(
dllnam
e
);
info
->
target
=
strdupW
(
target
);
info
->
sourc
e
=
strdupW
(
sourc
e
);
info
->
action
=
strdupW
(
action
);
CoCreateGuid
(
&
info
->
guid
);
...
...
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