Hans Leidekker : msi/tests: Avoid another test failure on win2k3.

Alexandre Julliard julliard at wine.codeweavers.com
Wed Jul 15 09:51:24 CDT 2015


Module: wine
Branch: master
Commit: dfae842cca0427421684573bb68d8a6005382aeb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=dfae842cca0427421684573bb68d8a6005382aeb

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Wed Jul 15 15:15:35 2015 +0200

msi/tests: Avoid another test failure on win2k3.

---

 dlls/msi/tests/msi.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c
index 3ae3901..b98a8c2 100644
--- a/dlls/msi/tests/msi.c
+++ b/dlls/msi/tests/msi.c
@@ -50,6 +50,8 @@ static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL);
 
 static INSTALLSTATE (WINAPI *pMsiGetComponentPathA)
     (LPCSTR, LPCSTR, LPSTR, DWORD*);
+static INSTALLSTATE (WINAPI *pMsiGetComponentPathExA)
+    (LPCSTR, LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPSTR, LPDWORD);
 static INSTALLSTATE (WINAPI *pMsiProvideComponentA)
     (LPCSTR, LPCSTR, LPCSTR, DWORD, LPSTR, LPDWORD);
 static INSTALLSTATE (WINAPI *pMsiProvideComponentW)
@@ -92,6 +94,7 @@ static void init_functionpointers(void)
       trace("GetProcAddress(%s) failed\n", #func);
 
     GET_PROC(hmsi, MsiGetComponentPathA)
+    GET_PROC(hmsi, MsiGetComponentPathExA);
     GET_PROC(hmsi, MsiProvideComponentA)
     GET_PROC(hmsi, MsiProvideComponentW)
     GET_PROC(hmsi, MsiGetFileHashA)
@@ -14425,7 +14428,8 @@ START_TEST(msi)
     test_lastusedsource();
     test_setpropertyfolder();
     test_sourcedir_props();
-    test_concurrentinstall();
+    if (pMsiGetComponentPathExA)
+        test_concurrentinstall();
     test_command_line_parsing();
 
     SetCurrentDirectoryA(prev_path);




More information about the wine-cvs mailing list