[04/11] msi/tests: Prepare install.c for the switch to -D__WINESRC__.
Hans Leidekker
hans at codeweavers.com
Tue Oct 15 03:29:32 CDT 2013
---
dlls/msi/tests/install.c | 439 ++++++++++++++++++++++++-----------------------
1 file changed, 221 insertions(+), 218 deletions(-)
diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index 97c2c10..6604e02 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -31,6 +31,8 @@
#include <objidl.h>
#include <srrestoreptapi.h>
#include <shlobj.h>
+#include <winsvc.h>
+#include <shellapi.h>
#include "wine/test.h"
@@ -56,6 +58,10 @@ static const BOOL is_64bit = sizeof(void *) > sizeof(int);
static const char *msifile = "msitest.msi";
static const char *msifile2 = "winetest2.msi";
static const char *mstfile = "winetest.mst";
+
+static const WCHAR msifileW[] = {'m','s','i','t','e','s','t','.','m','s','i',0};
+static const WCHAR msifile2W[] = {'w','i','n','e','t','e','s','t','2','.','m','s','i',0};
+
static CHAR CURR_DIR[MAX_PATH];
static CHAR PROG_FILES_DIR[MAX_PATH];
static CHAR PROG_FILES_DIR_NATIVE[MAX_PATH];
@@ -1963,7 +1969,7 @@ static BOOL check_record(MSIHANDLE rec, UINT field, LPCSTR val)
DWORD sz;
sz = sizeof buffer;
- r = MsiRecordGetString(rec, field, buffer, &sz);
+ r = MsiRecordGetStringA(rec, field, buffer, &sz);
return (r == ERROR_SUCCESS ) && !strcmp(val, buffer);
}
@@ -1995,8 +2001,8 @@ static INT_PTR CDECL get_open_info(char *pszName, USHORT *pdate, USHORT *ptime,
DWORD attrs;
BOOL res;
- handle = CreateFile(pszName, GENERIC_READ, FILE_SHARE_READ, NULL,
- OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL);
+ handle = CreateFileA(pszName, GENERIC_READ, FILE_SHARE_READ, NULL,
+ OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL);
ok(handle != INVALID_HANDLE_VALUE, "Failed to CreateFile %s\n", pszName);
@@ -2006,7 +2012,7 @@ static INT_PTR CDECL get_open_info(char *pszName, USHORT *pdate, USHORT *ptime,
FileTimeToLocalFileTime(&finfo.ftLastWriteTime, &filetime);
FileTimeToDosDateTime(&filetime, pdate, ptime);
- attrs = GetFileAttributes(pszName);
+ attrs = GetFileAttributesA(pszName);
ok(attrs != INVALID_FILE_ATTRIBUTES, "Failed to GetFileAttributes\n");
return (INT_PTR)handle;
@@ -2061,7 +2067,7 @@ static void create_cab_file(const CHAR *name, DWORD max_size, const CHAR *files)
{
res = add_file(hfci, ptr, tcompTYPE_MSZIP);
ok(res, "Failed to add file: %s\n", ptr);
- ptr += lstrlen(ptr) + 1;
+ ptr += lstrlenA(ptr) + 1;
}
res = FCIFlushCabinet(hfci, FALSE, get_next_cabinet, progress);
@@ -2076,9 +2082,8 @@ static BOOL get_user_dirs(void)
HKEY hkey;
DWORD type, size;
- if(RegOpenKey(HKEY_CURRENT_USER,
- "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders",
- &hkey))
+ if (RegOpenKeyA(HKEY_CURRENT_USER,
+ "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", &hkey))
return FALSE;
size = MAX_PATH;
@@ -2096,8 +2101,7 @@ static BOOL get_system_dirs(void)
HKEY hkey;
DWORD type, size;
- if (RegOpenKey(HKEY_LOCAL_MACHINE,
- "Software\\Microsoft\\Windows\\CurrentVersion", &hkey))
+ if (RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", &hkey))
return FALSE;
size = MAX_PATH;
@@ -2253,9 +2257,8 @@ static void write_file(const CHAR *filename, const char *data, int data_size)
{
DWORD size;
- HANDLE hf = CreateFile(filename, GENERIC_WRITE, 0, NULL,
- CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
-
+ HANDLE hf = CreateFileA(filename, GENERIC_WRITE, 0, NULL,
+ CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
WriteFile(hf, data, data_size, &size, NULL);
CloseHandle(hf);
}
@@ -2334,10 +2337,10 @@ static void check_service_is_installed(void)
SC_HANDLE scm, service;
BOOL res;
- scm = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
+ scm = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS);
ok(scm != NULL, "Failed to open the SC Manager\n");
- service = OpenService(scm, "TestService", SC_MANAGER_ALL_ACCESS);
+ service = OpenServiceA(scm, "TestService", SC_MANAGER_ALL_ACCESS);
ok(service != NULL, "Failed to open TestService\n");
res = DeleteService(service);
@@ -2435,7 +2438,7 @@ static void test_MsiInstallProduct(void)
ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n");
ok(delete_pf("msitest", FALSE), "Directory not created\n");
- res = RegOpenKeyEx(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest", 0, access, &hkey);
+ res = RegOpenKeyExA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest", 0, access, &hkey);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
size = MAX_PATH;
@@ -2684,13 +2687,13 @@ static void test_MsiSetComponentState(void)
CoInitialize(NULL);
- lstrcpy(path, CURR_DIR);
- lstrcat(path, "\\");
- lstrcat(path, msifile);
+ lstrcpyA(path, CURR_DIR);
+ lstrcatA(path, "\\");
+ lstrcatA(path, msifile);
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
- r = MsiOpenPackage(path, &package);
+ r = MsiOpenPackageA(path, &package);
if (r == ERROR_INSTALL_PACKAGE_REJECTED)
{
skip("Not enough rights to perform tests\n");
@@ -2698,21 +2701,21 @@ static void test_MsiSetComponentState(void)
}
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
- r = MsiDoAction(package, "CostInitialize");
+ r = MsiDoActionA(package, "CostInitialize");
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
- r = MsiDoAction(package, "FileCost");
+ r = MsiDoActionA(package, "FileCost");
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
- r = MsiDoAction(package, "CostFinalize");
+ r = MsiDoActionA(package, "CostFinalize");
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
- r = MsiGetComponentState(package, "dangler", &installed, &action);
+ r = MsiGetComponentStateA(package, "dangler", &installed, &action);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
ok(installed == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", installed);
ok(action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action);
- r = MsiSetComponentState(package, "dangler", INSTALLSTATE_SOURCE);
+ r = MsiSetComponentStateA(package, "dangler", INSTALLSTATE_SOURCE);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
MsiCloseHandle(package);
@@ -2733,15 +2736,15 @@ static void test_packagecoltypes(void)
CoInitialize(NULL);
- lstrcpy(path, CURR_DIR);
- lstrcat(path, "\\");
- lstrcat(path, msifile);
+ lstrcpyA(path, CURR_DIR);
+ lstrcatA(path, "\\");
+ lstrcatA(path, msifile);
- r = MsiOpenDatabase(path, MSIDBOPEN_READONLY, &hdb);
+ r = MsiOpenDatabaseA(path, MSIDBOPEN_READONLY, &hdb);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
query = "SELECT * FROM `Media`";
- r = MsiDatabaseOpenView( hdb, query, &view );
+ r = MsiDatabaseOpenViewA( hdb, query, &view );
ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n");
r = MsiViewGetColumnInfo( view, MSICOLINFO_NAMES, &rec );
@@ -2772,7 +2775,7 @@ static void test_packagecoltypes(void)
MsiCloseHandle(hdb);
CoUninitialize();
- DeleteFile(msifile);
+ DeleteFileA(msifile);
}
static void create_cc_test_files(void)
@@ -2812,15 +2815,15 @@ static void create_cc_test_files(void)
create_cab_file("test3.cab", MEDIA_SIZE, "caesar\0");
- DeleteFile("maximus");
- DeleteFile("augustus");
- DeleteFile("tiberius");
- DeleteFile("caesar");
+ DeleteFileA("maximus");
+ DeleteFileA("augustus");
+ DeleteFileA("tiberius");
+ DeleteFileA("caesar");
}
static void delete_cab_files(void)
{
- SHFILEOPSTRUCT shfl;
+ SHFILEOPSTRUCTA shfl;
CHAR path[MAX_PATH+10];
lstrcpyA(path, CURR_DIR);
@@ -2833,7 +2836,7 @@ static void delete_cab_files(void)
shfl.pTo = NULL;
shfl.fFlags = FOF_FILESONLY | FOF_NOCONFIRMATION | FOF_NORECURSION | FOF_SILENT;
- SHFileOperation(&shfl);
+ SHFileOperationA(&shfl);
}
static void test_continuouscabs(void)
@@ -2866,7 +2869,7 @@ static void test_continuouscabs(void)
}
delete_cab_files();
- DeleteFile(msifile);
+ DeleteFileA(msifile);
create_cc_test_files();
create_database(msifile, cc2_tables, sizeof(cc2_tables) / sizeof(msi_table));
@@ -2889,7 +2892,7 @@ static void test_continuouscabs(void)
}
delete_cab_files();
- DeleteFile(msifile);
+ DeleteFileA(msifile);
/* Tests to show that only msi cab filename is taken in case of mismatch with the one given by previous cab */
@@ -2914,11 +2917,11 @@ static void test_continuouscabs(void)
}
delete_cab_files();
- DeleteFile(msifile);
+ DeleteFileA(msifile);
/* Filename from msi is right and the one from cab is wrong */
create_cc_test_files();
- ok(MoveFile("test2.cab", "test2_.cab"), "Cannot rename test2.cab to test2_.cab\n");
+ ok(MoveFileA("test2.cab", "test2_.cab"), "Cannot rename test2.cab to test2_.cab\n");
create_database(msifile, cc3_tables, sizeof(cc3_tables) / sizeof(msi_table));
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
@@ -2938,7 +2941,7 @@ static void test_continuouscabs(void)
}
delete_cab_files();
- DeleteFile(msifile);
+ DeleteFileA(msifile);
}
static void test_caborder(void)
@@ -2987,7 +2990,7 @@ static void test_caborder(void)
ok(!delete_pf("msitest", FALSE), "Directory is created\n");
delete_cab_files();
- DeleteFile(msifile);
+ DeleteFileA(msifile);
create_cc_test_files();
create_database(msifile, co_tables, sizeof(co_tables) / sizeof(msi_table));
@@ -3003,7 +3006,7 @@ static void test_caborder(void)
}
delete_cab_files();
- DeleteFile(msifile);
+ DeleteFileA(msifile);
create_cc_test_files();
create_database(msifile, co2_tables, sizeof(co2_tables) / sizeof(msi_table));
@@ -3020,11 +3023,11 @@ static void test_caborder(void)
error:
delete_cab_files();
- DeleteFile("imperator");
- DeleteFile("maximus");
- DeleteFile("augustus");
- DeleteFile("caesar");
- DeleteFile(msifile);
+ DeleteFileA("imperator");
+ DeleteFileA("maximus");
+ DeleteFileA("augustus");
+ DeleteFileA("caesar");
+ DeleteFileA(msifile);
}
static void test_mixedmedia(void)
@@ -3062,12 +3065,12 @@ static void test_mixedmedia(void)
error:
/* Delete the files in the temp (current) folder */
- DeleteFile("msitest\\maximus");
- DeleteFile("msitest\\augustus");
- RemoveDirectory("msitest");
- DeleteFile("caesar");
- DeleteFile("test1.cab");
- DeleteFile(msifile);
+ DeleteFileA("msitest\\maximus");
+ DeleteFileA("msitest\\augustus");
+ RemoveDirectoryA("msitest");
+ DeleteFileA("caesar");
+ DeleteFileA("test1.cab");
+ DeleteFileA(msifile);
}
static void test_samesequence(void)
@@ -3089,7 +3092,7 @@ static void test_samesequence(void)
ok(delete_pf("msitest", FALSE), "Directory not created\n");
}
delete_cab_files();
- DeleteFile(msifile);
+ DeleteFileA(msifile);
}
static void test_uiLevelFlags(void)
@@ -3111,7 +3114,7 @@ static void test_uiLevelFlags(void)
ok(delete_pf("msitest", FALSE), "Directory not created\n");
}
delete_cab_files();
- DeleteFile(msifile);
+ DeleteFileA(msifile);
}
static BOOL file_matches(LPSTR path)
@@ -3120,14 +3123,13 @@ static BOOL file_matches(LPSTR path)
HANDLE file;
DWORD size;
- file = CreateFile(path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,
- NULL, OPEN_EXISTING, 0, NULL);
-
+ file = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,
+ NULL, OPEN_EXISTING, 0, NULL);
ZeroMemory(buf, MAX_PATH);
ReadFile(file, buf, 15, &size, NULL);
CloseHandle(file);
- return !lstrcmp(buf, "msitest\\maximus");
+ return !lstrcmpA(buf, "msitest\\maximus");
}
static void test_readonlyfile(void)
@@ -3149,13 +3151,13 @@ static void test_readonlyfile(void)
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
- lstrcpy(path, PROG_FILES_DIR);
- lstrcat(path, "\\msitest");
- CreateDirectory(path, NULL);
+ lstrcpyA(path, PROG_FILES_DIR);
+ lstrcatA(path, "\\msitest");
+ CreateDirectoryA(path, NULL);
- lstrcat(path, "\\maximus");
- file = CreateFile(path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,
- NULL, CREATE_NEW, FILE_ATTRIBUTE_READONLY, NULL);
+ lstrcatA(path, "\\maximus");
+ file = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,
+ NULL, CREATE_NEW, FILE_ATTRIBUTE_READONLY, NULL);
WriteFile(file, "readonlyfile", strlen("readonlyfile"), &size, NULL);
CloseHandle(file);
@@ -3173,9 +3175,9 @@ static void test_readonlyfile(void)
error:
/* Delete the files in the temp (current) folder */
- DeleteFile("msitest\\maximus");
- RemoveDirectory("msitest");
- DeleteFile(msifile);
+ DeleteFileA("msitest\\maximus");
+ RemoveDirectoryA("msitest");
+ DeleteFileA(msifile);
}
static void test_readonlyfile_cab(void)
@@ -3195,19 +3197,19 @@ static void test_readonlyfile_cab(void)
CreateDirectoryA("msitest", NULL);
create_file("maximus", 500);
create_cab_file("test1.cab", MEDIA_SIZE, "maximus\0");
- DeleteFile("maximus");
+ DeleteFileA("maximus");
create_database(msifile, rofc_tables, sizeof(rofc_tables) / sizeof(msi_table));
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
- lstrcpy(path, PROG_FILES_DIR);
- lstrcat(path, "\\msitest");
- CreateDirectory(path, NULL);
+ lstrcpyA(path, PROG_FILES_DIR);
+ lstrcatA(path, "\\msitest");
+ CreateDirectoryA(path, NULL);
- lstrcat(path, "\\maximus");
- file = CreateFile(path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,
- NULL, CREATE_NEW, FILE_ATTRIBUTE_READONLY, NULL);
+ lstrcatA(path, "\\maximus");
+ file = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,
+ NULL, CREATE_NEW, FILE_ATTRIBUTE_READONLY, NULL);
WriteFile(file, "readonlyfile", strlen("readonlyfile"), &size, NULL);
CloseHandle(file);
@@ -3221,8 +3223,8 @@ static void test_readonlyfile_cab(void)
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
memset( buf, 0, sizeof(buf) );
- if ((file = CreateFile(path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,
- NULL, OPEN_EXISTING, 0, NULL)) != INVALID_HANDLE_VALUE)
+ if ((file = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,
+ NULL, OPEN_EXISTING, 0, NULL)) != INVALID_HANDLE_VALUE)
{
ReadFile(file, buf, sizeof(buf) - 1, &size, NULL);
CloseHandle(file);
@@ -3234,9 +3236,9 @@ static void test_readonlyfile_cab(void)
error:
/* Delete the files in the temp (current) folder */
delete_cab_files();
- DeleteFile("msitest\\maximus");
- RemoveDirectory("msitest");
- DeleteFile(msifile);
+ DeleteFileA("msitest\\maximus");
+ RemoveDirectoryA("msitest");
+ DeleteFileA(msifile);
}
static void test_setdirproperty(void)
@@ -3267,9 +3269,9 @@ static void test_setdirproperty(void)
error:
/* Delete the files in the temp (current) folder */
- DeleteFile(msifile);
- DeleteFile("msitest\\maximus");
- RemoveDirectory("msitest");
+ DeleteFileA(msifile);
+ DeleteFileA("msitest\\maximus");
+ RemoveDirectoryA("msitest");
}
static void test_cabisextracted(void)
@@ -3312,17 +3314,17 @@ static void test_cabisextracted(void)
error:
/* Delete the files in the temp (current) folder */
delete_cab_files();
- DeleteFile(msifile);
- DeleteFile("maximus");
- DeleteFile("augustus");
- DeleteFile("caesar");
- DeleteFile("msitest\\gaius");
- RemoveDirectory("msitest");
+ DeleteFileA(msifile);
+ DeleteFileA("maximus");
+ DeleteFileA("augustus");
+ DeleteFileA("caesar");
+ DeleteFileA("msitest\\gaius");
+ RemoveDirectoryA("msitest");
}
static BOOL file_exists(LPCSTR file)
{
- return GetFileAttributes(file) != INVALID_FILE_ATTRIBUTES;
+ return GetFileAttributesA(file) != INVALID_FILE_ATTRIBUTES;
}
static BOOL pf_exists(LPCSTR file)
@@ -3338,7 +3340,7 @@ static BOOL pf_exists(LPCSTR file)
static void delete_pfmsitest_files(void)
{
- SHFILEOPSTRUCT shfl;
+ SHFILEOPSTRUCTA shfl;
CHAR path[MAX_PATH+11];
lstrcpyA(path, PROG_FILES_DIR);
@@ -3351,7 +3353,7 @@ static void delete_pfmsitest_files(void)
shfl.pTo = NULL;
shfl.fFlags = FOF_FILESONLY | FOF_NOCONFIRMATION | FOF_NORECURSION | FOF_SILENT | FOF_NOERRORUI;
- SHFileOperation(&shfl);
+ SHFileOperationA(&shfl);
lstrcpyA(path, PROG_FILES_DIR);
lstrcatA(path, "\\msitest");
@@ -3363,7 +3365,7 @@ static UINT run_query(MSIHANDLE hdb, MSIHANDLE hrec, const char *query)
MSIHANDLE hview = 0;
UINT r;
- r = MsiDatabaseOpenView(hdb, query, &hview);
+ r = MsiDatabaseOpenViewA(hdb, query, &hview);
if(r != ERROR_SUCCESS)
return r;
@@ -3380,19 +3382,19 @@ static void set_transform_summary_info(void)
MSIHANDLE suminfo = 0;
/* build summary info */
- r = MsiGetSummaryInformation(0, mstfile, 3, &suminfo);
+ r = MsiGetSummaryInformationA(0, mstfile, 3, &suminfo);
ok(r == ERROR_SUCCESS , "Failed to open summaryinfo\n");
- r = MsiSummaryInfoSetProperty(suminfo, PID_TITLE, VT_LPSTR, 0, NULL, "MSITEST");
+ r = MsiSummaryInfoSetPropertyA(suminfo, PID_TITLE, VT_LPSTR, 0, NULL, "MSITEST");
ok(r == ERROR_SUCCESS, "Failed to set summary info\n");
- r = MsiSummaryInfoSetProperty(suminfo, PID_REVNUMBER, VT_LPSTR, 0, NULL,
- "{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}1.1.1;"
- "{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}1.1.1;"
- "{4C0EAA15-0264-4E5A-8758-609EF142B92D}");
+ r = MsiSummaryInfoSetPropertyA(suminfo, PID_REVNUMBER, VT_LPSTR, 0, NULL,
+ "{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}1.1.1;"
+ "{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}1.1.1;"
+ "{4C0EAA15-0264-4E5A-8758-609EF142B92D}");
ok(r == ERROR_SUCCESS , "Failed to set summary info\n");
- r = MsiSummaryInfoSetProperty(suminfo, PID_PAGECOUNT, VT_I4, 100, NULL, NULL);
+ r = MsiSummaryInfoSetPropertyA(suminfo, PID_PAGECOUNT, VT_I4, 100, NULL, NULL);
ok(r == ERROR_SUCCESS, "Failed to set summary info\n");
r = MsiSummaryInfoPersist(suminfo);
@@ -3409,15 +3411,15 @@ static void generate_transform(void)
UINT r;
/* start with two identical databases */
- CopyFile(msifile, msifile2, FALSE);
+ CopyFileA(msifile, msifile2, FALSE);
- r = MsiOpenDatabase(msifile2, MSIDBOPEN_TRANSACT, &hdb1);
+ r = MsiOpenDatabaseA(msifile2, MSIDBOPEN_TRANSACT, &hdb1);
ok(r == ERROR_SUCCESS , "Failed to create database\n");
r = MsiDatabaseCommit(hdb1);
ok(r == ERROR_SUCCESS , "Failed to commit database\n");
- r = MsiOpenDatabase(msifile, MSIDBOPEN_READONLY, &hdb2);
+ r = MsiOpenDatabaseA(msifile, MSIDBOPEN_READONLY, &hdb2);
ok(r == ERROR_SUCCESS , "Failed to create database\n");
query = "INSERT INTO `Property` ( `Property`, `Value` ) VALUES ( 'prop', 'val' )";
@@ -3427,10 +3429,10 @@ static void generate_transform(void)
/* database needs to be committed */
MsiDatabaseCommit(hdb1);
- r = MsiDatabaseGenerateTransform(hdb1, hdb2, mstfile, 0, 0);
+ r = MsiDatabaseGenerateTransformA(hdb1, hdb2, mstfile, 0, 0);
ok(r == ERROR_SUCCESS, "return code %d, should be ERROR_SUCCESS\n", r);
- r = MsiCreateTransformSummaryInfo(hdb2, hdb2, mstfile, 0, 0);
+ r = MsiCreateTransformSummaryInfoA(hdb2, hdb2, mstfile, 0, 0);
todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
MsiCloseHandle(hdb1);
@@ -3554,11 +3556,11 @@ static void test_transformprop(void)
error:
/* Delete the files in the temp (current) folder */
- DeleteFile(msifile);
- DeleteFile(msifile2);
- DeleteFile(mstfile);
- DeleteFile("msitest\\augustus");
- RemoveDirectory("msitest");
+ DeleteFileA(msifile);
+ DeleteFileA(msifile2);
+ DeleteFileA(mstfile);
+ DeleteFileA("msitest\\augustus");
+ RemoveDirectoryA("msitest");
}
static void test_currentworkingdir(void)
@@ -3608,9 +3610,8 @@ static void test_currentworkingdir(void)
drive[3] = '\0';
SetCurrentDirectoryA(drive);
- lstrcpy(path, CURR_DIR);
- if (path[lstrlenA(path) - 1] != '\\')
- lstrcatA(path, "\\");
+ lstrcpyA(path, CURR_DIR);
+ if (path[lstrlenA(path) - 1] != '\\') lstrcatA(path, "\\");
lstrcatA(path, msifile);
ptr = strchr(path, ':');
ptr +=2;
@@ -3622,10 +3623,10 @@ static void test_currentworkingdir(void)
error:
SetCurrentDirectoryA(CURR_DIR);
- DeleteFile(msifile);
- DeleteFile("msitest\\augustus");
- RemoveDirectory("msitest");
- RemoveDirectory("diffdir");
+ DeleteFileA(msifile);
+ DeleteFileA("msitest\\augustus");
+ RemoveDirectoryA("msitest");
+ RemoveDirectoryA("diffdir");
}
static void set_admin_summary_info(const CHAR *name)
@@ -3675,8 +3676,8 @@ static void test_admin(void)
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n");
ok(!delete_pf("msitest", FALSE), "Directory created\n");
- ok(!DeleteFile("c:\\msitest\\augustus"), "File installed\n");
- ok(!RemoveDirectory("c:\\msitest"), "File installed\n");
+ ok(!DeleteFileA("c:\\msitest\\augustus"), "File installed\n");
+ ok(!RemoveDirectoryA("c:\\msitest"), "File installed\n");
r = MsiInstallProductA(msifile, "ACTION=ADMIN");
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
@@ -3684,14 +3685,14 @@ static void test_admin(void)
ok(!delete_pf("msitest", FALSE), "Directory created\n");
todo_wine
{
- ok(DeleteFile("c:\\msitest\\augustus"), "File not installed\n");
- ok(RemoveDirectory("c:\\msitest"), "File not installed\n");
+ ok(DeleteFileA("c:\\msitest\\augustus"), "File not installed\n");
+ ok(RemoveDirectoryA("c:\\msitest"), "File not installed\n");
}
error:
- DeleteFile(msifile);
- DeleteFile("msitest\\augustus");
- RemoveDirectory("msitest");
+ DeleteFileA(msifile);
+ DeleteFileA("msitest\\augustus");
+ RemoveDirectoryA("msitest");
}
static void set_admin_property_stream(LPCSTR file)
@@ -3755,9 +3756,9 @@ static void test_adminprops(void)
ok(delete_pf("msitest", FALSE), "Directory created\n");
error:
- DeleteFile(msifile);
- DeleteFile("msitest\\augustus");
- RemoveDirectory("msitest");
+ DeleteFileA(msifile);
+ DeleteFileA("msitest\\augustus");
+ RemoveDirectoryA("msitest");
}
static void create_pf_data(LPCSTR file, LPCSTR data, BOOL is_file)
@@ -3837,13 +3838,13 @@ static void test_missingcab(void)
error:
delete_pf("msitest", FALSE);
- DeleteFile("msitest\\augustus");
- RemoveDirectory("msitest");
- DeleteFile("maximus");
- DeleteFile("tiberius");
- DeleteFile("test1.cab");
- DeleteFile("test4.cab");
- DeleteFile(msifile);
+ DeleteFileA("msitest\\augustus");
+ RemoveDirectoryA("msitest");
+ DeleteFileA("maximus");
+ DeleteFileA("tiberius");
+ DeleteFileA("test1.cab");
+ DeleteFileA("test4.cab");
+ DeleteFileA(msifile);
}
static void test_sourcefolder(void)
@@ -3888,8 +3889,8 @@ static void test_sourcefolder(void)
}
error:
- DeleteFile(msifile);
- DeleteFile("augustus");
+ DeleteFileA(msifile);
+ DeleteFileA("augustus");
}
static void test_customaction51(void)
@@ -3920,9 +3921,9 @@ static void test_customaction51(void)
ok(delete_pf("msitest", FALSE), "Directory created\n");
error:
- DeleteFile(msifile);
- DeleteFile("msitest\\augustus");
- RemoveDirectory("msitest");
+ DeleteFileA(msifile);
+ DeleteFileA("msitest\\augustus");
+ RemoveDirectoryA("msitest");
}
static void test_installstate(void)
@@ -4023,20 +4024,20 @@ static void test_installstate(void)
ok(!delete_pf("msitest", FALSE), "Directory created\n");
error:
- DeleteFile(msifile);
- DeleteFile("msitest\\alpha");
- DeleteFile("msitest\\beta");
- DeleteFile("msitest\\gamma");
- DeleteFile("msitest\\theta");
- DeleteFile("msitest\\delta");
- DeleteFile("msitest\\epsilon");
- DeleteFile("msitest\\zeta");
- DeleteFile("msitest\\iota");
- DeleteFile("msitest\\eta");
- DeleteFile("msitest\\kappa");
- DeleteFile("msitest\\lambda");
- DeleteFile("msitest\\mu");
- RemoveDirectory("msitest");
+ DeleteFileA(msifile);
+ DeleteFileA("msitest\\alpha");
+ DeleteFileA("msitest\\beta");
+ DeleteFileA("msitest\\gamma");
+ DeleteFileA("msitest\\theta");
+ DeleteFileA("msitest\\delta");
+ DeleteFileA("msitest\\epsilon");
+ DeleteFileA("msitest\\zeta");
+ DeleteFileA("msitest\\iota");
+ DeleteFileA("msitest\\eta");
+ DeleteFileA("msitest\\kappa");
+ DeleteFileA("msitest\\lambda");
+ DeleteFileA("msitest\\mu");
+ RemoveDirectoryA("msitest");
}
static const struct sourcepathmap
@@ -4489,8 +4490,8 @@ static void test_sourcedirprop(void)
ok(delete_pf("msitest\\augustus", TRUE), "File installed\n");
ok(delete_pf("msitest", FALSE), "Directory created\n");
- DeleteFile("msitest\\augustus");
- RemoveDirectory("msitest");
+ DeleteFileA("msitest\\augustus");
+ RemoveDirectoryA("msitest");
CreateDirectoryA("altsource", NULL);
CreateDirectoryA("altsource\\msitest", NULL);
@@ -4503,14 +4504,14 @@ static void test_sourcedirprop(void)
ok(delete_pf("msitest\\augustus", TRUE), "File installed\n");
ok(delete_pf("msitest", FALSE), "Directory created\n");
- DeleteFile("altsource\\msitest\\augustus");
- RemoveDirectory("altsource\\msitest");
- RemoveDirectory("altsource");
+ DeleteFileA("altsource\\msitest\\augustus");
+ RemoveDirectoryA("altsource\\msitest");
+ RemoveDirectoryA("altsource");
error:
- DeleteFile("msitest\\augustus");
- RemoveDirectory("msitest");
- DeleteFile(msifile);
+ DeleteFileA("msitest\\augustus");
+ RemoveDirectoryA("msitest");
+ DeleteFileA(msifile);
}
static void test_adminimage(void)
@@ -4607,9 +4608,9 @@ static void test_propcase(void)
ok(delete_pf("msitest", FALSE), "Directory not created\n");
error:
- DeleteFile(msifile);
- DeleteFile("msitest\\augustus");
- RemoveDirectory("msitest");
+ DeleteFileA(msifile);
+ DeleteFileA("msitest\\augustus");
+ RemoveDirectoryA("msitest");
}
static void test_int_widths( void )
@@ -4621,7 +4622,6 @@ static void test_int_widths( void )
static const char int4[] = "int4\ni4\nint4\tint4\n1";
static const char int5[] = "int5\ni5\nint5\tint5\n1";
static const char int8[] = "int8\ni8\nint8\tint8\n1";
-
static const struct
{
const char *data;
@@ -4638,7 +4638,6 @@ static void test_int_widths( void )
{ int5, sizeof(int5) - 1, ERROR_FUNCTION_FAILED },
{ int8, sizeof(int8) - 1, ERROR_FUNCTION_FAILED }
};
-
char tmpdir[MAX_PATH], msitable[MAX_PATH], msidb[MAX_PATH];
MSIHANDLE db;
UINT r, i;
@@ -4646,18 +4645,22 @@ static void test_int_widths( void )
GetTempPathA(MAX_PATH, tmpdir);
CreateDirectoryA(tmpdir, NULL);
- strcpy(msitable, tmpdir);
- strcat(msitable, "\\msitable.idt");
+ lstrcpyA(msitable, tmpdir);
+ lstrcatA(msitable, "\\msitable.idt");
- strcpy(msidb, tmpdir);
- strcat(msidb, "\\msitest.msi");
+ lstrcpyA(msidb, tmpdir);
+ lstrcatA(msidb, "\\msitest.msi");
r = MsiOpenDatabaseA(msidb, MSIDBOPEN_CREATE, &db);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++)
{
- write_file(msitable, tests[i].data, tests[i].size);
+ DWORD count;
+ HANDLE handle = CreateFileA(msitable, GENERIC_WRITE, 0, NULL,
+ CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+ WriteFile(handle, tests[i].data, tests[i].size, &count, NULL);
+ CloseHandle(handle);
r = MsiDatabaseImportA(db, tmpdir, "msitable.idt");
ok(r == tests[i].ret, " %u expected %u, got %u\n", i, tests[i].ret, r);
@@ -4728,7 +4731,7 @@ static void test_shortcut(void)
error:
delete_test_files();
- DeleteFile(msifile);
+ DeleteFileA(msifile);
}
static void test_preselected(void)
@@ -4785,7 +4788,7 @@ static void test_preselected(void)
error:
delete_test_files();
- DeleteFile(msifile);
+ DeleteFileA(msifile);
}
static void test_installed_prop(void)
@@ -4836,7 +4839,7 @@ static void test_installed_prop(void)
error:
delete_test_files();
- DeleteFile(msifile);
+ DeleteFileA(msifile);
}
static void test_allusers_prop(void)
@@ -4940,7 +4943,7 @@ static void test_allusers_prop(void)
error:
delete_test_files();
- DeleteFile(msifile);
+ DeleteFileA(msifile);
}
static char session_manager[] = "System\\CurrentControlSet\\Control\\Session Manager";
@@ -5018,7 +5021,7 @@ static BOOL file_matches_data(LPCSTR file, LPCSTR data)
HANDLE handle;
char buf[128];
- handle = CreateFile(file, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
+ handle = CreateFileA(file, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
ok(handle != INVALID_HANDLE_VALUE, "failed to open %s (%u)\n", file, GetLastError());
if (ReadFile(handle, buf, sizeof(buf), &len, NULL) && len >= data_len)
@@ -5051,11 +5054,11 @@ static void test_file_in_use(void)
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
- lstrcpy(path, PROG_FILES_DIR);
- lstrcat(path, "\\msitest");
+ lstrcpyA(path, PROG_FILES_DIR);
+ lstrcatA(path, "\\msitest");
CreateDirectoryA(path, NULL);
- lstrcat(path, "\\maximus");
+ lstrcatA(path, "\\maximus");
file = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL);
r = MsiInstallProductA(msifile, "REBOOT=ReallySuppress FULL=1");
@@ -5086,7 +5089,7 @@ error:
delete_pf("msitest", FALSE);
DeleteFileA("msitest\\maximus");
delete_test_files();
- DeleteFile(msifile);
+ DeleteFileA(msifile);
}
static void test_file_in_use_cab(void)
@@ -5107,17 +5110,17 @@ static void test_file_in_use_cab(void)
CreateDirectoryA("msitest", NULL);
create_file("maximus", 500);
create_cab_file("test1.cab", MEDIA_SIZE, "maximus\0");
- DeleteFile("maximus");
+ DeleteFileA("maximus");
create_database(msifile, fiuc_tables, sizeof(fiuc_tables) / sizeof(msi_table));
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
- lstrcpy(path, PROG_FILES_DIR);
- lstrcat(path, "\\msitest");
+ lstrcpyA(path, PROG_FILES_DIR);
+ lstrcatA(path, "\\msitest");
CreateDirectoryA(path, NULL);
- lstrcat(path, "\\maximus");
+ lstrcatA(path, "\\maximus");
file = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL);
r = MsiInstallProductA(msifile, "REBOOT=ReallySuppress FULL=1");
@@ -5149,7 +5152,7 @@ error:
DeleteFileA("msitest\\maximus");
delete_cab_files();
delete_test_files();
- DeleteFile(msifile);
+ DeleteFileA(msifile);
}
static void test_feature_override(void)
@@ -5230,7 +5233,7 @@ error:
DeleteFileA("msitest\\preselected.txt");
DeleteFileA("msitest\\notpreselected.txt");
delete_test_files();
- DeleteFile(msifile);
+ DeleteFileA(msifile);
}
static void test_icon_table(void)
@@ -5251,7 +5254,7 @@ static void test_icon_table(void)
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
- res = MsiOpenDatabase(msifile, MSIDBOPEN_TRANSACT, &hdb);
+ res = MsiOpenDatabaseA(msifile, MSIDBOPEN_TRANSACT, &hdb);
ok(res == ERROR_SUCCESS, "failed to open db: %d\n", res);
query = "CREATE TABLE `Icon` (`Name` CHAR(72) NOT NULL, `Data` OBJECT NOT NULL PRIMARY KEY `Name`)";
@@ -5260,7 +5263,7 @@ static void test_icon_table(void)
create_file("icon.ico", 100);
record = MsiCreateRecord(1);
- res = MsiRecordSetStream(record, 1, "icon.ico");
+ res = MsiRecordSetStreamA(record, 1, "icon.ico");
ok(res == ERROR_SUCCESS, "Failed to add stream data to record: %d\n", res);
query = "INSERT INTO `Icon` (`Name`, `Data`) VALUES ('testicon', ?)";
@@ -5280,7 +5283,7 @@ static void test_icon_table(void)
if (res == ERROR_INSTALL_PACKAGE_REJECTED)
{
skip("Not enough rights to perform tests\n");
- DeleteFile(msifile);
+ DeleteFileA(msifile);
return;
}
ok(res == ERROR_SUCCESS, "Failed to do per-user install: %d\n", res);
@@ -5312,7 +5315,7 @@ static void test_icon_table(void)
ok(!file_exists(path), "System-wide icon file not removed (%s)\n", path);
delete_pfmsitest_files();
- DeleteFile(msifile);
+ DeleteFileA(msifile);
}
static void test_package_validation(void)
@@ -5341,19 +5344,19 @@ static void test_package_validation(void)
ok(delete_pf("msitest\\maximus", TRUE), "file does not exist\n");
ok(delete_pf("msitest", FALSE), "directory does not exist\n");
- DeleteFile(msifile);
+ DeleteFileA(msifile);
create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 200, "Intel,9999;9999");
r = MsiInstallProductA(msifile, NULL);
ok(r == ERROR_INSTALL_LANGUAGE_UNSUPPORTED, "Expected ERROR_INSTALL_LANGUAGE_UNSUPPORTED, got %u\n", r);
- DeleteFile(msifile);
+ DeleteFileA(msifile);
create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 200, "Intel,1033;9999");
r = MsiInstallProductA(msifile, NULL);
ok(r == ERROR_INSTALL_LANGUAGE_UNSUPPORTED, "Expected ERROR_INSTALL_LANGUAGE_UNSUPPORTED, got %u\n", r);
- DeleteFile(msifile);
+ DeleteFileA(msifile);
create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 200, "Intel,9999;1033");
r = MsiInstallProductA(msifile, NULL);
@@ -5361,25 +5364,25 @@ static void test_package_validation(void)
ok(delete_pf("msitest\\maximus", TRUE), "file does not exist\n");
ok(delete_pf("msitest", FALSE), "directory does not exist\n");
- DeleteFile(msifile);
+ DeleteFileA(msifile);
create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 200, "Intel64,9999;1033");
r = MsiInstallProductA(msifile, NULL);
ok(r == ERROR_INSTALL_PLATFORM_UNSUPPORTED, "Expected ERROR_INSTALL_PLATFORM_UNSUPPORTED, got %u\n", r);
- DeleteFile(msifile);
+ DeleteFileA(msifile);
create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 200, "Intel32,1033;1033");
r = MsiInstallProductA(msifile, NULL);
ok(r == ERROR_INSTALL_PLATFORM_UNSUPPORTED, "Expected ERROR_INSTALL_PLATFORM_UNSUPPORTED, got %u\n", r);
- DeleteFile(msifile);
+ DeleteFileA(msifile);
create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 200, "Intel32,9999;1033");
r = MsiInstallProductA(msifile, NULL);
ok(r == ERROR_INSTALL_PLATFORM_UNSUPPORTED, "Expected ERROR_INSTALL_PLATFORM_UNSUPPORTED, got %u\n", r);
- DeleteFile(msifile);
+ DeleteFileA(msifile);
create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 100, "Intel;9999");
r = MsiInstallProductA(msifile, NULL);
@@ -5389,14 +5392,14 @@ static void test_package_validation(void)
if (GetSystemDefaultLangID() == MAKELANGID( LANG_ENGLISH, SUBLANG_ENGLISH_US ))
{
- DeleteFile(msifile);
+ DeleteFileA(msifile);
create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 100, "Intel;9");
r = MsiInstallProductA(msifile, NULL);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
ok(delete_pf("msitest\\maximus", TRUE), "file does not exist\n");
ok(delete_pf("msitest", FALSE), "directory does not exist\n");
- DeleteFile(msifile);
+ DeleteFileA(msifile);
create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 100, "Intel;1024");
r = MsiInstallProductA(msifile, NULL);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
@@ -5404,7 +5407,7 @@ static void test_package_validation(void)
ok(delete_pf("msitest", FALSE), "directory does not exist\n");
}
- DeleteFile(msifile);
+ DeleteFileA(msifile);
create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 100, "Intel32;0");
r = MsiInstallProductA(msifile, NULL);
@@ -5414,7 +5417,7 @@ static void test_package_validation(void)
if (is_64bit && !is_wow64)
{
- DeleteFile(msifile);
+ DeleteFileA(msifile);
create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 100, "Intel;0");
r = MsiInstallProductA(msifile, NULL);
@@ -5422,7 +5425,7 @@ static void test_package_validation(void)
ok(delete_pf("msitest\\maximus", TRUE), "file does not exist\n");
ok(delete_pf("msitest", FALSE), "directory does not exist\n");
- DeleteFile(msifile);
+ DeleteFileA(msifile);
create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 100, "x64;0");
r = MsiInstallProductA(msifile, NULL);
@@ -5430,7 +5433,7 @@ static void test_package_validation(void)
ok(!delete_pf("msitest\\maximus", TRUE), "file exists\n");
ok(!delete_pf("msitest", FALSE), "directory exists\n");
- DeleteFile(msifile);
+ DeleteFileA(msifile);
create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 200, "x64;0");
r = MsiInstallProductA(msifile, NULL);
@@ -5440,7 +5443,7 @@ static void test_package_validation(void)
}
else if (is_wow64)
{
- DeleteFile(msifile);
+ DeleteFileA(msifile);
create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 100, "Intel;0");
r = MsiInstallProductA(msifile, NULL);
@@ -5448,7 +5451,7 @@ static void test_package_validation(void)
ok(delete_pf("msitest\\maximus", TRUE), "file does not exist\n");
ok(delete_pf("msitest", FALSE), "directory does not exist\n");
- DeleteFile(msifile);
+ DeleteFileA(msifile);
create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 100, "x64;0");
r = MsiInstallProductA(msifile, NULL);
@@ -5456,7 +5459,7 @@ static void test_package_validation(void)
ok(!delete_pf_native("msitest\\maximus", TRUE), "file exists\n");
ok(!delete_pf_native("msitest", FALSE), "directory exists\n");
- DeleteFile(msifile);
+ DeleteFileA(msifile);
create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 200, "x64;0");
r = MsiInstallProductA(msifile, NULL);
@@ -5466,7 +5469,7 @@ static void test_package_validation(void)
}
else
{
- DeleteFile(msifile);
+ DeleteFileA(msifile);
create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 100, "Intel;0");
r = MsiInstallProductA(msifile, NULL);
@@ -5474,7 +5477,7 @@ static void test_package_validation(void)
ok(delete_pf("msitest\\maximus", TRUE), "file does not exist\n");
ok(delete_pf("msitest", FALSE), "directory does not exist\n");
- DeleteFile(msifile);
+ DeleteFileA(msifile);
create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 100, "Alpha,Beta,Intel;0");
r = MsiInstallProductA(msifile, NULL);
@@ -5482,7 +5485,7 @@ static void test_package_validation(void)
ok(delete_pf("msitest\\maximus", TRUE), "file does not exist\n");
ok(delete_pf("msitest", FALSE), "directory does not exist\n");
- DeleteFile(msifile);
+ DeleteFileA(msifile);
create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 100, "x64;0");
r = MsiInstallProductA(msifile, NULL);
@@ -5490,7 +5493,7 @@ static void test_package_validation(void)
ok(!delete_pf("msitest\\maximus", TRUE), "file exists\n");
ok(!delete_pf("msitest", FALSE), "directory exists\n");
- DeleteFile(msifile);
+ DeleteFileA(msifile);
create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 200, "x64;0");
r = MsiInstallProductA(msifile, NULL);
@@ -5501,9 +5504,9 @@ static void test_package_validation(void)
error:
/* Delete the files in the temp (current) folder */
- DeleteFile(msifile);
- DeleteFile("msitest\\maximus");
- RemoveDirectory("msitest");
+ DeleteFileA(msifile);
+ DeleteFileA("msitest\\maximus");
+ RemoveDirectoryA("msitest");
}
static void test_upgrade_code(void)
@@ -5535,7 +5538,7 @@ static void test_upgrade_code(void)
DeleteFileA("msitest\\upgradecode.txt");
RemoveDirectoryA("msitest");
- DeleteFile(msifile);
+ DeleteFileA(msifile);
}
static void test_mixed_package(void)
@@ -5640,7 +5643,7 @@ static void test_volume_props(void)
DeleteFileA("msitest\\volumeprop.txt");
RemoveDirectoryA("msitest");
- DeleteFile(msifile);
+ DeleteFileA(msifile);
}
START_TEST(install)
@@ -5656,7 +5659,7 @@ START_TEST(install)
pIsWow64Process(GetCurrentProcess(), &is_wow64);
GetCurrentDirectoryA(MAX_PATH, prev_path);
- GetTempPath(MAX_PATH, temp_path);
+ GetTempPathA(MAX_PATH, temp_path);
SetCurrentDirectoryA(temp_path);
lstrcpyA(CURR_DIR, temp_path);
--
1.8.1.5
More information about the wine-patches
mailing list