Zhiyi Zhang : comdlg32/tests: Fix crashes.
Alexandre Julliard
julliard at winehq.org
Tue Sep 18 15:14:32 CDT 2018
Module: wine
Branch: master
Commit: b89e0e70e03fa842ceab6a2138ddf36175a9662d
URL: https://source.winehq.org/git/wine.git/?a=commit;h=b89e0e70e03fa842ceab6a2138ddf36175a9662d
Author: Zhiyi Zhang <zzhang at codeweavers.com>
Date: Thu Sep 13 17:54:12 2018 +0800
comdlg32/tests: Fix crashes.
Signed-off-by: Zhiyi Zhang <zzhang at codeweavers.com>
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/comdlg32/tests/itemdlg.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c
index d28e682..96c375a 100644
--- a/dlls/comdlg32/tests/itemdlg.c
+++ b/dlls/comdlg32/tests/itemdlg.c
@@ -1032,10 +1032,14 @@ static void test_advise_helper(IFileDialog *pfd)
pfde = IFileDialogEvents_Constructor();
pfdeimpl = impl_from_IFileDialogEvents(pfde);
- hr = IFileDialog_Advise(pfd, NULL, NULL);
- ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
- hr = IFileDialog_Advise(pfd, pfde, NULL);
- ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+ /* Null pointer tests crash on Windows 10 16299 or newer */
+ if (0)
+ {
+ hr = IFileDialog_Advise(pfd, NULL, NULL);
+ ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+ hr = IFileDialog_Advise(pfd, pfde, NULL);
+ ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+ }
hr = IFileDialog_Advise(pfd, NULL, &cookie[0]);
ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
ok(pfdeimpl->ref == 1, "got ref %d\n", pfdeimpl->ref);
More information about the wine-cvs
mailing list