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
64eec8f9
Commit
64eec8f9
authored
Jul 23, 2010
by
Hans Leidekker
Committed by
Alexandre Julliard
Jul 23, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Register dlls directly in the SelfRegModules and SelfUnregModules actions.
parent
bdda3b95
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
29 additions
and
53 deletions
+29
-53
action.c
dlls/msi/action.c
+29
-53
No files found.
dlls/msi/action.c
View file @
64eec8f9
...
@@ -4333,23 +4333,38 @@ static UINT ACTION_RemoveIniValues( MSIPACKAGE *package )
...
@@ -4333,23 +4333,38 @@ static UINT ACTION_RemoveIniValues( MSIPACKAGE *package )
return
ERROR_SUCCESS
;
return
ERROR_SUCCESS
;
}
}
static
void
register_dll
(
const
WCHAR
*
dll
,
BOOL
unregister
)
{
HMODULE
hmod
;
hmod
=
LoadLibraryExW
(
dll
,
0
,
LOAD_WITH_ALTERED_SEARCH_PATH
);
if
(
hmod
)
{
HRESULT
(
WINAPI
*
func_ptr
)(
void
);
const
char
*
func
=
unregister
?
"DllUnregisterServer"
:
"DllRegisterServer"
;
func_ptr
=
(
void
*
)
GetProcAddress
(
hmod
,
func
);
if
(
func_ptr
)
{
HRESULT
hr
=
func_ptr
();
if
(
FAILED
(
hr
))
WARN
(
"failed to register dll 0x%08x
\n
"
,
hr
);
}
else
WARN
(
"entry point %s not found
\n
"
,
func
);
FreeLibrary
(
hmod
);
return
;
}
WARN
(
"failed to load library %u
\n
"
,
GetLastError
());
}
static
UINT
ITERATE_SelfRegModules
(
MSIRECORD
*
row
,
LPVOID
param
)
static
UINT
ITERATE_SelfRegModules
(
MSIRECORD
*
row
,
LPVOID
param
)
{
{
MSIPACKAGE
*
package
=
param
;
MSIPACKAGE
*
package
=
param
;
LPCWSTR
filename
;
LPCWSTR
filename
;
LPWSTR
FullName
;
MSIFILE
*
file
;
MSIFILE
*
file
;
DWORD
len
;
static
const
WCHAR
ExeStr
[]
=
{
'r'
,
'e'
,
'g'
,
's'
,
'v'
,
'r'
,
'3'
,
'2'
,
'.'
,
'e'
,
'x'
,
'e'
,
' '
,
'\"'
,
0
};
static
const
WCHAR
close
[]
=
{
'\"'
,
0
};
STARTUPINFOW
si
;
PROCESS_INFORMATION
info
;
BOOL
brc
;
MSIRECORD
*
uirow
;
MSIRECORD
*
uirow
;
memset
(
&
si
,
0
,
sizeof
(
STARTUPINFOW
));
filename
=
MSI_RecordGetString
(
row
,
1
);
filename
=
MSI_RecordGetString
(
row
,
1
);
file
=
get_loaded_file
(
package
,
filename
);
file
=
get_loaded_file
(
package
,
filename
);
...
@@ -4359,23 +4374,9 @@ static UINT ITERATE_SelfRegModules(MSIRECORD *row, LPVOID param)
...
@@ -4359,23 +4374,9 @@ static UINT ITERATE_SelfRegModules(MSIRECORD *row, LPVOID param)
return
ERROR_SUCCESS
;
return
ERROR_SUCCESS
;
}
}
len
=
strlenW
(
ExeStr
)
+
strlenW
(
file
->
TargetPath
)
+
2
;
TRACE
(
"Registering %s
\n
"
,
debugstr_w
(
file
->
TargetPath
));
FullName
=
msi_alloc
(
len
*
sizeof
(
WCHAR
));
strcpyW
(
FullName
,
ExeStr
);
strcatW
(
FullName
,
file
->
TargetPath
);
strcatW
(
FullName
,
close
);
TRACE
(
"Registering %s
\n
"
,
debugstr_w
(
FullName
));
brc
=
CreateProcessW
(
NULL
,
FullName
,
NULL
,
NULL
,
FALSE
,
0
,
NULL
,
c_colon
,
&
si
,
&
info
);
if
(
brc
)
register_dll
(
file
->
TargetPath
,
FALSE
);
{
CloseHandle
(
info
.
hThread
);
msi_dialog_check_messages
(
info
.
hProcess
);
CloseHandle
(
info
.
hProcess
);
}
uirow
=
MSI_CreateRecord
(
2
);
uirow
=
MSI_CreateRecord
(
2
);
MSI_RecordSetStringW
(
uirow
,
1
,
filename
);
MSI_RecordSetStringW
(
uirow
,
1
,
filename
);
...
@@ -4383,7 +4384,6 @@ static UINT ITERATE_SelfRegModules(MSIRECORD *row, LPVOID param)
...
@@ -4383,7 +4384,6 @@ static UINT ITERATE_SelfRegModules(MSIRECORD *row, LPVOID param)
ui_actiondata
(
package
,
szSelfRegModules
,
uirow
);
ui_actiondata
(
package
,
szSelfRegModules
,
uirow
);
msiobj_release
(
&
uirow
->
hdr
);
msiobj_release
(
&
uirow
->
hdr
);
msi_free
(
FullName
);
return
ERROR_SUCCESS
;
return
ERROR_SUCCESS
;
}
}
...
@@ -4410,21 +4410,11 @@ static UINT ACTION_SelfRegModules(MSIPACKAGE *package)
...
@@ -4410,21 +4410,11 @@ static UINT ACTION_SelfRegModules(MSIPACKAGE *package)
static
UINT
ITERATE_SelfUnregModules
(
MSIRECORD
*
row
,
LPVOID
param
)
static
UINT
ITERATE_SelfUnregModules
(
MSIRECORD
*
row
,
LPVOID
param
)
{
{
static
const
WCHAR
regsvr32
[]
=
{
'r'
,
'e'
,
'g'
,
's'
,
'v'
,
'r'
,
'3'
,
'2'
,
'.'
,
'e'
,
'x'
,
'e'
,
' '
,
'/'
,
'u'
,
' '
,
'\"'
,
0
};
static
const
WCHAR
close
[]
=
{
'\"'
,
0
};
MSIPACKAGE
*
package
=
param
;
MSIPACKAGE
*
package
=
param
;
LPCWSTR
filename
;
LPCWSTR
filename
;
LPWSTR
cmdline
;
MSIFILE
*
file
;
MSIFILE
*
file
;
DWORD
len
;
STARTUPINFOW
si
;
PROCESS_INFORMATION
pi
;
BOOL
ret
;
MSIRECORD
*
uirow
;
MSIRECORD
*
uirow
;
memset
(
&
si
,
0
,
sizeof
(
STARTUPINFOW
)
);
filename
=
MSI_RecordGetString
(
row
,
1
);
filename
=
MSI_RecordGetString
(
row
,
1
);
file
=
get_loaded_file
(
package
,
filename
);
file
=
get_loaded_file
(
package
,
filename
);
...
@@ -4434,22 +4424,9 @@ static UINT ITERATE_SelfUnregModules( MSIRECORD *row, LPVOID param )
...
@@ -4434,22 +4424,9 @@ static UINT ITERATE_SelfUnregModules( MSIRECORD *row, LPVOID param )
return
ERROR_SUCCESS
;
return
ERROR_SUCCESS
;
}
}
len
=
strlenW
(
regsvr32
)
+
strlenW
(
file
->
TargetPath
)
+
2
;
TRACE
(
"Unregistering %s
\n
"
,
debugstr_w
(
file
->
TargetPath
));
cmdline
=
msi_alloc
(
len
*
sizeof
(
WCHAR
)
);
strcpyW
(
cmdline
,
regsvr32
);
strcatW
(
cmdline
,
file
->
TargetPath
);
strcatW
(
cmdline
,
close
);
TRACE
(
"Unregistering %s
\n
"
,
debugstr_w
(
cmdline
));
ret
=
CreateProcessW
(
NULL
,
cmdline
,
NULL
,
NULL
,
FALSE
,
0
,
NULL
,
c_colon
,
&
si
,
&
pi
);
register_dll
(
file
->
TargetPath
,
TRUE
);
if
(
ret
)
{
CloseHandle
(
pi
.
hThread
);
msi_dialog_check_messages
(
pi
.
hProcess
);
CloseHandle
(
pi
.
hProcess
);
}
uirow
=
MSI_CreateRecord
(
2
);
uirow
=
MSI_CreateRecord
(
2
);
MSI_RecordSetStringW
(
uirow
,
1
,
filename
);
MSI_RecordSetStringW
(
uirow
,
1
,
filename
);
...
@@ -4457,7 +4434,6 @@ static UINT ITERATE_SelfUnregModules( MSIRECORD *row, LPVOID param )
...
@@ -4457,7 +4434,6 @@ static UINT ITERATE_SelfUnregModules( MSIRECORD *row, LPVOID param )
ui_actiondata
(
package
,
szSelfUnregModules
,
uirow
);
ui_actiondata
(
package
,
szSelfUnregModules
,
uirow
);
msiobj_release
(
&
uirow
->
hdr
);
msiobj_release
(
&
uirow
->
hdr
);
msi_free
(
cmdline
);
return
ERROR_SUCCESS
;
return
ERROR_SUCCESS
;
}
}
...
...
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