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
90fa4fe1
Commit
90fa4fe1
authored
Nov 02, 2009
by
Hans Leidekker
Committed by
Alexandre Julliard
Nov 03, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Unicode and ANSI global UI handlers are mutually exclusive.
parent
4b5248c9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
4 deletions
+40
-4
msi.c
dlls/msi/msi.c
+6
-4
install.c
dlls/msi/tests/install.c
+34
-0
No files found.
dlls/msi/msi.c
View file @
90fa4fe1
...
...
@@ -1905,8 +1905,9 @@ INSTALLUI_HANDLERA WINAPI MsiSetExternalUIA(INSTALLUI_HANDLERA puiHandler,
TRACE
(
"%p %08x %p
\n
"
,
puiHandler
,
dwMessageFilter
,
pvContext
);
gUIHandlerA
=
puiHandler
;
gUIFilter
=
dwMessageFilter
;
gUIContext
=
pvContext
;
gUIHandlerW
=
NULL
;
gUIFilter
=
dwMessageFilter
;
gUIContext
=
pvContext
;
return
prev
;
}
...
...
@@ -1918,9 +1919,10 @@ INSTALLUI_HANDLERW WINAPI MsiSetExternalUIW(INSTALLUI_HANDLERW puiHandler,
TRACE
(
"%p %08x %p
\n
"
,
puiHandler
,
dwMessageFilter
,
pvContext
);
gUIHandlerA
=
NULL
;
gUIHandlerW
=
puiHandler
;
gUIFilter
=
dwMessageFilter
;
gUIContext
=
pvContext
;
gUIFilter
=
dwMessageFilter
;
gUIContext
=
pvContext
;
return
prev
;
}
...
...
dlls/msi/tests/install.c
View file @
90fa4fe1
...
...
@@ -6871,6 +6871,39 @@ static void test_file_in_use_cab(void)
delete_test_files
();
}
INT
CALLBACK
handler_a
(
LPVOID
context
,
UINT
type
,
LPCSTR
msg
)
{
return
IDOK
;
};
INT
CALLBACK
handler_w
(
LPVOID
context
,
UINT
type
,
LPCWSTR
msg
)
{
return
IDOK
;
};
static
void
test_MsiSetExternalUI
(
void
)
{
INSTALLUI_HANDLERA
ret_a
;
INSTALLUI_HANDLERW
ret_w
;
ret_a
=
MsiSetExternalUIA
(
handler_a
,
INSTALLLOGMODE_ERROR
,
NULL
);
ok
(
ret_a
==
NULL
,
"expected NULL, got %p
\n
"
,
ret_a
);
ret_a
=
MsiSetExternalUIA
(
NULL
,
0
,
NULL
);
ok
(
ret_a
==
handler_a
,
"expected %p, got %p
\n
"
,
handler_a
,
ret_a
);
ret_w
=
MsiSetExternalUIW
(
handler_w
,
INSTALLLOGMODE_ERROR
,
NULL
);
ok
(
ret_w
==
NULL
,
"expected NULL, got %p
\n
"
,
ret_w
);
ret_w
=
MsiSetExternalUIW
(
NULL
,
0
,
NULL
);
ok
(
ret_w
==
handler_w
,
"expected %p, got %p
\n
"
,
handler_w
,
ret_w
);
ret_a
=
MsiSetExternalUIA
(
handler_a
,
INSTALLLOGMODE_ERROR
,
NULL
);
ok
(
ret_a
==
NULL
,
"expected NULL, got %p
\n
"
,
ret_a
);
ret_w
=
MsiSetExternalUIW
(
handler_w
,
INSTALLLOGMODE_ERROR
,
NULL
);
ok
(
ret_w
==
NULL
,
"expected NULL, got %p
\n
"
,
ret_w
);
ret_a
=
MsiSetExternalUIA
(
NULL
,
0
,
NULL
);
ok
(
ret_a
==
NULL
,
"expected NULL, got %p
\n
"
,
ret_a
);
ret_w
=
MsiSetExternalUIW
(
NULL
,
0
,
NULL
);
ok
(
ret_w
==
NULL
,
"expected NULL, got %p
\n
"
,
ret_w
);
}
START_TEST
(
install
)
{
DWORD
len
;
...
...
@@ -6959,6 +6992,7 @@ START_TEST(install)
test_installed_prop
();
test_file_in_use
();
test_file_in_use_cab
();
test_MsiSetExternalUI
();
DeleteFileA
(
log_file
);
...
...
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