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
ee4f4a05
Commit
ee4f4a05
authored
Jan 24, 2005
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Avoid unnecessary run-time initializations.
parent
fb85c9e9
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
21 deletions
+13
-21
msi.c
dlls/msi/msi.c
+8
-17
msipriv.h
dlls/msi/msipriv.h
+2
-1
package.c
dlls/msi/package.c
+3
-3
No files found.
dlls/msi/msi.c
View file @
ee4f4a05
...
@@ -67,12 +67,12 @@ static const WCHAR szComponents[] = {
...
@@ -67,12 +67,12 @@ static const WCHAR szComponents[] = {
'C'
,
'o'
,
'm'
,
'p'
,
'o'
,
'n'
,
'e'
,
'n'
,
't'
,
's'
,
0
};
'C'
,
'o'
,
'm'
,
'p'
,
'o'
,
'n'
,
'e'
,
'n'
,
't'
,
's'
,
0
};
/* the UI level */
/* the UI level */
INSTALLUILEVEL
gUILevel
;
INSTALLUILEVEL
gUILevel
=
INSTALLUILEVEL_BASIC
;
HWND
gUIhwnd
;
HWND
gUIhwnd
=
0
;
INSTALLUI_HANDLERA
gUIHandler
;
INSTALLUI_HANDLERA
gUIHandler
A
=
NULL
;
INSTALLUI_HANDLERW
gUIHandlerW
;
INSTALLUI_HANDLERW
gUIHandlerW
=
NULL
;
DWORD
gUIFilter
;
DWORD
gUIFilter
=
0
;
LPVOID
gUIContext
;
LPVOID
gUIContext
=
NULL
;
WCHAR
gszLogFile
[
MAX_PATH
];
WCHAR
gszLogFile
[
MAX_PATH
];
/*
/*
...
@@ -1012,10 +1012,10 @@ INSTALLUILEVEL WINAPI MsiSetInternalUI(INSTALLUILEVEL dwUILevel, HWND *phWnd)
...
@@ -1012,10 +1012,10 @@ INSTALLUILEVEL WINAPI MsiSetInternalUI(INSTALLUILEVEL dwUILevel, HWND *phWnd)
INSTALLUI_HANDLERA
WINAPI
MsiSetExternalUIA
(
INSTALLUI_HANDLERA
puiHandler
,
INSTALLUI_HANDLERA
WINAPI
MsiSetExternalUIA
(
INSTALLUI_HANDLERA
puiHandler
,
DWORD
dwMessageFilter
,
LPVOID
pvContext
)
DWORD
dwMessageFilter
,
LPVOID
pvContext
)
{
{
INSTALLUI_HANDLERA
prev
=
gUIHandler
;
INSTALLUI_HANDLERA
prev
=
gUIHandler
A
;
TRACE
(
"%p %lx %p
\n
"
,
puiHandler
,
dwMessageFilter
,
pvContext
);
TRACE
(
"%p %lx %p
\n
"
,
puiHandler
,
dwMessageFilter
,
pvContext
);
gUIHandler
=
puiHandler
;
gUIHandler
A
=
puiHandler
;
gUIFilter
=
dwMessageFilter
;
gUIFilter
=
dwMessageFilter
;
gUIContext
=
pvContext
;
gUIContext
=
pvContext
;
...
@@ -1729,15 +1729,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
...
@@ -1729,15 +1729,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
{
case
DLL_PROCESS_ATTACH
:
case
DLL_PROCESS_ATTACH
:
DisableThreadLibraryCalls
(
hinstDLL
);
DisableThreadLibraryCalls
(
hinstDLL
);
/* UI Initialization */
gUILevel
=
INSTALLUILEVEL_BASIC
;
gUIhwnd
=
0
;
gUIHandler
=
NULL
;
gUIFilter
=
0
;
gUIContext
=
NULL
;
gszLogFile
[
0
]
=
0
;
break
;
break
;
case
DLL_PROCESS_DETACH
:
case
DLL_PROCESS_DETACH
:
/* FIXME: Cleanup */
/* FIXME: Cleanup */
...
...
dlls/msi/msipriv.h
View file @
ee4f4a05
...
@@ -338,7 +338,8 @@ BOOL decode_base85_guid(LPCWSTR,GUID*);
...
@@ -338,7 +338,8 @@ BOOL decode_base85_guid(LPCWSTR,GUID*);
/* UI globals */
/* UI globals */
extern
INSTALLUILEVEL
gUILevel
;
extern
INSTALLUILEVEL
gUILevel
;
extern
HWND
gUIhwnd
;
extern
HWND
gUIhwnd
;
extern
INSTALLUI_HANDLERA
gUIHandler
;
extern
INSTALLUI_HANDLERA
gUIHandlerA
;
extern
INSTALLUI_HANDLERW
gUIHandlerW
;
extern
DWORD
gUIFilter
;
extern
DWORD
gUIFilter
;
extern
LPVOID
gUIContext
;
extern
LPVOID
gUIContext
;
extern
WCHAR
gszLogFile
[
MAX_PATH
];
extern
WCHAR
gszLogFile
[
MAX_PATH
];
...
...
dlls/msi/package.c
View file @
ee4f4a05
...
@@ -554,7 +554,7 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType,
...
@@ -554,7 +554,7 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType,
HeapFree
(
GetProcessHeap
(),
0
,
tmp
);
HeapFree
(
GetProcessHeap
(),
0
,
tmp
);
}
}
TRACE
(
"(%p %lx %lx %s)
\n
"
,
gUIHandler
,
gUIFilter
,
log_type
,
TRACE
(
"(%p %lx %lx %s)
\n
"
,
gUIHandler
A
,
gUIFilter
,
log_type
,
debugstr_w
(
message
));
debugstr_w
(
message
));
/* convert it to ASCII */
/* convert it to ASCII */
...
@@ -564,9 +564,9 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType,
...
@@ -564,9 +564,9 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType,
WideCharToMultiByte
(
CP_ACP
,
0
,
message
,
-
1
,
WideCharToMultiByte
(
CP_ACP
,
0
,
message
,
-
1
,
msg
,
len
,
NULL
,
NULL
);
msg
,
len
,
NULL
,
NULL
);
if
(
gUIHandler
&&
(
gUIFilter
&
log_type
))
if
(
gUIHandler
A
&&
(
gUIFilter
&
log_type
))
{
{
rc
=
gUIHandler
(
gUIContext
,
eMessageType
,
msg
);
rc
=
gUIHandler
A
(
gUIContext
,
eMessageType
,
msg
);
}
}
if
((
!
rc
)
&&
(
gszLogFile
[
0
])
&&
!
((
eMessageType
&
0xff000000
)
==
if
((
!
rc
)
&&
(
gszLogFile
[
0
])
&&
!
((
eMessageType
&
0xff000000
)
==
...
...
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