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

msi/tests: Fix install tests for Win9x.

This commit is contained in:
Andrew Eikum 2010-06-04 09:56:58 -05:00 committed by Alexandre Julliard
parent 522fe9abeb
commit c99c5a41e9
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dlls/msi/tests/install.c
View File

@ -3218,12 +3218,21 @@ static void create_cab_file(const CHAR *name, DWORD max_size, const CHAR *files)
static BOOL get_user_dirs(void) static BOOL get_user_dirs(void)
{ {
HRESULT hres; HKEY hkey;
DWORD type, size;
hres = SHGetFolderPathA(NULL, CSIDL_APPDATA, NULL, 0, APP_DATA_DIR); if(RegOpenKey(HKEY_CURRENT_USER,
if(FAILED(hres)) "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders",
&hkey))
return FALSE; return FALSE;
size = MAX_PATH;
if(RegQueryValueExA(hkey, "AppData", 0, &type, (LPBYTE)APP_DATA_DIR, &size)){
RegCloseKey(hkey);
return FALSE;
}
RegCloseKey(hkey);
return TRUE; return TRUE;
} }
@ -9426,7 +9435,7 @@ static void test_icon_table(void)
MSIHANDLE hdb = 0, record; MSIHANDLE hdb = 0, record;
LPCSTR query; LPCSTR query;
UINT res; UINT res;
CHAR path[MAX_PATH]; CHAR path[MAX_PATH], win9xpath[MAX_PATH];
static const char prodcode[] = "{7DF88A49-996F-4EC8-A022-BF956F9B2CBB}"; static const char prodcode[] = "{7DF88A49-996F-4EC8-A022-BF956F9B2CBB}";
create_database(msifile, icon_base_tables, sizeof(icon_base_tables) / sizeof(msi_table)); create_database(msifile, icon_base_tables, sizeof(icon_base_tables) / sizeof(msi_table));
@ -9473,12 +9482,20 @@ static void test_icon_table(void)
res = MsiInstallProductA(msifile, "PUBLISH_PRODUCT=1 ALLUSERS=1"); res = MsiInstallProductA(msifile, "PUBLISH_PRODUCT=1 ALLUSERS=1");
ok(res == ERROR_SUCCESS, "Failed to system-wide install: %d\n", res); ok(res == ERROR_SUCCESS, "Failed to system-wide install: %d\n", res);
/* win9x with MSI 2.0 installs the icon to a different folder, same as above */
lstrcpyA(win9xpath, APP_DATA_DIR);
lstrcatA(path, "\\");
lstrcatA(path, "Microsoft\\Installer\\");
lstrcatA(path, prodcode);
lstrcatA(path, "\\testicon");
lstrcpyA(path, WINDOWS_DIR); lstrcpyA(path, WINDOWS_DIR);
lstrcatA(path, "\\"); lstrcatA(path, "\\");
lstrcatA(path, "Installer\\"); lstrcatA(path, "Installer\\");
lstrcatA(path, prodcode); lstrcatA(path, prodcode);
lstrcatA(path, "\\testicon"); lstrcatA(path, "\\testicon");
ok(file_exists(path), "System-wide icon file isn't where it's expected (%s)\n", path); ok(file_exists(path) || file_exists(win9xpath),
"System-wide icon file isn't where it's expected (%s)\n", path);
res = MsiInstallProductA(msifile, "REMOVE=ALL"); res = MsiInstallProductA(msifile, "REMOVE=ALL");
ok(res == ERROR_SUCCESS, "Failed to uninstall system-wide\n"); ok(res == ERROR_SUCCESS, "Failed to uninstall system-wide\n");