Zebediah Figura : msi/tests: Fix a crash on Windows 10.
Alexandre Julliard
julliard at winehq.org
Fri Jan 17 16:04:13 CST 2020
Module: wine
Branch: master
Commit: 4661c8d45b8f4b4b2adfb157bb16ce3466bc00f0
URL: https://source.winehq.org/git/wine.git/?a=commit;h=4661c8d45b8f4b4b2adfb157bb16ce3466bc00f0
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Thu Jan 16 10:26:10 2020 -0600
msi/tests: Fix a crash on Windows 10.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msi/tests/install.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index 0bd82a621f..f7fd83cfc0 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -2744,15 +2744,14 @@ static void test_MsiInstallProduct(void)
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
- /* szPackagePath is NULL */
- r = MsiInstallProductA(NULL, "INSTALL=ALL");
- ok(r == ERROR_INVALID_PARAMETER,
- "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
-
- /* both szPackagePath and szCommandLine are NULL */
- r = MsiInstallProductA(NULL, NULL);
- ok(r == ERROR_INVALID_PARAMETER,
- "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
+ if (0) /* crashes on Win10 1709 */
+ {
+ r = MsiInstallProductA(NULL, "INSTALL=ALL");
+ ok(r == ERROR_INVALID_PARAMETER, "got %u\n", r);
+
+ r = MsiInstallProductA(NULL, NULL);
+ ok(r == ERROR_INVALID_PARAMETER, "got %u\n", r);
+ }
/* szPackagePath is empty */
r = MsiInstallProductA("", "INSTALL=ALL");
More information about the wine-cvs
mailing list