[MSI_WINETEST]

[reactos.git] / rostests / winetests / msi / msi.c

diff --git a/rostests/winetests/msi/msi.c b/rostests/winetests/msi/msi.c
index 5df72e9..3bf6595 100644 (file)
--- a/rostests/winetests/msi/msi.c
+++ b/rostests/winetests/msi/msi.c
@@ -33,12 +33,14 @@
 
 static BOOL is_wow64;
 static const char msifile[] = "winetest.msi";
+static const WCHAR msifileW[] = {'w','i','n','e','t','e','s','t','.','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];
 static char COMMON_FILES_DIR[MAX_PATH];
 static char WINDOWS_DIR[MAX_PATH];
 
+static BOOL (WINAPI *pCheckTokenMembership)(HANDLE,PSID,PBOOL);
 static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*);
 static BOOL (WINAPI *pOpenProcessToken)( HANDLE, DWORD, PHANDLE );
 static LONG (WINAPI *pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD);
@@ -97,6 +99,7 @@ static void init_functionpointers(void)
     GET_PROC(hmsi, MsiEnumComponentsExA)
     GET_PROC(hmsi, MsiSourceListGetInfoA)
 
+    GET_PROC(hadvapi32, CheckTokenMembership);
     GET_PROC(hadvapi32, ConvertSidToStringSidA)
     GET_PROC(hadvapi32, OpenProcessToken);
     GET_PROC(hadvapi32, RegDeleteKeyExA)
@@ -110,7 +113,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;
@@ -140,7 +143,7 @@ static BOOL get_system_dirs(void)
 
 static BOOL file_exists(const char *file)
 {
-    return GetFileAttributes(file) != INVALID_FILE_ATTRIBUTES;
+    return GetFileAttributesA(file) != INVALID_FILE_ATTRIBUTES;
 }
 
 static BOOL pf_exists(const char *file)
@@ -169,16 +172,38 @@ static BOOL delete_pf(const char *rel_path, BOOL is_file)
 
 static BOOL is_process_limited(void)
 {
+    SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY};
+    PSID Group;
+    BOOL IsInGroup;
     HANDLE token;
-    TOKEN_ELEVATION_TYPE type = TokenElevationTypeDefault;
-    DWORD size;
-    BOOL ret;
 
-    if (!pOpenProcessToken) return FALSE;
-    if (!pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) return FALSE;
-    ret = GetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size);
-    CloseHandle(token);
-    return (ret && type == TokenElevationTypeLimited);
+    if (!pCheckTokenMembership || !pOpenProcessToken) return FALSE;
+
+    if (!AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID,
+                                  DOMAIN_ALIAS_RID_ADMINS,
+                                  0, 0, 0, 0, 0, 0, &Group) ||
+        !pCheckTokenMembership(NULL, Group, &IsInGroup))
+    {
+        trace("Could not check if the current user is an administrator\n");
+        return FALSE;
+    }
+    if (!IsInGroup)
+    {
+        /* Only administrators have enough privileges for these tests */
+        return TRUE;
+    }
+
+    if (pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token))
+    {
+        BOOL ret;
+        TOKEN_ELEVATION_TYPE type = TokenElevationTypeDefault;
+        DWORD size;
+
+        ret = GetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size);
+        CloseHandle(token);
+        return (ret && type == TokenElevationTypeLimited);
+    }
+    return FALSE;
 }
 
 /* cabinet definitions */
@@ -319,9 +344,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);
 
     res = GetFileInformationByHandle(handle, &finfo);
@@ -330,7 +354,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;
@@ -385,7 +409,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);
@@ -434,7 +458,7 @@ static BOOL add_cabinet_storage(LPCSTR db, LPCSTR cabinet)
 
 static void delete_cab_files(void)
 {
-    SHFILEOPSTRUCT shfl;
+    SHFILEOPSTRUCTA shfl;
     CHAR path[MAX_PATH+10];
 
     lstrcpyA(path, CURR_DIR);
@@ -447,7 +471,7 @@ static void delete_cab_files(void)
     shfl.pTo = NULL;
     shfl.fFlags = FOF_FILESONLY | FOF_NOCONFIRMATION | FOF_NORECURSION | FOF_SILENT;
 
-    SHFileOperation(&shfl);
+    SHFileOperationA(&shfl);
 }
 
 /* msi database data */
@@ -994,9 +1018,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);
 }
@@ -1044,9 +1067,14 @@ static void create_database_wordcount(const CHAR *name, const msi_table *tables,
 {
     MSIHANDLE db;
     UINT r;
-    int j;
+    WCHAR *nameW;
+    int j, len;
 
-    r = MsiOpenDatabaseA(name, MSIDBOPEN_CREATE, &db);
+    len = MultiByteToWideChar( CP_ACP, 0, name, -1, NULL, 0 );
+    if (!(nameW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return;
+    MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, len );
+
+    r = MsiOpenDatabaseW(nameW, MSIDBOPEN_CREATE, &db);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
 
     /* import the tables into the database */
@@ -1068,6 +1096,7 @@ static void create_database_wordcount(const CHAR *name, const msi_table *tables,
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
 
     MsiCloseHandle(db);
+    HeapFree( GetProcessHeap(), 0, nameW );
 }
 
 static UINT run_query(MSIHANDLE hdb, const char *query)
@@ -1075,7 +1104,7 @@ static UINT run_query(MSIHANDLE hdb, const char *query)
     MSIHANDLE hview = 0;
     UINT r;
 
-    r = MsiDatabaseOpenView(hdb, query, &hview);
+    r = MsiDatabaseOpenViewA(hdb, query, &hview);
     if (r != ERROR_SUCCESS)
         return r;
 
@@ -1092,33 +1121,33 @@ static UINT set_summary_info(MSIHANDLE hdb, LPSTR prodcode)
     MSIHANDLE suminfo;
 
     /* build summary info */
-    res = MsiGetSummaryInformation(hdb, NULL, 7, &suminfo);
+    res = MsiGetSummaryInformationA(hdb, NULL, 7, &suminfo);
     ok(res == ERROR_SUCCESS, "Failed to open summaryinfo\n");
 
-    res = MsiSummaryInfoSetProperty(suminfo, 2, VT_LPSTR, 0, NULL,
+    res = MsiSummaryInfoSetPropertyA(suminfo, 2, VT_LPSTR, 0, NULL,
                                     "Installation Database");
     ok(res == ERROR_SUCCESS, "Failed to set summary info\n");
 
-    res = MsiSummaryInfoSetProperty(suminfo, 3, VT_LPSTR, 0, NULL,
+    res = MsiSummaryInfoSetPropertyA(suminfo, 3, VT_LPSTR, 0, NULL,
                                     "Installation Database");
     ok(res == ERROR_SUCCESS, "Failed to set summary info\n");
 
-    res = MsiSummaryInfoSetProperty(suminfo, 4, VT_LPSTR, 0, NULL,
+    res = MsiSummaryInfoSetPropertyA(suminfo, 4, VT_LPSTR, 0, NULL,
                                     "Wine Hackers");
     ok(res == ERROR_SUCCESS, "Failed to set summary info\n");
 
-    res = MsiSummaryInfoSetProperty(suminfo, 7, VT_LPSTR, 0, NULL,
+    res = MsiSummaryInfoSetPropertyA(suminfo, 7, VT_LPSTR, 0, NULL,
                                     ";1033");
     ok(res == ERROR_SUCCESS, "Failed to set summary info\n");
 
-    res = MsiSummaryInfoSetProperty(suminfo, PID_REVNUMBER, VT_LPSTR, 0, NULL,
+    res = MsiSummaryInfoSetPropertyA(suminfo, PID_REVNUMBER, VT_LPSTR, 0, NULL,
                                     "{A2078D65-94D6-4205-8DEE-F68D6FD622AA}");
     ok(res == ERROR_SUCCESS, "Failed to set summary info\n");
 
-    res = MsiSummaryInfoSetProperty(suminfo, 14, VT_I4, 100, NULL, NULL);
+    res = MsiSummaryInfoSetPropertyA(suminfo, 14, VT_I4, 100, NULL, NULL);
     ok(res == ERROR_SUCCESS, "Failed to set summary info\n");
 
-    res = MsiSummaryInfoSetProperty(suminfo, 15, VT_I4, 0, NULL, NULL);
+    res = MsiSummaryInfoSetPropertyA(suminfo, 15, VT_I4, 0, NULL, NULL);
     ok(res == ERROR_SUCCESS, "Failed to set summary info\n");
 
     res = MsiSummaryInfoPersist(suminfo);
@@ -1136,10 +1165,10 @@ static MSIHANDLE create_package_db(LPSTR prodcode)
     CHAR query[MAX_PATH];
     UINT res;
 
-    DeleteFile(msifile);
+    DeleteFileA(msifile);
 
     /* create an empty database */
-    res = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb);
+    res = MsiOpenDatabaseW(msifileW, MSIDBOPEN_CREATE, &hdb);
     ok( res == ERROR_SUCCESS , "Failed to create database\n" );
     if (res != ERROR_SUCCESS)
         return hdb;
@@ -1186,10 +1215,10 @@ static void test_usefeature(void)
         return;
     }
 
-    r = MsiQueryFeatureState(NULL,NULL);
+    r = MsiQueryFeatureStateA(NULL, NULL);
     ok( r == INSTALLSTATE_INVALIDARG, "wrong return val\n");
 
-    r = MsiQueryFeatureState("{9085040-6000-11d3-8cfe-0150048383c9}" ,NULL);
+    r = MsiQueryFeatureStateA("{9085040-6000-11d3-8cfe-0150048383c9}" ,NULL);
     ok( r == INSTALLSTATE_INVALIDARG, "wrong return val\n");
 
     r = pMsiUseFeatureExA(NULL,NULL,0,0);
@@ -1512,7 +1541,7 @@ static void test_MsiGetFileHash(void)
         ret = memcmp(&hash, &hash_data[i].hash, HASHSIZE);
         ok(!ret, "Hash incorrect\n");
 
-        DeleteFile(name);
+        DeleteFileA(name);
     }
 }
 
@@ -1683,6 +1712,7 @@ static void test_MsiQueryProductState(void)
     {
         skip("Not enough rights to perform tests\n");
         RegDeleteKeyA(userkey, "");
+        RegCloseKey(userkey);
         LocalFree(usersid);
         return;
     }
@@ -1717,6 +1747,14 @@ static void test_MsiQueryProductState(void)
     lstrcatA(keypath, prod_squashed);
 
     res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &localkey, NULL);
+    if (res == ERROR_ACCESS_DENIED)
+    {
+        skip("Not enough rights to perform tests\n");
+        RegDeleteKeyA(userkey, "");
+        RegCloseKey(userkey);
+        LocalFree(usersid);
+        return;
+    }
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
 
     /* local product key exists */
@@ -2553,6 +2591,12 @@ static void test_MsiQueryComponentState(void)
     lstrcatA(keypath, "\\InstallProperties");
 
     res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &prodkey, NULL);
+    if (res == ERROR_ACCESS_DENIED)
+    {
+        skip("Not enough rights to perform tests\n");
+        LocalFree(usersid);
+        return;
+    }
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
 
     /* local system product key exists */
@@ -3824,7 +3868,7 @@ static void get_version_info(LPSTR path, LPSTR *vercheck, LPDWORD verchecksz,
             LOWORD(ffi->dwFileVersionLS));
     *verchecksz = lstrlenA(*vercheck);
 
-    VerQueryValue(version, "\\VarFileInfo\\Translation", (void **)&lang, &size);
+    VerQueryValueA(version, "\\VarFileInfo\\Translation", (void **)&lang, &size);
     *langcheck = HeapAlloc(GetProcessHeap(), 0, MAX_PATH);
     sprintf(*langcheck, "%d", *lang);
     *langchecksz = lstrlenA(*langcheck);
@@ -4130,7 +4174,7 @@ static void test_MsiGetProductInfo(void)
     /* NULL szProduct */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(NULL, INSTALLPROPERTY_HELPLINK, buf, &sz);
+    r = MsiGetProductInfoA(NULL, INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(r == ERROR_INVALID_PARAMETER,
        "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -4139,7 +4183,7 @@ static void test_MsiGetProductInfo(void)
     /* empty szProduct */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA("", INSTALLPROPERTY_HELPLINK, buf, &sz);
+    r = MsiGetProductInfoA("", INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(r == ERROR_INVALID_PARAMETER,
        "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -4148,7 +4192,7 @@ static void test_MsiGetProductInfo(void)
     /* garbage szProduct */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA("garbage", INSTALLPROPERTY_HELPLINK, buf, &sz);
+    r = MsiGetProductInfoA("garbage", INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(r == ERROR_INVALID_PARAMETER,
        "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -4158,7 +4202,7 @@ static void test_MsiGetProductInfo(void)
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
     r = MsiGetProductInfoA("6700E8CF-95AB-4D9C-BC2C-15840DEA7A5D",
-                           INSTALLPROPERTY_HELPLINK, buf, &sz);
+                           INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(r == ERROR_INVALID_PARAMETER,
        "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -4168,7 +4212,7 @@ static void test_MsiGetProductInfo(void)
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
     r = MsiGetProductInfoA("{6700E8CF-95AB-4D9C-BC2C-15840DEA7A5D}",
-                           INSTALLPROPERTY_HELPLINK, buf, &sz);
+                           INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -4178,7 +4222,7 @@ static void test_MsiGetProductInfo(void)
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
     r = MsiGetProductInfoA("A938G02JF-2NF3N93-VN3-2NNF-3KGKALDNF93",
-                           INSTALLPROPERTY_HELPLINK, buf, &sz);
+                           INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(r == ERROR_INVALID_PARAMETER,
        "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -4196,7 +4240,7 @@ static void test_MsiGetProductInfo(void)
     /* not installed, NULL lpValueBuf */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINK, NULL, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, NULL, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -4205,7 +4249,7 @@ static void test_MsiGetProductInfo(void)
     /* not installed, NULL pcchValueBuf */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINK, buf, NULL);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, buf, NULL);
     ok(r == ERROR_INVALID_PARAMETER,
        "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -4214,7 +4258,7 @@ static void test_MsiGetProductInfo(void)
     /* created guid cannot possibly be an installed product code */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINK, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -4237,7 +4281,7 @@ static void test_MsiGetProductInfo(void)
     /* managed product code exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINK, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -4263,7 +4307,7 @@ static void test_MsiGetProductInfo(void)
     /* local user product code exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINK, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -4280,7 +4324,7 @@ static void test_MsiGetProductInfo(void)
     /* both local and managed product code exist */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINK, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -4292,7 +4336,7 @@ static void test_MsiGetProductInfo(void)
     /* InstallProperties key exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINK, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
     ok(sz == 0, "Expected 0, got %d\n", sz);
@@ -4303,31 +4347,31 @@ static void test_MsiGetProductInfo(void)
     /* HelpLink value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINK, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "link"), "Expected \"link\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
 
     /* pcchBuf is NULL */
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINK, NULL, NULL);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, NULL, NULL);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
 
     /* lpValueBuf is NULL */
     sz = MAX_PATH;
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINK, NULL, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, NULL, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(sz == 4, "Expected 4, got %d\n", sz);
 
     /* lpValueBuf is NULL, pcchValueBuf is too small */
     sz = 2;
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINK, NULL, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, NULL, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(sz == 4, "Expected 4, got %d\n", sz);
 
     /* lpValueBuf is non-NULL, pcchValueBuf is too small */
     sz = 2;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINK, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to remain unchanged, got \"%s\"\n", buf);
     ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -4335,7 +4379,7 @@ static void test_MsiGetProductInfo(void)
     /* lpValueBuf is non-NULL, pcchValueBuf is exactly 4 */
     sz = 4;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINK, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"),
        "Expected buf to remain unchanged, got \"%s\"\n", buf);
@@ -4371,7 +4415,7 @@ static void test_MsiGetProductInfo(void)
     /* user product key exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINK, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected \"apple\", got \"%s\"\n", buf);
@@ -4388,7 +4432,7 @@ static void test_MsiGetProductInfo(void)
     /* local user product key exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINK, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected \"apple\", got \"%s\"\n", buf);
@@ -4400,7 +4444,7 @@ static void test_MsiGetProductInfo(void)
     /* InstallProperties key exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINK, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
     ok(sz == 0, "Expected 0, got %d\n", sz);
@@ -4411,7 +4455,7 @@ static void test_MsiGetProductInfo(void)
     /* HelpLink value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINK, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "link"), "Expected \"link\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -4433,7 +4477,7 @@ static void test_MsiGetProductInfo(void)
     /* classes product key exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINK, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected \"apple\", got \"%s\"\n", buf);
@@ -4450,7 +4494,7 @@ static void test_MsiGetProductInfo(void)
     /* local user product key exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINK, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected \"apple\", got \"%s\"\n", buf);
@@ -4462,7 +4506,7 @@ static void test_MsiGetProductInfo(void)
     /* InstallProperties key exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINK, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected \"apple\", got \"%s\"\n", buf);
@@ -4483,7 +4527,7 @@ static void test_MsiGetProductInfo(void)
     /* Local System product key exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINK, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
         "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected \"apple\", got \"%s\"\n", buf);
@@ -4495,7 +4539,7 @@ static void test_MsiGetProductInfo(void)
     /* InstallProperties key exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINK, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
     ok(sz == 0, "Expected 0, got %d\n", sz);
@@ -4506,7 +4550,7 @@ static void test_MsiGetProductInfo(void)
     /* HelpLink value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINK, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "link"), "Expected \"link\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -4518,7 +4562,7 @@ static void test_MsiGetProductInfo(void)
     /* HelpLink type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINK, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
     ok(sz == 2, "Expected 2, got %d\n", sz);
@@ -4529,7 +4573,7 @@ static void test_MsiGetProductInfo(void)
     /* DisplayName value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTALLEDPRODUCTNAME, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTALLEDPRODUCTNAMEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "name"), "Expected \"name\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -4541,7 +4585,7 @@ static void test_MsiGetProductInfo(void)
     /* DisplayName type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTALLEDPRODUCTNAME, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTALLEDPRODUCTNAMEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
     ok(sz == 2, "Expected 2, got %d\n", sz);
@@ -4552,7 +4596,7 @@ static void test_MsiGetProductInfo(void)
     /* DisplayVersion value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_VERSIONSTRING, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_VERSIONSTRINGA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "1.1.1"), "Expected \"1.1.1\", got \"%s\"\n", buf);
     ok(sz == 5, "Expected 5, got %d\n", sz);
@@ -4564,7 +4608,7 @@ static void test_MsiGetProductInfo(void)
     /* DisplayVersion type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_VERSIONSTRING, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_VERSIONSTRINGA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
     ok(sz == 2, "Expected 2, got %d\n", sz);
@@ -4575,7 +4619,7 @@ static void test_MsiGetProductInfo(void)
     /* HelpTelephone value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPTELEPHONE, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPTELEPHONEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "tele"), "Expected \"tele\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -4587,7 +4631,7 @@ static void test_MsiGetProductInfo(void)
     /* HelpTelephone type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPTELEPHONE, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPTELEPHONEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
     ok(sz == 2, "Expected 2, got %d\n", sz);
@@ -4598,7 +4642,7 @@ static void test_MsiGetProductInfo(void)
     /* InstallLocation value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTALLLOCATION, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTALLLOCATIONA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "loc"), "Expected \"loc\", got \"%s\"\n", buf);
     ok(sz == 3, "Expected 3, got %d\n", sz);
@@ -4610,7 +4654,7 @@ static void test_MsiGetProductInfo(void)
     /* InstallLocation type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTALLLOCATION, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTALLLOCATIONA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
     ok(sz == 2, "Expected 2, got %d\n", sz);
@@ -4621,7 +4665,7 @@ static void test_MsiGetProductInfo(void)
     /* InstallSource value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTALLSOURCE, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTALLSOURCEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "source"), "Expected \"source\", got \"%s\"\n", buf);
     ok(sz == 6, "Expected 6, got %d\n", sz);
@@ -4633,7 +4677,7 @@ static void test_MsiGetProductInfo(void)
     /* InstallSource type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTALLSOURCE, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTALLSOURCEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
     ok(sz == 2, "Expected 2, got %d\n", sz);
@@ -4644,7 +4688,7 @@ static void test_MsiGetProductInfo(void)
     /* InstallDate value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTALLDATE, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTALLDATEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "date"), "Expected \"date\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -4656,7 +4700,7 @@ static void test_MsiGetProductInfo(void)
     /* InstallDate type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTALLDATE, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTALLDATEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
     ok(sz == 2, "Expected 2, got %d\n", sz);
@@ -4667,7 +4711,7 @@ static void test_MsiGetProductInfo(void)
     /* Publisher value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PUBLISHER, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PUBLISHERA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "pub"), "Expected \"pub\", got \"%s\"\n", buf);
     ok(sz == 3, "Expected 3, got %d\n", sz);
@@ -4679,7 +4723,7 @@ static void test_MsiGetProductInfo(void)
     /* Publisher type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PUBLISHER, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PUBLISHERA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
     ok(sz == 2, "Expected 2, got %d\n", sz);
@@ -4690,7 +4734,7 @@ static void test_MsiGetProductInfo(void)
     /* LocalPackage value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_LOCALPACKAGE, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_LOCALPACKAGEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "pack"), "Expected \"pack\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -4702,7 +4746,7 @@ static void test_MsiGetProductInfo(void)
     /* LocalPackage type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_LOCALPACKAGE, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_LOCALPACKAGEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
     ok(sz == 2, "Expected 2, got %d\n", sz);
@@ -4713,7 +4757,7 @@ static void test_MsiGetProductInfo(void)
     /* UrlInfoAbout value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_URLINFOABOUT, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_URLINFOABOUTA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "about"), "Expected \"about\", got \"%s\"\n", buf);
     ok(sz == 5, "Expected 5, got %d\n", sz);
@@ -4725,7 +4769,7 @@ static void test_MsiGetProductInfo(void)
     /* UrlInfoAbout type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_URLINFOABOUT, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_URLINFOABOUTA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
     ok(sz == 2, "Expected 2, got %d\n", sz);
@@ -4736,7 +4780,7 @@ static void test_MsiGetProductInfo(void)
     /* UrlUpdateInfo value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_URLUPDATEINFO, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_URLUPDATEINFOA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "info"), "Expected \"info\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -4748,7 +4792,7 @@ static void test_MsiGetProductInfo(void)
     /* UrlUpdateInfo type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_URLUPDATEINFO, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_URLUPDATEINFOA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
     ok(sz == 2, "Expected 2, got %d\n", sz);
@@ -4759,7 +4803,7 @@ static void test_MsiGetProductInfo(void)
     /* VersionMinor value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_VERSIONMINOR, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_VERSIONMINORA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "1"), "Expected \"1\", got \"%s\"\n", buf);
     ok(sz == 1, "Expected 1, got %d\n", sz);
@@ -4771,7 +4815,7 @@ static void test_MsiGetProductInfo(void)
     /* VersionMinor type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_VERSIONMINOR, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_VERSIONMINORA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
     ok(sz == 2, "Expected 2, got %d\n", sz);
@@ -4782,7 +4826,7 @@ static void test_MsiGetProductInfo(void)
     /* VersionMajor value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_VERSIONMAJOR, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_VERSIONMAJORA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "1"), "Expected \"1\", got \"%s\"\n", buf);
     ok(sz == 1, "Expected 1, got %d\n", sz);
@@ -4794,7 +4838,7 @@ static void test_MsiGetProductInfo(void)
     /* VersionMajor type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_VERSIONMAJOR, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_VERSIONMAJORA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
     ok(sz == 2, "Expected 2, got %d\n", sz);
@@ -4805,7 +4849,7 @@ static void test_MsiGetProductInfo(void)
     /* ProductID value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PRODUCTID, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PRODUCTIDA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "id"), "Expected \"id\", got \"%s\"\n", buf);
     ok(sz == 2, "Expected 2, got %d\n", sz);
@@ -4817,7 +4861,7 @@ static void test_MsiGetProductInfo(void)
     /* ProductID type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PRODUCTID, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PRODUCTIDA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
     ok(sz == 2, "Expected 2, got %d\n", sz);
@@ -4828,7 +4872,7 @@ static void test_MsiGetProductInfo(void)
     /* RegCompany value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_REGCOMPANY, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_REGCOMPANYA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "comp"), "Expected \"comp\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -4840,7 +4884,7 @@ static void test_MsiGetProductInfo(void)
     /* RegCompany type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_REGCOMPANY, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_REGCOMPANYA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
     ok(sz == 2, "Expected 2, got %d\n", sz);
@@ -4851,7 +4895,7 @@ static void test_MsiGetProductInfo(void)
     /* RegOwner value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_REGOWNER, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_REGOWNERA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "own"), "Expected \"own\", got \"%s\"\n", buf);
     ok(sz == 3, "Expected 3, got %d\n", sz);
@@ -4863,7 +4907,7 @@ static void test_MsiGetProductInfo(void)
     /* RegOwner type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_REGOWNER, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_REGOWNERA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
     ok(sz == 2, "Expected 2, got %d\n", sz);
@@ -4874,7 +4918,7 @@ static void test_MsiGetProductInfo(void)
     /* InstanceType value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTANCETYPE, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTANCETYPEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
     ok(sz == 0, "Expected 0, got %d\n", sz);
@@ -4886,7 +4930,7 @@ static void test_MsiGetProductInfo(void)
     /* InstanceType type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTANCETYPE, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTANCETYPEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
     ok(sz == 0, "Expected 0, got %d\n", sz);
@@ -4897,7 +4941,7 @@ static void test_MsiGetProductInfo(void)
     /* InstanceType value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTANCETYPE, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTANCETYPEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "type"), "Expected \"type\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -4909,7 +4953,7 @@ static void test_MsiGetProductInfo(void)
     /* InstanceType type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTANCETYPE, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_INSTANCETYPEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
     ok(sz == 2, "Expected 2, got %d\n", sz);
@@ -4920,7 +4964,7 @@ static void test_MsiGetProductInfo(void)
     /* Transforms value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_TRANSFORMS, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_TRANSFORMSA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
     ok(sz == 0, "Expected 0, got %d\n", sz);
@@ -4932,7 +4976,7 @@ static void test_MsiGetProductInfo(void)
     /* Transforms type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_TRANSFORMS, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_TRANSFORMSA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
     ok(sz == 0, "Expected 0, got %d\n", sz);
@@ -4943,7 +4987,7 @@ static void test_MsiGetProductInfo(void)
     /* Transforms value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_TRANSFORMS, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_TRANSFORMSA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "tforms"), "Expected \"tforms\", got \"%s\"\n", buf);
     ok(sz == 6, "Expected 6, got %d\n", sz);
@@ -4955,7 +4999,7 @@ static void test_MsiGetProductInfo(void)
     /* Transforms type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_TRANSFORMS, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_TRANSFORMSA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
     ok(sz == 2, "Expected 2, got %d\n", sz);
@@ -4966,7 +5010,7 @@ static void test_MsiGetProductInfo(void)
     /* Language value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_LANGUAGE, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_LANGUAGEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
     ok(sz == 0, "Expected 0, got %d\n", sz);
@@ -4978,7 +5022,7 @@ static void test_MsiGetProductInfo(void)
     /* Language type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_LANGUAGE, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_LANGUAGEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
     ok(sz == 0, "Expected 0, got %d\n", sz);
@@ -4989,7 +5033,7 @@ static void test_MsiGetProductInfo(void)
     /* Language value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_LANGUAGE, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_LANGUAGEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "lang"), "Expected \"lang\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -5001,7 +5045,7 @@ static void test_MsiGetProductInfo(void)
     /* Language type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_LANGUAGE, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_LANGUAGEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
     ok(sz == 2, "Expected 2, got %d\n", sz);
@@ -5012,7 +5056,7 @@ static void test_MsiGetProductInfo(void)
     /* ProductName value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PRODUCTNAME, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PRODUCTNAMEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
     ok(sz == 0, "Expected 0, got %d\n", sz);
@@ -5024,7 +5068,7 @@ static void test_MsiGetProductInfo(void)
     /* ProductName type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PRODUCTNAME, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PRODUCTNAMEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
     ok(sz == 0, "Expected 0, got %d\n", sz);
@@ -5035,7 +5079,7 @@ static void test_MsiGetProductInfo(void)
     /* ProductName value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PRODUCTNAME, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PRODUCTNAMEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "name"), "Expected \"name\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -5047,7 +5091,7 @@ static void test_MsiGetProductInfo(void)
     /* ProductName type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PRODUCTNAME, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PRODUCTNAMEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
     ok(sz == 2, "Expected 2, got %d\n", sz);
@@ -5058,7 +5102,7 @@ static void test_MsiGetProductInfo(void)
     /* Assignment value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_ASSIGNMENTTYPE, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_ASSIGNMENTTYPEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
     ok(sz == 0, "Expected 0, got %d\n", sz);
@@ -5070,7 +5114,7 @@ static void test_MsiGetProductInfo(void)
     /* Assignment type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_ASSIGNMENTTYPE, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_ASSIGNMENTTYPEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
     ok(sz == 0, "Expected 0, got %d\n", sz);
@@ -5081,7 +5125,7 @@ static void test_MsiGetProductInfo(void)
     /* Assignment value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_ASSIGNMENTTYPE, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_ASSIGNMENTTYPEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "at"), "Expected \"at\", got \"%s\"\n", buf);
     ok(sz == 2, "Expected 2, got %d\n", sz);
@@ -5093,7 +5137,7 @@ static void test_MsiGetProductInfo(void)
     /* Assignment type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_ASSIGNMENTTYPE, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_ASSIGNMENTTYPEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
     ok(sz == 2, "Expected 2, got %d\n", sz);
@@ -5104,7 +5148,7 @@ static void test_MsiGetProductInfo(void)
     /* PackageCode value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PACKAGECODE, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PACKAGECODEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
     ok(sz == 0, "Expected 0, got %d\n", sz);
@@ -5116,7 +5160,7 @@ static void test_MsiGetProductInfo(void)
     /* PackageCode type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PACKAGECODE, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PACKAGECODEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
     ok(sz == 0, "Expected 0, got %d\n", sz);
@@ -5127,7 +5171,7 @@ static void test_MsiGetProductInfo(void)
     /* PackageCode value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PACKAGECODE, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PACKAGECODEA, buf, &sz);
     ok(r == ERROR_BAD_CONFIGURATION,
        "Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
     ok(!lstrcmpA(buf, "code"), "Expected \"code\", got \"%s\"\n", buf);
@@ -5140,7 +5184,7 @@ static void test_MsiGetProductInfo(void)
     /* PackageCode type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PACKAGECODE, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PACKAGECODEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
     ok(sz == 2, "Expected 2, got %d\n", sz);
@@ -5151,7 +5195,7 @@ static void test_MsiGetProductInfo(void)
     /* PackageCode value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PACKAGECODE, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PACKAGECODEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, packcode), "Expected \"%s\", got \"%s\"\n", packcode, buf);
     ok(sz == 38, "Expected 38, got %d\n", sz);
@@ -5162,7 +5206,7 @@ static void test_MsiGetProductInfo(void)
     /* Version value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_VERSION, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_VERSIONA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
     ok(sz == 0, "Expected 0, got %d\n", sz);
@@ -5174,7 +5218,7 @@ static void test_MsiGetProductInfo(void)
     /* Version type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_VERSION, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_VERSIONA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
     ok(sz == 0, "Expected 0, got %d\n", sz);
@@ -5185,7 +5229,7 @@ static void test_MsiGetProductInfo(void)
     /* Version value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_VERSION, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_VERSIONA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "ver"), "Expected \"ver\", got \"%s\"\n", buf);
     ok(sz == 3, "Expected 3, got %d\n", sz);
@@ -5197,7 +5241,7 @@ static void test_MsiGetProductInfo(void)
     /* Version type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_VERSION, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_VERSIONA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
     ok(sz == 2, "Expected 2, got %d\n", sz);
@@ -5208,7 +5252,7 @@ static void test_MsiGetProductInfo(void)
     /* ProductIcon value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PRODUCTICON, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PRODUCTICONA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
     ok(sz == 0, "Expected 0, got %d\n", sz);
@@ -5220,7 +5264,7 @@ static void test_MsiGetProductInfo(void)
     /* ProductIcon type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PRODUCTICON, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PRODUCTICONA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
     ok(sz == 0, "Expected 0, got %d\n", sz);
@@ -5231,7 +5275,7 @@ static void test_MsiGetProductInfo(void)
     /* ProductIcon value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PRODUCTICON, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PRODUCTICONA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "ico"), "Expected \"ico\", got \"%s\"\n", buf);
     ok(sz == 3, "Expected 3, got %d\n", sz);
@@ -5243,7 +5287,7 @@ static void test_MsiGetProductInfo(void)
     /* ProductIcon type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PRODUCTICON, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PRODUCTICONA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
     ok(sz == 2, "Expected 2, got %d\n", sz);
@@ -5251,7 +5295,7 @@ static void test_MsiGetProductInfo(void)
     /* SourceList key does not exist */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PACKAGENAME, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PACKAGENAMEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"),
@@ -5264,7 +5308,7 @@ static void test_MsiGetProductInfo(void)
     /* SourceList key exists, but PackageName val does not exist */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PACKAGENAME, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PACKAGENAMEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
     ok(sz == 0, "Expected 0, got %d\n", sz);
@@ -5275,7 +5319,7 @@ static void test_MsiGetProductInfo(void)
     /* PackageName val exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PACKAGENAME, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PACKAGENAMEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "packname"), "Expected \"packname\", got \"%s\"\n", buf);
     ok(sz == 8, "Expected 8, got %d\n", sz);
@@ -5287,7 +5331,7 @@ static void test_MsiGetProductInfo(void)
     /* PackageName type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PACKAGENAME, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PACKAGENAMEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
     ok(sz == 2, "Expected 2, got %d\n", sz);
@@ -5298,7 +5342,7 @@ static void test_MsiGetProductInfo(void)
     /* Authorized value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_AUTHORIZED_LUA_APP, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_AUTHORIZED_LUA_APPA, buf, &sz);
     if (r != ERROR_UNKNOWN_PROPERTY)
     {
         ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
@@ -5313,7 +5357,7 @@ static void test_MsiGetProductInfo(void)
     /* AuthorizedLUAApp type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_AUTHORIZED_LUA_APP, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_AUTHORIZED_LUA_APPA, buf, &sz);
     if (r != ERROR_UNKNOWN_PROPERTY)
     {
         ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
@@ -5327,7 +5371,7 @@ static void test_MsiGetProductInfo(void)
     /* Authorized value exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_AUTHORIZED_LUA_APP, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_AUTHORIZED_LUA_APPA, buf, &sz);
     if (r != ERROR_UNKNOWN_PROPERTY)
     {
         ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
@@ -5342,7 +5386,7 @@ static void test_MsiGetProductInfo(void)
     /* AuthorizedLUAApp type is REG_DWORD */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
-    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_AUTHORIZED_LUA_APP, buf, &sz);
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_AUTHORIZED_LUA_APPA, buf, &sz);
     if (r != ERROR_UNKNOWN_PROPERTY)
     {
         ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
@@ -5429,7 +5473,7 @@ static void test_MsiGetProductInfoEx(void)
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(NULL, usersid, MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_PRODUCTSTATE, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTSTATEA, buf, &sz);
     ok(r == ERROR_INVALID_PARAMETER,
        "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -5439,7 +5483,7 @@ static void test_MsiGetProductInfoEx(void)
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA("", usersid, MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_PRODUCTSTATE, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTSTATEA, buf, &sz);
     ok(r == ERROR_INVALID_PARAMETER,
        "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -5449,7 +5493,7 @@ static void test_MsiGetProductInfoEx(void)
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA("garbage", usersid, MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_PRODUCTSTATE, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTSTATEA, buf, &sz);
     ok(r == ERROR_INVALID_PARAMETER,
        "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -5460,7 +5504,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA("6700E8CF-95AB-4D9C-BC2C-15840DEA7A5D", usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_PRODUCTSTATE, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTSTATEA, buf, &sz);
     ok(r == ERROR_INVALID_PARAMETER,
        "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -5471,7 +5515,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA("{6700E8CF-95AB-4D9C-BC2C-15840DEA7A5D}", usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_PRODUCTSTATE, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTSTATEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -5481,7 +5525,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_PRODUCTSTATE, buf, NULL);
+                              INSTALLPROPERTY_PRODUCTSTATEA, buf, NULL);
     ok(r == ERROR_INVALID_PARAMETER,
        "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -5490,7 +5534,7 @@ static void test_MsiGetProductInfoEx(void)
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid, 42,
-                              INSTALLPROPERTY_PRODUCTSTATE, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTSTATEA, buf, &sz);
     ok(r == ERROR_INVALID_PARAMETER,
        "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -5534,7 +5578,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA("A938G02JF-2NF3N93-VN3-2NNF-3KGKALDNF93", usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_PRODUCTSTATE, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTSTATEA, buf, &sz);
     ok(r == ERROR_INVALID_PARAMETER,
        "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -5561,7 +5605,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_PRODUCTSTATE, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTSTATEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -5575,7 +5619,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_PRODUCTSTATE, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTSTATEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -5589,7 +5633,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_PRODUCTSTATE, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTSTATEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "5"), "Expected \"5\", got \"%s\"\n", buf);
     ok(sz == 1, "Expected 1, got %d\n", sz);
@@ -5601,7 +5645,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_HELPLINK, buf, &sz);
+                              INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -5615,7 +5659,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_HELPLINK, buf, &sz);
+                              INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
     ok(sz == 0, "Expected 0, got %d\n", sz);
@@ -5628,7 +5672,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_HELPLINK, buf, &sz);
+                              INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "link"), "Expected \"link\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -5641,7 +5685,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_HELPTELEPHONE, buf, &sz);
+                              INSTALLPROPERTY_HELPTELEPHONEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "phone"), "Expected \"phone\", got \"%s\"\n", buf);
     ok(sz == 5, "Expected 5, got %d\n", sz);
@@ -5649,7 +5693,7 @@ static void test_MsiGetProductInfoEx(void)
     /* szValue and pcchValue are NULL */
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_HELPTELEPHONE, NULL, NULL);
+                              INSTALLPROPERTY_HELPTELEPHONEA, NULL, NULL);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
 
     /* pcchValue is exactly 5 */
@@ -5657,7 +5701,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_HELPTELEPHONE, buf, &sz);
+                              INSTALLPROPERTY_HELPTELEPHONEA, buf, &sz);
     ok(r == ERROR_MORE_DATA,
        "Expected ERROR_MORE_DATA, got %d\n", r);
     ok(sz == 10, "Expected 10, got %d\n", sz);
@@ -5666,7 +5710,7 @@ static void test_MsiGetProductInfoEx(void)
     sz = 5;
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_HELPTELEPHONE, NULL, &sz);
+                              INSTALLPROPERTY_HELPTELEPHONEA, NULL, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(sz == 10, "Expected 10, got %d\n", sz);
 
@@ -5674,7 +5718,7 @@ static void test_MsiGetProductInfoEx(void)
     sz = MAX_PATH;
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_HELPTELEPHONE, NULL, &sz);
+                              INSTALLPROPERTY_HELPTELEPHONEA, NULL, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(sz == 10, "Expected 10, got %d\n", sz);
 
@@ -5683,7 +5727,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_HELPTELEPHONE, buf, &sz);
+                              INSTALLPROPERTY_HELPTELEPHONEA, buf, &sz);
     ok(r == ERROR_MORE_DATA,
        "Expected ERROR_MORE_DATA, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected \"apple\", got \"%s\"\n", buf);
@@ -5711,7 +5755,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_INSTALLDATE, buf, &sz);
+                              INSTALLPROPERTY_INSTALLDATEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "date"), "Expected \"date\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -5724,7 +5768,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_INSTALLEDPRODUCTNAME, buf, &sz);
+                              INSTALLPROPERTY_INSTALLEDPRODUCTNAMEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "name"), "Expected \"name\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -5737,7 +5781,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_INSTALLLOCATION, buf, &sz);
+                              INSTALLPROPERTY_INSTALLLOCATIONA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "loc"), "Expected \"loc\", got \"%s\"\n", buf);
     ok(sz == 3, "Expected 3, got %d\n", sz);
@@ -5750,7 +5794,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_INSTALLSOURCE, buf, &sz);
+                              INSTALLPROPERTY_INSTALLSOURCEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "source"), "Expected \"source\", got \"%s\"\n", buf);
     ok(sz == 6, "Expected 6, got %d\n", sz);
@@ -5763,7 +5807,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_LOCALPACKAGE, buf, &sz);
+                              INSTALLPROPERTY_LOCALPACKAGEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "local"), "Expected \"local\", got \"%s\"\n", buf);
     ok(sz == 5, "Expected 5, got %d\n", sz);
@@ -5776,7 +5820,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_PUBLISHER, buf, &sz);
+                              INSTALLPROPERTY_PUBLISHERA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "pub"), "Expected \"pub\", got \"%s\"\n", buf);
     ok(sz == 3, "Expected 3, got %d\n", sz);
@@ -5789,7 +5833,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_URLINFOABOUT, buf, &sz);
+                              INSTALLPROPERTY_URLINFOABOUTA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "about"), "Expected \"about\", got \"%s\"\n", buf);
     ok(sz == 5, "Expected 5, got %d\n", sz);
@@ -5802,7 +5846,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_URLUPDATEINFO, buf, &sz);
+                              INSTALLPROPERTY_URLUPDATEINFOA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "update"), "Expected \"update\", got \"%s\"\n", buf);
     ok(sz == 6, "Expected 6, got %d\n", sz);
@@ -5815,7 +5859,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_VERSIONMINOR, buf, &sz);
+                              INSTALLPROPERTY_VERSIONMINORA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "2"), "Expected \"2\", got \"%s\"\n", buf);
     ok(sz == 1, "Expected 1, got %d\n", sz);
@@ -5828,7 +5872,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_VERSIONMAJOR, buf, &sz);
+                              INSTALLPROPERTY_VERSIONMAJORA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "3"), "Expected \"3\", got \"%s\"\n", buf);
     ok(sz == 1, "Expected 1, got %d\n", sz);
@@ -5841,7 +5885,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_VERSIONSTRING, buf, &sz);
+                              INSTALLPROPERTY_VERSIONSTRINGA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "3.2.1"), "Expected \"3.2.1\", got \"%s\"\n", buf);
     ok(sz == 5, "Expected 5, got %d\n", sz);
@@ -5854,7 +5898,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_PRODUCTID, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTIDA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "id"), "Expected \"id\", got \"%s\"\n", buf);
     ok(sz == 2, "Expected 2, got %d\n", sz);
@@ -5867,7 +5911,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_REGCOMPANY, buf, &sz);
+                              INSTALLPROPERTY_REGCOMPANYA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "comp"), "Expected \"comp\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -5880,7 +5924,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_REGOWNER, buf, &sz);
+                              INSTALLPROPERTY_REGOWNERA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "owner"), "Expected \"owner\", got \"%s\"\n", buf);
     ok(sz == 5, "Expected 5, got %d\n", sz);
@@ -5893,7 +5937,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_TRANSFORMS, buf, &sz);
+                              INSTALLPROPERTY_TRANSFORMSA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -5907,7 +5951,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_LANGUAGE, buf, &sz);
+                              INSTALLPROPERTY_LANGUAGEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -5921,7 +5965,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_PRODUCTNAME, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTNAMEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -5937,7 +5981,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_ASSIGNMENTTYPE, buf, &sz);
+                              INSTALLPROPERTY_ASSIGNMENTTYPEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -5951,7 +5995,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_PACKAGECODE, buf, &sz);
+                              INSTALLPROPERTY_PACKAGECODEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -5965,7 +6009,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_VERSION, buf, &sz);
+                              INSTALLPROPERTY_VERSIONA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -5979,7 +6023,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_PRODUCTICON, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTICONA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -5993,7 +6037,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_PACKAGENAME, buf, &sz);
+                              INSTALLPROPERTY_PACKAGENAMEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6007,7 +6051,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_AUTHORIZED_LUA_APP, buf, &sz);
+                              INSTALLPROPERTY_AUTHORIZED_LUA_APPA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6057,7 +6101,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_PRODUCTSTATE, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTSTATEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6076,7 +6120,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_PRODUCTSTATE, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTSTATEA, buf, &sz);
     ok(r == ERROR_SUCCESS || broken(r == ERROR_UNKNOWN_PRODUCT), "Expected ERROR_SUCCESS, got %d\n", r);
     if (r == ERROR_UNKNOWN_PRODUCT)
     {
@@ -6096,7 +6140,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_HELPLINK, buf, &sz);
+                              INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6110,7 +6154,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_HELPTELEPHONE, buf, &sz);
+                              INSTALLPROPERTY_HELPTELEPHONEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6124,7 +6168,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_INSTALLDATE, buf, &sz);
+                              INSTALLPROPERTY_INSTALLDATEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6138,7 +6182,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_INSTALLEDPRODUCTNAME, buf, &sz);
+                              INSTALLPROPERTY_INSTALLEDPRODUCTNAMEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6152,7 +6196,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_INSTALLLOCATION, buf, &sz);
+                              INSTALLPROPERTY_INSTALLLOCATIONA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6166,7 +6210,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_INSTALLSOURCE, buf, &sz);
+                              INSTALLPROPERTY_INSTALLSOURCEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6180,7 +6224,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_LOCALPACKAGE, buf, &sz);
+                              INSTALLPROPERTY_LOCALPACKAGEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6194,7 +6238,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_PUBLISHER, buf, &sz);
+                              INSTALLPROPERTY_PUBLISHERA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6208,7 +6252,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_URLINFOABOUT, buf, &sz);
+                              INSTALLPROPERTY_URLINFOABOUTA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6222,7 +6266,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_URLUPDATEINFO, buf, &sz);
+                              INSTALLPROPERTY_URLUPDATEINFOA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6236,7 +6280,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_VERSIONMINOR, buf, &sz);
+                              INSTALLPROPERTY_VERSIONMINORA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6250,7 +6294,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_VERSIONMAJOR, buf, &sz);
+                              INSTALLPROPERTY_VERSIONMAJORA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6264,7 +6308,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_VERSIONSTRING, buf, &sz);
+                              INSTALLPROPERTY_VERSIONSTRINGA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6278,7 +6322,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_PRODUCTID, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTIDA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6292,7 +6336,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_REGCOMPANY, buf, &sz);
+                              INSTALLPROPERTY_REGCOMPANYA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6306,7 +6350,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_REGOWNER, buf, &sz);
+                              INSTALLPROPERTY_REGOWNERA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6320,7 +6364,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_TRANSFORMS, buf, &sz);
+                              INSTALLPROPERTY_TRANSFORMSA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "trans"), "Expected \"trans\", got \"%s\"\n", buf);
     ok(sz == 5, "Expected 5, got %d\n", sz);
@@ -6333,7 +6377,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_LANGUAGE, buf, &sz);
+                              INSTALLPROPERTY_LANGUAGEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "lang"), "Expected \"lang\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -6346,7 +6390,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_PRODUCTNAME, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTNAMEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "name"), "Expected \"name\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -6361,7 +6405,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_ASSIGNMENTTYPE, buf, &sz);
+                              INSTALLPROPERTY_ASSIGNMENTTYPEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
     ok(sz == 0, "Expected 0, got %d\n", sz);
@@ -6376,7 +6420,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_PACKAGECODE, buf, &sz);
+                              INSTALLPROPERTY_PACKAGECODEA, buf, &sz);
     todo_wine
     {
         ok(r == ERROR_BAD_CONFIGURATION,
@@ -6393,7 +6437,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_VERSION, buf, &sz);
+                              INSTALLPROPERTY_VERSIONA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "ver"), "Expected \"ver\", got \"%s\"\n", buf);
     ok(sz == 3, "Expected 3, got %d\n", sz);
@@ -6406,7 +6450,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_PRODUCTICON, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTICONA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "icon"), "Expected \"icon\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -6419,7 +6463,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_PACKAGENAME, buf, &sz);
+                              INSTALLPROPERTY_PACKAGENAMEA, buf, &sz);
     todo_wine
     {
         ok(r == ERROR_UNKNOWN_PRODUCT,
@@ -6436,7 +6480,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERUNMANAGED,
-                              INSTALLPROPERTY_AUTHORIZED_LUA_APP, buf, &sz);
+                              INSTALLPROPERTY_AUTHORIZED_LUA_APPA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "auth"), "Expected \"auth\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -6485,7 +6529,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_PRODUCTSTATE, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTSTATEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6499,7 +6543,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_PRODUCTSTATE, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTSTATEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6513,7 +6557,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_PRODUCTSTATE, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTSTATEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "5"), "Expected \"5\", got \"%s\"\n", buf);
     ok(sz == 1, "Expected 1, got %d\n", sz);
@@ -6526,7 +6570,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_HELPLINK, buf, &sz);
+                              INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "link"), "Expected \"link\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -6539,7 +6583,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_HELPTELEPHONE, buf, &sz);
+                              INSTALLPROPERTY_HELPTELEPHONEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "phone"), "Expected \"phone\", got \"%s\"\n", buf);
     ok(sz == 5, "Expected 5, got %d\n", sz);
@@ -6552,7 +6596,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_INSTALLDATE, buf, &sz);
+                              INSTALLPROPERTY_INSTALLDATEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "date"), "Expected \"date\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -6565,7 +6609,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_INSTALLEDPRODUCTNAME, buf, &sz);
+                              INSTALLPROPERTY_INSTALLEDPRODUCTNAMEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "name"), "Expected \"name\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -6578,7 +6622,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_INSTALLLOCATION, buf, &sz);
+                              INSTALLPROPERTY_INSTALLLOCATIONA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "loc"), "Expected \"loc\", got \"%s\"\n", buf);
     ok(sz == 3, "Expected 3, got %d\n", sz);
@@ -6591,7 +6635,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_INSTALLSOURCE, buf, &sz);
+                              INSTALLPROPERTY_INSTALLSOURCEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "source"), "Expected \"source\", got \"%s\"\n", buf);
     ok(sz == 6, "Expected 6, got %d\n", sz);
@@ -6604,7 +6648,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_LOCALPACKAGE, buf, &sz);
+                              INSTALLPROPERTY_LOCALPACKAGEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "local"), "Expected \"local\", got \"%s\"\n", buf);
     ok(sz == 5, "Expected 5, got %d\n", sz);
@@ -6617,7 +6661,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_PUBLISHER, buf, &sz);
+                              INSTALLPROPERTY_PUBLISHERA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "pub"), "Expected \"pub\", got \"%s\"\n", buf);
     ok(sz == 3, "Expected 3, got %d\n", sz);
@@ -6630,7 +6674,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_URLINFOABOUT, buf, &sz);
+                              INSTALLPROPERTY_URLINFOABOUTA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "about"), "Expected \"about\", got \"%s\"\n", buf);
     ok(sz == 5, "Expected 5, got %d\n", sz);
@@ -6643,7 +6687,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_URLUPDATEINFO, buf, &sz);
+                              INSTALLPROPERTY_URLUPDATEINFOA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "update"), "Expected \"update\", got \"%s\"\n", buf);
     ok(sz == 6, "Expected 6, got %d\n", sz);
@@ -6656,7 +6700,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_VERSIONMINOR, buf, &sz);
+                              INSTALLPROPERTY_VERSIONMINORA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "2"), "Expected \"2\", got \"%s\"\n", buf);
     ok(sz == 1, "Expected 1, got %d\n", sz);
@@ -6669,7 +6713,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_VERSIONMAJOR, buf, &sz);
+                              INSTALLPROPERTY_VERSIONMAJORA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "3"), "Expected \"3\", got \"%s\"\n", buf);
     ok(sz == 1, "Expected 1, got %d\n", sz);
@@ -6682,7 +6726,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_VERSIONSTRING, buf, &sz);
+                              INSTALLPROPERTY_VERSIONSTRINGA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "3.2.1"), "Expected \"3.2.1\", got \"%s\"\n", buf);
     ok(sz == 5, "Expected 5, got %d\n", sz);
@@ -6695,7 +6739,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_PRODUCTID, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTIDA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "id"), "Expected \"id\", got \"%s\"\n", buf);
     ok(sz == 2, "Expected 2, got %d\n", sz);
@@ -6708,7 +6752,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_REGCOMPANY, buf, &sz);
+                              INSTALLPROPERTY_REGCOMPANYA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "comp"), "Expected \"comp\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -6721,7 +6765,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_REGOWNER, buf, &sz);
+                              INSTALLPROPERTY_REGOWNERA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "owner"), "Expected \"owner\", got \"%s\"\n", buf);
     ok(sz == 5, "Expected 5, got %d\n", sz);
@@ -6734,7 +6778,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_TRANSFORMS, buf, &sz);
+                              INSTALLPROPERTY_TRANSFORMSA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6748,7 +6792,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_LANGUAGE, buf, &sz);
+                              INSTALLPROPERTY_LANGUAGEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6762,7 +6806,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_PRODUCTNAME, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTNAMEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6778,7 +6822,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_ASSIGNMENTTYPE, buf, &sz);
+                              INSTALLPROPERTY_ASSIGNMENTTYPEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6792,7 +6836,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_PACKAGECODE, buf, &sz);
+                              INSTALLPROPERTY_PACKAGECODEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6806,7 +6850,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_VERSION, buf, &sz);
+                              INSTALLPROPERTY_VERSIONA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6820,7 +6864,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_PRODUCTICON, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTICONA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6834,7 +6878,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_PACKAGENAME, buf, &sz);
+                              INSTALLPROPERTY_PACKAGENAMEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6848,7 +6892,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_AUTHORIZED_LUA_APP, buf, &sz);
+                              INSTALLPROPERTY_AUTHORIZED_LUA_APPA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6898,7 +6942,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_PRODUCTSTATE, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTSTATEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "1"), "Expected \"1\", got \"%s\"\n", buf);
     ok(sz == 1, "Expected 1, got %d\n", sz);
@@ -6917,7 +6961,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_PRODUCTSTATE, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTSTATEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6931,7 +6975,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_HELPLINK, buf, &sz);
+                              INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6953,7 +6997,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_HELPLINK, buf, &sz);
+                              INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6967,7 +7011,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_HELPTELEPHONE, buf, &sz);
+                              INSTALLPROPERTY_HELPTELEPHONEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6981,7 +7025,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_INSTALLDATE, buf, &sz);
+                              INSTALLPROPERTY_INSTALLDATEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -6995,7 +7039,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_INSTALLEDPRODUCTNAME, buf, &sz);
+                              INSTALLPROPERTY_INSTALLEDPRODUCTNAMEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7009,7 +7053,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_INSTALLLOCATION, buf, &sz);
+                              INSTALLPROPERTY_INSTALLLOCATIONA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7023,7 +7067,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_INSTALLSOURCE, buf, &sz);
+                              INSTALLPROPERTY_INSTALLSOURCEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7037,7 +7081,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_LOCALPACKAGE, buf, &sz);
+                              INSTALLPROPERTY_LOCALPACKAGEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7051,7 +7095,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_PUBLISHER, buf, &sz);
+                              INSTALLPROPERTY_PUBLISHERA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7065,7 +7109,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_URLINFOABOUT, buf, &sz);
+                              INSTALLPROPERTY_URLINFOABOUTA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7079,7 +7123,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_URLUPDATEINFO, buf, &sz);
+                              INSTALLPROPERTY_URLUPDATEINFOA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7093,7 +7137,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_VERSIONMINOR, buf, &sz);
+                              INSTALLPROPERTY_VERSIONMINORA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7107,7 +7151,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_VERSIONMAJOR, buf, &sz);
+                              INSTALLPROPERTY_VERSIONMAJORA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7121,7 +7165,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_VERSIONSTRING, buf, &sz);
+                              INSTALLPROPERTY_VERSIONSTRINGA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7135,7 +7179,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_PRODUCTID, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTIDA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7149,7 +7193,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_REGCOMPANY, buf, &sz);
+                              INSTALLPROPERTY_REGCOMPANYA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7163,7 +7207,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_REGOWNER, buf, &sz);
+                              INSTALLPROPERTY_REGOWNERA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7177,7 +7221,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_TRANSFORMS, buf, &sz);
+                              INSTALLPROPERTY_TRANSFORMSA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "trans"), "Expected \"trans\", got \"%s\"\n", buf);
     ok(sz == 5, "Expected 5, got %d\n", sz);
@@ -7190,7 +7234,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_LANGUAGE, buf, &sz);
+                              INSTALLPROPERTY_LANGUAGEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "lang"), "Expected \"lang\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -7203,7 +7247,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_PRODUCTNAME, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTNAMEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "name"), "Expected \"name\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -7218,7 +7262,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_ASSIGNMENTTYPE, buf, &sz);
+                              INSTALLPROPERTY_ASSIGNMENTTYPEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
     ok(sz == 0, "Expected 0, got %d\n", sz);
@@ -7233,7 +7277,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_PACKAGECODE, buf, &sz);
+                              INSTALLPROPERTY_PACKAGECODEA, buf, &sz);
     todo_wine
     {
         ok(r == ERROR_BAD_CONFIGURATION,
@@ -7250,7 +7294,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_VERSION, buf, &sz);
+                              INSTALLPROPERTY_VERSIONA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "ver"), "Expected \"ver\", got \"%s\"\n", buf);
     ok(sz == 3, "Expected 3, got %d\n", sz);
@@ -7263,7 +7307,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_PRODUCTICON, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTICONA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "icon"), "Expected \"icon\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -7276,7 +7320,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_PACKAGENAME, buf, &sz);
+                              INSTALLPROPERTY_PACKAGENAMEA, buf, &sz);
     todo_wine
     {
         ok(r == ERROR_UNKNOWN_PRODUCT,
@@ -7293,7 +7337,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_USERMANAGED,
-                              INSTALLPROPERTY_AUTHORIZED_LUA_APP, buf, &sz);
+                              INSTALLPROPERTY_AUTHORIZED_LUA_APPA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "auth"), "Expected \"auth\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -7335,7 +7379,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, usersid,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_PRODUCTSTATE, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTSTATEA, buf, &sz);
     ok(r == ERROR_INVALID_PARAMETER,
        "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7352,7 +7396,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_PRODUCTSTATE, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTSTATEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7366,7 +7410,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_PRODUCTSTATE, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTSTATEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7380,7 +7424,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_PRODUCTSTATE, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTSTATEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "5"), "Expected \"5\", got \"%s\"\n", buf);
     ok(sz == 1, "Expected 1, got %d\n", sz);
@@ -7393,7 +7437,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_HELPLINK, buf, &sz);
+                              INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "link"), "Expected \"link\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -7406,7 +7450,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_HELPTELEPHONE, buf, &sz);
+                              INSTALLPROPERTY_HELPTELEPHONEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "phone"), "Expected \"phone\", got \"%s\"\n", buf);
     ok(sz == 5, "Expected 5, got %d\n", sz);
@@ -7419,7 +7463,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_INSTALLDATE, buf, &sz);
+                              INSTALLPROPERTY_INSTALLDATEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "date"), "Expected \"date\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -7432,7 +7476,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_INSTALLEDPRODUCTNAME, buf, &sz);
+                              INSTALLPROPERTY_INSTALLEDPRODUCTNAMEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "name"), "Expected \"name\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -7445,7 +7489,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_INSTALLLOCATION, buf, &sz);
+                              INSTALLPROPERTY_INSTALLLOCATIONA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "loc"), "Expected \"loc\", got \"%s\"\n", buf);
     ok(sz == 3, "Expected 3, got %d\n", sz);
@@ -7458,7 +7502,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_INSTALLSOURCE, buf, &sz);
+                              INSTALLPROPERTY_INSTALLSOURCEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "source"), "Expected \"source\", got \"%s\"\n", buf);
     ok(sz == 6, "Expected 6, got %d\n", sz);
@@ -7471,7 +7515,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_LOCALPACKAGE, buf, &sz);
+                              INSTALLPROPERTY_LOCALPACKAGEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "local"), "Expected \"local\", got \"%s\"\n", buf);
     ok(sz == 5, "Expected 5, got %d\n", sz);
@@ -7484,7 +7528,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_PUBLISHER, buf, &sz);
+                              INSTALLPROPERTY_PUBLISHERA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "pub"), "Expected \"pub\", got \"%s\"\n", buf);
     ok(sz == 3, "Expected 3, got %d\n", sz);
@@ -7497,7 +7541,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_URLINFOABOUT, buf, &sz);
+                              INSTALLPROPERTY_URLINFOABOUTA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "about"), "Expected \"about\", got \"%s\"\n", buf);
     ok(sz == 5, "Expected 5, got %d\n", sz);
@@ -7510,7 +7554,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_URLUPDATEINFO, buf, &sz);
+                              INSTALLPROPERTY_URLUPDATEINFOA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "update"), "Expected \"update\", got \"%s\"\n", buf);
     ok(sz == 6, "Expected 6, got %d\n", sz);
@@ -7523,7 +7567,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_VERSIONMINOR, buf, &sz);
+                              INSTALLPROPERTY_VERSIONMINORA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "2"), "Expected \"2\", got \"%s\"\n", buf);
     ok(sz == 1, "Expected 1, got %d\n", sz);
@@ -7536,7 +7580,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_VERSIONMAJOR, buf, &sz);
+                              INSTALLPROPERTY_VERSIONMAJORA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "3"), "Expected \"3\", got \"%s\"\n", buf);
     ok(sz == 1, "Expected 1, got %d\n", sz);
@@ -7549,7 +7593,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_VERSIONSTRING, buf, &sz);
+                              INSTALLPROPERTY_VERSIONSTRINGA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "3.2.1"), "Expected \"3.2.1\", got \"%s\"\n", buf);
     ok(sz == 5, "Expected 5, got %d\n", sz);
@@ -7562,7 +7606,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_PRODUCTID, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTIDA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "id"), "Expected \"id\", got \"%s\"\n", buf);
     ok(sz == 2, "Expected 2, got %d\n", sz);
@@ -7575,7 +7619,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_REGCOMPANY, buf, &sz);
+                              INSTALLPROPERTY_REGCOMPANYA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "comp"), "Expected \"comp\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -7588,7 +7632,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_REGOWNER, buf, &sz);
+                              INSTALLPROPERTY_REGOWNERA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "owner"), "Expected \"owner\", got \"%s\"\n", buf);
     ok(sz == 5, "Expected 5, got %d\n", sz);
@@ -7601,7 +7645,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_TRANSFORMS, buf, &sz);
+                              INSTALLPROPERTY_TRANSFORMSA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7615,7 +7659,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_LANGUAGE, buf, &sz);
+                              INSTALLPROPERTY_LANGUAGEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7629,7 +7673,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_PRODUCTNAME, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTNAMEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7645,7 +7689,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_ASSIGNMENTTYPE, buf, &sz);
+                              INSTALLPROPERTY_ASSIGNMENTTYPEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7659,7 +7703,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_PACKAGECODE, buf, &sz);
+                              INSTALLPROPERTY_PACKAGECODEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7673,7 +7717,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_VERSION, buf, &sz);
+                              INSTALLPROPERTY_VERSIONA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7687,7 +7731,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_PRODUCTICON, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTICONA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7701,7 +7745,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_PACKAGENAME, buf, &sz);
+                              INSTALLPROPERTY_PACKAGENAMEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7715,7 +7759,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_AUTHORIZED_LUA_APP, buf, &sz);
+                              INSTALLPROPERTY_AUTHORIZED_LUA_APPA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7763,7 +7807,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_PRODUCTSTATE, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTSTATEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "1"), "Expected \"1\", got \"%s\"\n", buf);
     ok(sz == 1, "Expected 1, got %d\n", sz);
@@ -7776,7 +7820,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_HELPLINK, buf, &sz);
+                              INSTALLPROPERTY_HELPLINKA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7790,7 +7834,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_HELPTELEPHONE, buf, &sz);
+                              INSTALLPROPERTY_HELPTELEPHONEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7804,7 +7848,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_INSTALLDATE, buf, &sz);
+                              INSTALLPROPERTY_INSTALLDATEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7818,7 +7862,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_INSTALLEDPRODUCTNAME, buf, &sz);
+                              INSTALLPROPERTY_INSTALLEDPRODUCTNAMEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7832,7 +7876,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_INSTALLLOCATION, buf, &sz);
+                              INSTALLPROPERTY_INSTALLLOCATIONA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7846,7 +7890,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_INSTALLSOURCE, buf, &sz);
+                              INSTALLPROPERTY_INSTALLSOURCEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7860,7 +7904,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_LOCALPACKAGE, buf, &sz);
+                              INSTALLPROPERTY_LOCALPACKAGEA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7874,7 +7918,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_PUBLISHER, buf, &sz);
+                              INSTALLPROPERTY_PUBLISHERA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7888,7 +7932,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_URLINFOABOUT, buf, &sz);
+                              INSTALLPROPERTY_URLINFOABOUTA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7902,7 +7946,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_URLUPDATEINFO, buf, &sz);
+                              INSTALLPROPERTY_URLUPDATEINFOA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7916,7 +7960,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_VERSIONMINOR, buf, &sz);
+                              INSTALLPROPERTY_VERSIONMINORA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7930,7 +7974,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_VERSIONMAJOR, buf, &sz);
+                              INSTALLPROPERTY_VERSIONMAJORA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7944,7 +7988,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_VERSIONSTRING, buf, &sz);
+                              INSTALLPROPERTY_VERSIONSTRINGA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7958,7 +8002,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_PRODUCTID, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTIDA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7972,7 +8016,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_REGCOMPANY, buf, &sz);
+                              INSTALLPROPERTY_REGCOMPANYA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -7986,7 +8030,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_REGOWNER, buf, &sz);
+                              INSTALLPROPERTY_REGOWNERA, buf, &sz);
     ok(r == ERROR_UNKNOWN_PROPERTY,
        "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r);
     ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf);
@@ -8000,7 +8044,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_TRANSFORMS, buf, &sz);
+                              INSTALLPROPERTY_TRANSFORMSA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "trans"), "Expected \"trans\", got \"%s\"\n", buf);
     ok(sz == 5, "Expected 5, got %d\n", sz);
@@ -8013,7 +8057,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_LANGUAGE, buf, &sz);
+                              INSTALLPROPERTY_LANGUAGEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "lang"), "Expected \"lang\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -8026,7 +8070,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_PRODUCTNAME, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTNAMEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "name"), "Expected \"name\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -8041,7 +8085,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_ASSIGNMENTTYPE, buf, &sz);
+                              INSTALLPROPERTY_ASSIGNMENTTYPEA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
     ok(sz == 0, "Expected 0, got %d\n", sz);
@@ -8056,7 +8100,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_PACKAGECODE, buf, &sz);
+                              INSTALLPROPERTY_PACKAGECODEA, buf, &sz);
     todo_wine
     {
         ok(r == ERROR_BAD_CONFIGURATION,
@@ -8073,7 +8117,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_VERSION, buf, &sz);
+                              INSTALLPROPERTY_VERSIONA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "ver"), "Expected \"ver\", got \"%s\"\n", buf);
     ok(sz == 3, "Expected 3, got %d\n", sz);
@@ -8086,7 +8130,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_PRODUCTICON, buf, &sz);
+                              INSTALLPROPERTY_PRODUCTICONA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "icon"), "Expected \"icon\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -8099,7 +8143,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_PACKAGENAME, buf, &sz);
+                              INSTALLPROPERTY_PACKAGENAMEA, buf, &sz);
     todo_wine
     {
         ok(r == ERROR_UNKNOWN_PRODUCT,
@@ -8116,7 +8160,7 @@ static void test_MsiGetProductInfoEx(void)
     lstrcpyA(buf, "apple");
     r = pMsiGetProductInfoExA(prodcode, NULL,
                               MSIINSTALLCONTEXT_MACHINE,
-                              INSTALLPROPERTY_AUTHORIZED_LUA_APP, buf, &sz);
+                              INSTALLPROPERTY_AUTHORIZED_LUA_APPA, buf, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(buf, "auth"), "Expected \"auth\", got \"%s\"\n", buf);
     ok(sz == 4, "Expected 4, got %d\n", sz);
@@ -10343,6 +10387,11 @@ static void test_MsiEnumPatchesEx_machine(void)
     lstrcatA(keypath, prod_squashed);
 
     res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &udprod, NULL);
+    if (res == ERROR_ACCESS_DENIED)
+    {
+        skip("Not enough rights to perform tests\n");
+        goto done;
+    }
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
 
     /* local UserData product key exists */
@@ -10570,15 +10619,17 @@ static void test_MsiEnumPatchesEx_machine(void)
        "Expected targetsid to be unchanged, got %s\n", targetsid);
     ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
 
+    delete_key(hpatch, "", access & KEY_WOW64_64KEY);
+    RegCloseKey(hpatch);
+    delete_key(udpatch, "", access & KEY_WOW64_64KEY);
+    RegCloseKey(udpatch);
+
+done:
     RegDeleteValueA(patches, patch_squashed);
     RegDeleteValueA(patches, "Patches");
     delete_key(patches, "", access & KEY_WOW64_64KEY);
     RegCloseKey(patches);
     RegDeleteValueA(hpatch, "State");
-    delete_key(hpatch, "", access & KEY_WOW64_64KEY);
-    RegCloseKey(hpatch);
-    delete_key(udpatch, "", access & KEY_WOW64_64KEY);
-    RegCloseKey(udpatch);
     delete_key(udprod, "", access & KEY_WOW64_64KEY);
     RegCloseKey(udprod);
     delete_key(prodkey, "", access & KEY_WOW64_64KEY);
@@ -11584,7 +11635,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     size = MAX_PATH;
     r = pMsiGetPatchInfoExA(NULL, prodcode, NULL, MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_INVALID_PARAMETER,
        "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
@@ -11595,7 +11646,7 @@ static void test_MsiGetPatchInfoEx(void)
     size = MAX_PATH;
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA("", prodcode, NULL, MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_INVALID_PARAMETER,
        "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
@@ -11607,7 +11658,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA("garbage", prodcode, NULL,
                             MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_INVALID_PARAMETER,
        "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
@@ -11619,7 +11670,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA("6700E8CF-95AB-4D9C-BC2C-15840DEA7A5D", prodcode,
                             NULL, MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_INVALID_PARAMETER,
        "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
@@ -11631,7 +11682,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA("{6700E8CF-95AB-4D9C-BC2C-15840DEA7A5D}", prodcode,
                             NULL, MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
@@ -11643,7 +11694,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA("A938G02JF-2NF3N93-VN3-2NNF-3KGKALDNF93", prodcode,
                             NULL, MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_INVALID_PARAMETER,
        "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
@@ -11654,7 +11705,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     size = MAX_PATH;
     r = pMsiGetPatchInfoExA(patchcode, NULL, NULL, MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_INVALID_PARAMETER,
        "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
@@ -11665,7 +11716,7 @@ static void test_MsiGetPatchInfoEx(void)
     size = MAX_PATH;
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, "", NULL, MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_INVALID_PARAMETER,
        "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
@@ -11677,7 +11728,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, "garbage", NULL,
                             MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_INVALID_PARAMETER,
        "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
@@ -11689,7 +11740,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, "6700E8CF-95AB-4D9C-BC2C-15840DEA7A5D",
                             NULL, MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_INVALID_PARAMETER,
        "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
@@ -11701,7 +11752,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, "{6700E8CF-95AB-4D9C-BC2C-15840DEA7A5D}",
                             NULL, MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
@@ -11713,7 +11764,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, "A938G02JF-2NF3N93-VN3-2NNF-3KGKALDNF93",
                             NULL, MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_INVALID_PARAMETER,
        "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
@@ -11725,7 +11776,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, "S-1-5-18",
                             MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_INVALID_PARAMETER,
        "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
@@ -11737,7 +11788,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, "S-1-5-18",
                             MSIINSTALLCONTEXT_USERUNMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_INVALID_PARAMETER,
        "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
@@ -11749,7 +11800,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, "S-1-5-18",
                             MSIINSTALLCONTEXT_MACHINE,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_INVALID_PARAMETER,
        "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
@@ -11761,7 +11812,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_MACHINE,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_INVALID_PARAMETER,
        "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
@@ -11773,7 +11824,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_NONE,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_INVALID_PARAMETER,
        "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
@@ -11785,7 +11836,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_ALL,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_INVALID_PARAMETER,
        "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
@@ -11796,7 +11847,7 @@ static void test_MsiGetPatchInfoEx(void)
     size = MAX_PATH;
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid, 3,
-                           INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                           INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_INVALID_PARAMETER,
        "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
@@ -11809,7 +11860,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
@@ -11835,7 +11886,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
@@ -11850,7 +11901,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
        "Expected val to be unchanged, got \"%s\"\n", val);
@@ -11864,8 +11915,8 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
-    ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
+    ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCHA, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
        "Expected val to be unchanged, got \"%s\"\n", val);
     ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
@@ -11878,7 +11929,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
        "Expected val to be unchanged, got \"%s\"\n", val);
@@ -11897,7 +11948,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
        "Expected val to be unchanged, got \"%s\"\n", val);
@@ -11911,7 +11962,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
        "Expected val to be unchanged, got \"%s\"\n", val);
@@ -11926,7 +11977,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
        "Expected val to be unchanged, got \"%s\"\n", val);
@@ -11945,7 +11996,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(val, ""), "Expected \"\", got \"%s\"\n", val);
     ok(size == 0, "Expected 0, got %d\n", size);
@@ -11959,7 +12010,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(val, "pack"), "Expected \"pack\", got \"%s\"\n", val);
     ok(size == 4, "Expected 4, got %d\n", size);
@@ -11968,7 +12019,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_TRANSFORMS, val, &size);
+                            INSTALLPROPERTY_TRANSFORMSA, val, &size);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(val, "transforms"), "Expected \"transforms\", got \"%s\"\n", val);
     ok(size == 10, "Expected 10, got %d\n", size);
@@ -11982,7 +12033,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_INSTALLDATE, val, &size);
+                            INSTALLPROPERTY_INSTALLDATEA, val, &size);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(val, "mydate"), "Expected \"mydate\", got \"%s\"\n", val);
     ok(size == 6, "Expected 6, got %d\n", size);
@@ -11996,7 +12047,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_UNINSTALLABLE, val, &size);
+                            INSTALLPROPERTY_UNINSTALLABLEA, val, &size);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(val, "yes"), "Expected \"yes\", got \"%s\"\n", val);
     ok(size == 3, "Expected 3, got %d\n", size);
@@ -12010,7 +12061,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_PATCHSTATE, val, &size);
+                            INSTALLPROPERTY_PATCHSTATEA, val, &size);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(val, "good"), "Expected \"good\", got \"%s\"\n", val);
     ok(size == 4, "Expected 4, got %d\n", size);
@@ -12025,7 +12076,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_PATCHSTATE, val, &size);
+                            INSTALLPROPERTY_PATCHSTATEA, val, &size);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     todo_wine ok(!lstrcmpA(val, "1"), "Expected \"1\", got \"%s\"\n", val);
     ok(size == 1, "Expected 1, got %d\n", size);
@@ -12039,7 +12090,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_DISPLAYNAME, val, &size);
+                            INSTALLPROPERTY_DISPLAYNAMEA, val, &size);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(val, "display"), "Expected \"display\", got \"%s\"\n", val);
     ok(size == 7, "Expected 7, got %d\n", size);
@@ -12053,7 +12104,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_MOREINFOURL, val, &size);
+                            INSTALLPROPERTY_MOREINFOURLA, val, &size);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(val, "moreinfo"), "Expected \"moreinfo\", got \"%s\"\n", val);
     ok(size == 8, "Expected 8, got %d\n", size);
@@ -12073,7 +12124,7 @@ static void test_MsiGetPatchInfoEx(void)
     size = MAX_PATH;
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_MOREINFOURL, NULL, &size);
+                            INSTALLPROPERTY_MOREINFOURLA, NULL, &size);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(size == 16, "Expected 16, got %d\n", size);
 
@@ -12081,7 +12132,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_MOREINFOURL, val, NULL);
+                            INSTALLPROPERTY_MOREINFOURLA, val, NULL);
     ok(r == ERROR_INVALID_PARAMETER,
        "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(val, "apple"), "Expected \"apple\", got \"%s\"\n", val);
@@ -12089,7 +12140,7 @@ static void test_MsiGetPatchInfoEx(void)
     /* both lpValue and pcchValue are NULL */
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_MOREINFOURL, NULL, NULL);
+                            INSTALLPROPERTY_MOREINFOURLA, NULL, NULL);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
 
     /* pcchValue doesn't have enough room for NULL terminator */
@@ -12097,7 +12148,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_MOREINFOURL, val, &size);
+                            INSTALLPROPERTY_MOREINFOURLA, val, &size);
     ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r);
     ok(!lstrcmpA(val, "moreinf"),
        "Expected \"moreinf\", got \"%s\"\n", val);
@@ -12108,7 +12159,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_MOREINFOURL, val, &size);
+                            INSTALLPROPERTY_MOREINFOURLA, val, &size);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(val, "moreinfo"),
        "Expected \"moreinfo\", got \"%s\"\n", val);
@@ -12118,7 +12169,7 @@ static void test_MsiGetPatchInfoEx(void)
     size = 0;
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_MOREINFOURL, NULL, &size);
+                            INSTALLPROPERTY_MOREINFOURLA, NULL, &size);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(size == 16, "Expected 16, got %d\n", size);
 
@@ -12135,7 +12186,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(val, "pack"), "Expected \"pack\", got \"%s\"\n", val);
     ok(size == 4, "Expected 4, got %d\n", size);
@@ -12147,7 +12198,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERMANAGED,
-                            INSTALLPROPERTY_TRANSFORMS, val, &size);
+                            INSTALLPROPERTY_TRANSFORMSA, val, &size);
     ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
     ok(!lstrcmpA(val, "apple"), "Expected \"apple\", got \"%s\"\n", val);
     ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
@@ -12175,7 +12226,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERUNMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
@@ -12195,7 +12246,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERUNMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
@@ -12210,7 +12261,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERUNMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
        "Expected val to be unchanged, got \"%s\"\n", val);
@@ -12224,7 +12275,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERUNMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
        "Expected val to be unchanged, got \"%s\"\n", val);
@@ -12238,7 +12289,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERUNMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
        "Expected val to be unchanged, got \"%s\"\n", val);
@@ -12255,7 +12306,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERUNMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
        "Expected val to be unchanged, got \"%s\"\n", val);
@@ -12269,7 +12320,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERUNMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
        "Expected val to be unchanged, got \"%s\"\n", val);
@@ -12284,7 +12335,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERUNMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
        "Expected val to be unchanged, got \"%s\"\n", val);
@@ -12303,7 +12354,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERUNMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(val, ""), "Expected \"\", got \"%s\"\n", val);
     ok(size == 0, "Expected 0, got %d\n", size);
@@ -12317,7 +12368,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERUNMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(val, "pack"), "Expected \"pack\", got \"%s\"\n", val);
     ok(size == 4, "Expected 4, got %d\n", size);
@@ -12326,7 +12377,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERUNMANAGED,
-                            INSTALLPROPERTY_TRANSFORMS, val, &size);
+                            INSTALLPROPERTY_TRANSFORMSA, val, &size);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(val, "transforms"), "Expected \"transforms\", got \"%s\"\n", val);
     ok(size == 10, "Expected 10, got %d\n", size);
@@ -12344,7 +12395,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERUNMANAGED,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(val, "pack"), "Expected \"pack\", got \"%s\"\n", val);
     ok(size == 4, "Expected 4, got %d\n", size);
@@ -12356,7 +12407,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, usersid,
                             MSIINSTALLCONTEXT_USERUNMANAGED,
-                            INSTALLPROPERTY_TRANSFORMS, val, &size);
+                            INSTALLPROPERTY_TRANSFORMSA, val, &size);
     ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
     ok(!lstrcmpA(val, "apple"), "Expected \"apple\", got \"%s\"\n", val);
     ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
@@ -12379,7 +12430,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, NULL,
                             MSIINSTALLCONTEXT_MACHINE,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
@@ -12398,7 +12449,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, NULL,
                             MSIINSTALLCONTEXT_MACHINE,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_UNKNOWN_PRODUCT,
        "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
@@ -12413,7 +12464,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, NULL,
                             MSIINSTALLCONTEXT_MACHINE,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
        "Expected val to be unchanged, got \"%s\"\n", val);
@@ -12427,7 +12478,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, NULL,
                             MSIINSTALLCONTEXT_MACHINE,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
        "Expected val to be unchanged, got \"%s\"\n", val);
@@ -12441,7 +12492,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, NULL,
                             MSIINSTALLCONTEXT_MACHINE,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
        "Expected val to be unchanged, got \"%s\"\n", val);
@@ -12458,7 +12509,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, NULL,
                             MSIINSTALLCONTEXT_MACHINE,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
        "Expected val to be unchanged, got \"%s\"\n", val);
@@ -12472,7 +12523,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, NULL,
                             MSIINSTALLCONTEXT_MACHINE,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
        "Expected val to be unchanged, got \"%s\"\n", val);
@@ -12487,7 +12538,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, NULL,
                             MSIINSTALLCONTEXT_MACHINE,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
     ok(!lstrcmpA(val, "apple"),
        "Expected val to be unchanged, got \"%s\"\n", val);
@@ -12505,7 +12556,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, NULL,
                             MSIINSTALLCONTEXT_MACHINE,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(val, ""), "Expected \"\", got \"%s\"\n", val);
     ok(size == 0, "Expected 0, got %d\n", size);
@@ -12519,7 +12570,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, NULL,
                             MSIINSTALLCONTEXT_MACHINE,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(val, "pack"), "Expected \"pack\", got \"%s\"\n", val);
     ok(size == 4, "Expected 4, got %d\n", size);
@@ -12528,7 +12579,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, NULL,
                             MSIINSTALLCONTEXT_MACHINE,
-                            INSTALLPROPERTY_TRANSFORMS, val, &size);
+                            INSTALLPROPERTY_TRANSFORMSA, val, &size);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(val, "transforms"), "Expected \"transforms\", got \"%s\"\n", val);
     ok(size == 10, "Expected 10, got %d\n", size);
@@ -12546,7 +12597,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, NULL,
                             MSIINSTALLCONTEXT_MACHINE,
-                            INSTALLPROPERTY_LOCALPACKAGE, val, &size);
+                            INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(!lstrcmpA(val, "pack"), "Expected \"pack\", got \"%s\"\n", val);
     ok(size == 4, "Expected 4, got %d\n", size);
@@ -12558,7 +12609,7 @@ static void test_MsiGetPatchInfoEx(void)
     lstrcpyA(val, "apple");
     r = pMsiGetPatchInfoExA(patchcode, prodcode, NULL,
                             MSIINSTALLCONTEXT_MACHINE,
-                            INSTALLPROPERTY_TRANSFORMS, val, &size);
+                            INSTALLPROPERTY_TRANSFORMSA, val, &size);
     ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
     ok(!lstrcmpA(val, "apple"), "Expected \"apple\", got \"%s\"\n", val);
     ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
@@ -12658,6 +12709,11 @@ static void test_MsiGetPatchInfo(void)
     lstrcatA(keypath, prod_squashed);
 
     res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &hkey_udproduct, NULL);
+    if (res == ERROR_ACCESS_DENIED)
+    {
+        skip("Not enough rights to perform tests\n");
+        goto done;
+    }
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", res);
 
     /* UserData product key exists */
@@ -12749,24 +12805,26 @@ static void test_MsiGetPatchInfo(void)
     RegCloseKey(hkey_udproductpatches);
     delete_key(hkey_udpatch, "", access & KEY_WOW64_64KEY);
     RegCloseKey(hkey_udpatch);
-    delete_key(hkey_patches, "", access & KEY_WOW64_64KEY);
-    RegCloseKey(hkey_patches);
-    delete_key(hkey_product, "", access & KEY_WOW64_64KEY);
-    RegCloseKey(hkey_product);
-    delete_key(hkey_patch, "", access & KEY_WOW64_64KEY);
-    RegCloseKey(hkey_patch);
     delete_key(hkey_udpatches, "", access & KEY_WOW64_64KEY);
     RegCloseKey(hkey_udpatches);
     delete_key(hkey_udprops, "", access & KEY_WOW64_64KEY);
     RegCloseKey(hkey_udprops);
     delete_key(hkey_udproduct, "", access & KEY_WOW64_64KEY);
     RegCloseKey(hkey_udproduct);
+
+done:
+    delete_key(hkey_patches, "", access & KEY_WOW64_64KEY);
+    RegCloseKey(hkey_patches);
+    delete_key(hkey_product, "", access & KEY_WOW64_64KEY);
+    RegCloseKey(hkey_product);
+    delete_key(hkey_patch, "", access & KEY_WOW64_64KEY);
+    RegCloseKey(hkey_patch);
 }
 
 static void test_MsiEnumProducts(void)
 {
     UINT r;
-    int found1, found2, found3;
+    BOOL found1, found2, found3;
     DWORD index;
     char product1[39], product2[39], product3[39], guid[39];
     char product_squashed1[33], product_squashed2[33], product_squashed3[33];
@@ -12783,10 +12841,12 @@ static void test_MsiEnumProducts(void)
     if (is_wow64)
         access |= KEY_WOW64_64KEY;
 
-    strcpy(keypath1, "Software\\Classes\\Installer\\Products\\");
-    strcat(keypath1, product_squashed1);
+    strcpy(keypath2, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\Managed\\");
+    strcat(keypath2, usersid);
+    strcat(keypath2, "\\Installer\\Products\\");
+    strcat(keypath2, product_squashed2);
 
-    r = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath1, 0, NULL, 0, access, NULL, &key1, NULL);
+    r = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath2, 0, NULL, 0, access, NULL, &key2, NULL);
     if (r == ERROR_ACCESS_DENIED)
     {
         skip("Not enough rights to perform tests\n");
@@ -12795,12 +12855,10 @@ static void test_MsiEnumProducts(void)
     }
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
 
-    strcpy(keypath2, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\Managed\\");
-    strcat(keypath2, usersid);
-    strcat(keypath2, "\\Installer\\Products\\");
-    strcat(keypath2, product_squashed2);
+    strcpy(keypath1, "Software\\Classes\\Installer\\Products\\");
+    strcat(keypath1, product_squashed1);
 
-    r = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath2, 0, NULL, 0, access, NULL, &key2, NULL);
+    r = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath1, 0, NULL, 0, access, NULL, &key1, NULL);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
 
     strcpy(keypath3, "Software\\Microsoft\\Installer\\Products\\");
@@ -12824,12 +12882,12 @@ static void test_MsiEnumProducts(void)
     r = MsiEnumProductsA(index, guid);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
 
-    found1 = found2 = found3 = 0;
+    found1 = found2 = found3 = FALSE;
     while ((r = MsiEnumProductsA(index, guid)) == ERROR_SUCCESS)
     {
-        if (!strcmp(product1, guid)) found1 = 1;
-        if (!strcmp(product2, guid)) found2 = 1;
-        if (!strcmp(product3, guid)) found3 = 1;
+        if (!strcmp(product1, guid)) found1 = TRUE;
+        if (!strcmp(product2, guid)) found2 = TRUE;
+        if (!strcmp(product3, guid)) found3 = TRUE;
         index++;
     }
     ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %u\n", r);
@@ -12914,10 +12972,12 @@ static void test_MsiEnumProductsEx(void)
 
     if (is_wow64) access |= KEY_WOW64_64KEY;
 
-    strcpy( keypath1, "Software\\Classes\\Installer\\Products\\" );
-    strcat( keypath1, product_squashed1 );
+    strcpy( keypath2, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\Managed\\" );
+    strcat( keypath2, usersid );
+    strcat( keypath2, "\\Installer\\Products\\" );
+    strcat( keypath2, product_squashed2 );
 
-    r = RegCreateKeyExA( HKEY_LOCAL_MACHINE, keypath1, 0, NULL, 0, access, NULL, &key1, NULL );
+    r = RegCreateKeyExA( HKEY_LOCAL_MACHINE, keypath2, 0, NULL, 0, access, NULL, &key2, NULL );
     if (r == ERROR_ACCESS_DENIED)
     {
         skip( "insufficient rights\n" );
@@ -12925,12 +12985,10 @@ static void test_MsiEnumProductsEx(void)
     }
     ok( r == ERROR_SUCCESS, "got %u\n", r );
 
-    strcpy( keypath2, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\Managed\\" );
-    strcat( keypath2, usersid );
-    strcat( keypath2, "\\Installer\\Products\\" );
-    strcat( keypath2, product_squashed2 );
+    strcpy( keypath1, "Software\\Classes\\Installer\\Products\\" );
+    strcat( keypath1, product_squashed1 );
 
-    r = RegCreateKeyExA( HKEY_LOCAL_MACHINE, keypath2, 0, NULL, 0, access, NULL, &key2, NULL );
+    r = RegCreateKeyExA( HKEY_LOCAL_MACHINE, keypath1, 0, NULL, 0, access, NULL, &key1, NULL );
     ok( r == ERROR_SUCCESS, "got %u\n", r );
 
     strcpy( keypath3, usersid );
@@ -13055,7 +13113,7 @@ done:
 static void test_MsiEnumComponents(void)
 {
     UINT r;
-    int found1, found2;
+    BOOL found1, found2;
     DWORD index;
     char comp1[39], comp2[39], guid[39];
     char comp_squashed1[33], comp_squashed2[33];
@@ -13098,11 +13156,11 @@ static void test_MsiEnumComponents(void)
 
     index = 0;
     guid[0] = 0;
-    found1 = found2 = 0;
+    found1 = found2 = FALSE;
     while (!MsiEnumComponentsA( index, guid ))
     {
-        if (!strcmp( guid, comp1 )) found1 = 1;
-        if (!strcmp( guid, comp2 )) found2 = 1;
+        if (!strcmp( guid, comp1 )) found1 = TRUE;
+        if (!strcmp( guid, comp2 )) found2 = TRUE;
         ok( guid[0], "empty guid\n" );
         guid[0] = 0;
         index++;
@@ -13121,7 +13179,7 @@ done:
 static void test_MsiEnumComponentsEx(void)
 {
     UINT r;
-    int found1, found2;
+    BOOL found1, found2;
     DWORD len, index;
     MSIINSTALLCONTEXT context;
     char comp1[39], comp2[39], guid[39], sid[128];
@@ -13174,7 +13232,7 @@ static void test_MsiEnumComponentsEx(void)
     context = 0xdeadbeef;
     sid[0] = 0;
     len = sizeof(sid);
-    found1 = found2 = 0;
+    found1 = found2 = FALSE;
     while (!pMsiEnumComponentsExA( "S-1-1-0", MSIINSTALLCONTEXT_ALL, index, guid, &context, sid, &len ))
     {
         if (!strcmp( comp1, guid ))
@@ -13182,14 +13240,14 @@ static void test_MsiEnumComponentsEx(void)
             ok( context == MSIINSTALLCONTEXT_MACHINE, "got %u\n", context );
             ok( !sid[0], "got \"%s\"\n", sid );
             ok( !len, "unexpected length %u\n", len );
-            found1 = 1;
+            found1 = TRUE;
         }
         if (!strcmp( comp2, guid ))
         {
             ok( context == MSIINSTALLCONTEXT_USERUNMANAGED, "got %u\n", context );
             ok( sid[0], "empty sid\n" );
             ok( len == strlen(sid), "unexpected length %u\n", len );
-            found2 = 1;
+            found2 = TRUE;
         }
         index++;
         guid[0] = 0;
@@ -13518,7 +13576,7 @@ static void test_MsiSetFeatureAttributes(void)
     strcat( path, "\\" );
     strcat( path, msifile );
 
-    r = MsiOpenPackage( path, &package );
+    r = MsiOpenPackageA( path, &package );
     if (r == ERROR_INSTALL_PACKAGE_REJECTED)
     {
         skip("Not enough rights to perform tests\n");
@@ -13530,7 +13588,7 @@ static void test_MsiSetFeatureAttributes(void)
     r = MsiSetFeatureAttributesA( package, "One", INSTALLFEATUREATTRIBUTE_FAVORLOCAL );
     ok(r == ERROR_FUNCTION_FAILED, "Expected ERROR_FUNCTION_FAILED, got %u\n", r);
 
-    r = MsiDoAction( package, "CostInitialize" );
+    r = MsiDoActionA( package, "CostInitialize" );
     ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r);
 
     r = MsiSetFeatureAttributesA( 0, "One", INSTALLFEATUREATTRIBUTE_FAVORLOCAL );
@@ -13560,7 +13618,7 @@ static void test_MsiSetFeatureAttributes(void)
     ok(attrs == INSTALLFEATUREATTRIBUTE_FAVORLOCAL,
        "expected INSTALLFEATUREATTRIBUTE_FAVORLOCAL, got 0x%08x\n", attrs);
 
-    r = MsiDoAction( package, "FileCost" );
+    r = MsiDoActionA( package, "FileCost" );
     ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r);
 
     r = MsiSetFeatureAttributesA( package, "One", INSTALLFEATUREATTRIBUTE_FAVORSOURCE );
@@ -13572,7 +13630,7 @@ static void test_MsiSetFeatureAttributes(void)
     ok(attrs == INSTALLFEATUREATTRIBUTE_FAVORSOURCE,
        "expected INSTALLFEATUREATTRIBUTE_FAVORSOURCE, got 0x%08x\n", attrs);
 
-    r = MsiDoAction( package, "CostFinalize" );
+    r = MsiDoActionA( package, "CostFinalize" );
     ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r);
 
     r = MsiSetFeatureAttributesA( package, "One", INSTALLFEATUREATTRIBUTE_FAVORLOCAL );
@@ -13600,7 +13658,7 @@ static void test_MsiGetFeatureInfo(void)
     strcat( path, "\\" );
     strcat( path, msifile );
 
-    r = MsiOpenPackage( path, &package );
+    r = MsiOpenPackageA( path, &package );
     if (r == ERROR_INSTALL_PACKAGE_REJECTED)
     {
         skip("Not enough rights to perform tests\n");
@@ -13745,7 +13803,7 @@ static void test_MsiSetExternalUI(void)
 
 static void test_lastusedsource(void)
 {
-    static char prodcode[] = "{38847338-1BBC-4104-81AC-2FAAC7ECDDCD}";
+    static const char prodcode[] = "{38847338-1BBC-4104-81AC-2FAAC7ECDDCD}";
     char value[MAX_PATH], path[MAX_PATH];
     DWORD size;
     UINT r;
@@ -13759,7 +13817,7 @@ static void test_lastusedsource(void)
     CreateDirectoryA("msitest", NULL);
     create_file("maximus", "maximus", 500);
     create_cab_file("test1.cab", MEDIA_SIZE, "maximus\0");
-    DeleteFile("maximus");
+    DeleteFileA("maximus");
 
     create_database("msifile0.msi", lus0_tables, sizeof(lus0_tables) / sizeof(msi_table));
     create_database("msifile1.msi", lus1_tables, sizeof(lus1_tables) / sizeof(msi_table));
@@ -13772,7 +13830,7 @@ static void test_lastusedsource(void)
     size = MAX_PATH;
     lstrcpyA(value, "aaa");
     r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED,
-                               MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size);
+                               MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCEA, value, &size);
     ok(r == ERROR_UNKNOWN_PRODUCT, "expected ERROR_UNKNOWN_PRODUCT, got %u\n", r);
     ok(!lstrcmpA(value, "aaa"), "expected \"aaa\", got \"%s\"\n", value);
 
@@ -13790,7 +13848,7 @@ static void test_lastusedsource(void)
     size = MAX_PATH;
     lstrcpyA(value, "aaa");
     r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED,
-                               MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size);
+                               MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCEA, value, &size);
     ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r);
     ok(!lstrcmpA(value, path), "expected \"%s\", got \"%s\"\n", path, value);
     ok(size == lstrlenA(path), "expected %d, got %d\n", lstrlenA(path), size);
@@ -13803,7 +13861,7 @@ static void test_lastusedsource(void)
     size = MAX_PATH;
     lstrcpyA(value, "aaa");
     r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED,
-                               MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size);
+                               MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCEA, value, &size);
     ok(r == ERROR_UNKNOWN_PRODUCT, "expected ERROR_UNKNOWN_PRODUCT, got %u\n", r);
     ok(!lstrcmpA(value, "aaa"), "expected \"aaa\", got \"%s\"\n", value);
 
@@ -13816,7 +13874,7 @@ static void test_lastusedsource(void)
     size = MAX_PATH;
     lstrcpyA(value, "aaa");
     r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED,
-                               MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size);
+                               MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCEA, value, &size);
     ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r);
     ok(!lstrcmpA(value, path), "expected \"%s\", got \"%s\"\n", path, value);
     ok(size == lstrlenA(path), "expected %d, got %d\n", lstrlenA(path), size);
@@ -13827,7 +13885,7 @@ static void test_lastusedsource(void)
     size = MAX_PATH;
     lstrcpyA(value, "aaa");
     r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED,
-                               MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size);
+                               MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCEA, value, &size);
     ok(r == ERROR_UNKNOWN_PRODUCT, "expected ERROR_UNKNOWN_PRODUCT, got %u\n", r);
     ok(!lstrcmpA(value, "aaa"), "expected \"aaa\", got \"%s\"\n", value);
 
@@ -13841,7 +13899,7 @@ static void test_lastusedsource(void)
     size = MAX_PATH;
     lstrcpyA(value, "aaa");
     r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED,
-                               MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size);
+                               MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCEA, value, &size);
     ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r);
     ok(!lstrcmpA(value, path), "expected \"%s\", got \"%s\"\n", path, value);
     ok(size == lstrlenA(path), "expected %d, got %d\n", lstrlenA(path), size);
@@ -13852,17 +13910,17 @@ static void test_lastusedsource(void)
     size = MAX_PATH;
     lstrcpyA(value, "aaa");
     r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED,
-                               MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size);
+                               MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCEA, value, &size);
     ok(r == ERROR_UNKNOWN_PRODUCT, "expected ERROR_UNKNOWN_PRODUCT, got %u\n", r);
     ok(!lstrcmpA(value, "aaa"), "expected \"aaa\", got \"%s\"\n", value);
 
 error:
     delete_cab_files();
-    DeleteFile("msitest\\maximus");
-    RemoveDirectory("msitest");
-    DeleteFile("msifile0.msi");
-    DeleteFile("msifile1.msi");
-    DeleteFile("msifile2.msi");
+    DeleteFileA("msitest\\maximus");
+    RemoveDirectoryA("msitest");
+    DeleteFileA("msifile0.msi");
+    DeleteFileA("msifile1.msi");
+    DeleteFileA("msifile2.msi");
 }
 
 static void test_setpropertyfolder(void)
@@ -13909,9 +13967,9 @@ static void test_setpropertyfolder(void)
     }
 
 error:
-    DeleteFile(msifile);
-    DeleteFile("msitest\\maximus");
-    RemoveDirectory("msitest");
+    DeleteFileA(msifile);
+    DeleteFileA("msitest\\maximus");
+    RemoveDirectoryA("msitest");
 }
 
 static void test_sourcedir_props(void)
@@ -13974,7 +14032,7 @@ static void test_sourcedir_props(void)
 
     DeleteFileA("msitest\\sourcedir.txt");
     delete_test_files();
-    DeleteFile(msifile);
+    DeleteFileA(msifile);
 }
 
 static void test_concurrentinstall(void)
@@ -14005,7 +14063,7 @@ static void test_concurrentinstall(void)
     if (r == ERROR_INSTALL_PACKAGE_REJECTED)
     {
         skip("Not enough rights to perform tests\n");
-        DeleteFile(path);
+        DeleteFileA(path);
         goto error;
     }
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
@@ -14018,14 +14076,14 @@ static void test_concurrentinstall(void)
                              INSTALLSTATE_ABSENT);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
 
-    DeleteFile(path);
+    DeleteFileA(path);
 
 error:
-    DeleteFile(msifile);
-    DeleteFile("msitest\\msitest\\augustus");
-    DeleteFile("msitest\\maximus");
-    RemoveDirectory("msitest\\msitest");
-    RemoveDirectory("msitest");
+    DeleteFileA(msifile);
+    DeleteFileA("msitest\\msitest\\augustus");
+    DeleteFileA("msitest\\maximus");
+    RemoveDirectoryA("msitest\\msitest");
+    RemoveDirectoryA("msitest");
 }
 
 static void test_command_line_parsing(void)
@@ -14184,7 +14242,7 @@ static void test_command_line_parsing(void)
     r = MsiInstallProductA(msifile, cmd);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
 
-    DeleteFile(msifile);
+    DeleteFileA(msifile);
     delete_test_files();
 }
 
@@ -14199,7 +14257,7 @@ START_TEST(msi)
         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);