ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Any value of WindowsInstaller besides 0 means the product is installed.

This commit is contained in:
James Hawkins 2007-06-26 19:01:37 -07:00 committed by Alexandre Julliard
parent 7da89f48fd
commit 3bf32f2700
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/msi/msi.c
View File

@ -799,17 +799,11 @@ INSTALLSTATE WINAPI MsiQueryProductStateW(LPCWSTR szProduct)
if (rc != ERROR_SUCCESS) if (rc != ERROR_SUCCESS)
goto end; goto end;
switch (state) if (state)
{
case 1:
/* default */
state = INSTALLSTATE_DEFAULT; state = INSTALLSTATE_DEFAULT;
break; else
default:
FIXME("Unknown install state read from registry (%i)\n",state);
state = INSTALLSTATE_UNKNOWN; state = INSTALLSTATE_UNKNOWN;
break;
}
end: end:
RegCloseKey(props); RegCloseKey(props);
RegCloseKey(hkey); RegCloseKey(hkey);

8
dlls/msi/tests/msi.c
View File

@ -427,6 +427,14 @@ static void test_MsiQueryProductState(void)
state = MsiQueryProductStateA(prodcode); state = MsiQueryProductStateA(prodcode);
ok(state == INSTALLSTATE_DEFAULT, "Expected INSTALLSTATE_DEFAULT, got %d\n", state); ok(state == INSTALLSTATE_DEFAULT, "Expected INSTALLSTATE_DEFAULT, got %d\n", state);
data = 2;
res = RegSetValueExA(props, "WindowsInstaller", 0, REG_DWORD, (const BYTE *)&data, sizeof(DWORD));
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
/* WindowsInstaller value is not 1 */
state = MsiQueryProductStateA(prodcode);
ok(state == INSTALLSTATE_DEFAULT, "Expected INSTALLSTATE_DEFAULT, got %d\n", state);
RegDeleteKeyA(userkey, ""); RegDeleteKeyA(userkey, "");
/* user product key does not exist */ /* user product key does not exist */