James Hawkins wrote:
dlls/msi/tests/package.c | 526 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 421 insertions(+), 105 deletions(-)
Hi James,
I was looking at why on Win9x there were some registry entries left behind with
the package tests. It had to do with creating the UserData keys (which doesn't
exist at all on win9x/winme btw.) within test_complocator (by calling
set_component_path) and trying to delete them with a W-function (that isn't
present on win9x/winme by default).
I did some further testing on several platforms and it turns out the
test_complocator succeeds even without creating those registry keys in the first
place (tested on Win98, W2K3 and Wine).
The attached 'patch' just excludes the registry entry creation/deletion.
Am I completely missing something or can this registry creation/deleted be
removed from that test?
--
Cheers,
Paul.
diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c
index 47ffa35..3c128f0 100644
--- a/dlls/msi/tests/package.c
+++ b/dlls/msi/tests/package.c
@@ -7906,6 +7906,7 @@ static void test_complocator(void)
CreateDirectoryA("olorotitan", NULL);
CreateDirectoryA("pantydraco", NULL);
+#if 0
set_component_path("abelisaurus", MSIINSTALLCONTEXT_MACHINE,
"{E3619EED-305A-418C-B9C7-F7D7377F0934}", NULL, FALSE);
set_component_path("bactrosaurus", MSIINSTALLCONTEXT_MACHINE,
@@ -7922,6 +7923,7 @@ static void test_complocator(void)
"{8B1034B7-BD5E-41ac-B52C-0105D3DFD74D}", NULL, FALSE);
set_component_path("neosodon", MSIINSTALLCONTEXT_MACHINE,
"{0B499649-197A-48EF-93D2-AF1C17ED6E90}", NULL, FALSE);
+#endif
r = MsiDoAction(hpkg, "AppSearch");
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
@@ -8039,6 +8041,7 @@ static void test_complocator(void)
RemoveDirectoryA("neosodon");
RemoveDirectoryA("olorotitan");
RemoveDirectoryA("pantydraco");
+#if 0
delete_component_path("{E3619EED-305A-418C-B9C7-F7D7377F0934}",
MSIINSTALLCONTEXT_MACHINE, NULL);
delete_component_path("{D56B688D-542F-42Ef-90FD-B6DA76EE8119}",
@@ -8055,6 +8058,7 @@ static void test_complocator(void)
MSIINSTALLCONTEXT_MACHINE, NULL);
delete_component_path("{0B499649-197A-48EF-93D2-AF1C17ED6E90}",
MSIINSTALLCONTEXT_MACHINE, NULL);
+#endif
DeleteFileA(msifile);
}
