Commit 7bf7340e authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard

msi/tests: Fix an intermittent test failure.

parent 8151e695
...@@ -3690,9 +3690,10 @@ static void test_publish(void) ...@@ -3690,9 +3690,10 @@ static void test_publish(void)
LONG res; LONG res;
HKEY uninstall, prodkey, uninstall_32node = NULL; HKEY uninstall, prodkey, uninstall_32node = NULL;
INSTALLSTATE state; INSTALLSTATE state;
char date[MAX_PATH], temp[MAX_PATH], prodcode[] = "{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"; char date[MAX_PATH], date2[MAX_PATH], temp[MAX_PATH], buf[MAX_PATH];
const char prodcode[] = "{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}";
REGSAM access = KEY_ALL_ACCESS; REGSAM access = KEY_ALL_ACCESS;
DWORD error; DWORD error, type, size;
if (!pMsiQueryFeatureStateExA) if (!pMsiQueryFeatureStateExA)
{ {
...@@ -4216,7 +4217,15 @@ static void test_publish(void) ...@@ -4216,7 +4217,15 @@ static void test_publish(void)
CHECK_REG_STR(prodkey, "DisplayName", "MSITEST"); CHECK_REG_STR(prodkey, "DisplayName", "MSITEST");
CHECK_REG_STR(prodkey, "DisplayVersion", "1.1.1"); CHECK_REG_STR(prodkey, "DisplayVersion", "1.1.1");
CHECK_REG_STR(prodkey, "InstallDate", date);
get_date_str(date2);
size = ARRAY_SIZE(buf);
buf[0] = '\0';
res = RegQueryValueExA(prodkey, "InstallDate", NULL, &type, (BYTE *)buf, &size);
ok(!res, "Failed to query value, error %ld\n", res);
ok(type == REG_SZ, "Got wrong type %lu\n", type);
ok(!strcmp(buf, date) || !strcmp(buf, date2), "got %s\n", debugstr_a(buf));
CHECK_REG_STR(prodkey, "InstallSource", temp); CHECK_REG_STR(prodkey, "InstallSource", temp);
CHECK_REG_ISTR(prodkey, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); CHECK_REG_ISTR(prodkey, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}");
CHECK_REG_STR(prodkey, "Publisher", "Wine"); CHECK_REG_STR(prodkey, "Publisher", "Wine");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment