[MSI_WINETEST]
[reactos.git] / rostests / winetests / msi / msi.c
index 3396f5c..2995adb 100644 (file)
@@ -190,7 +190,7 @@ static void test_usefeature(void)
 
     if (!pMsiUseFeatureExA)
     {
-        skip("MsiUseFeatureExA not implemented\n");
+        win_skip("MsiUseFeatureExA not implemented\n");
         return;
     }
 
@@ -408,7 +408,7 @@ static void test_MsiGetFileHash(void)
 
     if (!pMsiGetFileHashA)
     {
-        skip("MsiGetFileHash not implemented\n");
+        win_skip("MsiGetFileHash not implemented\n");
         return;
     }
 
@@ -505,7 +505,7 @@ static void create_test_guid(LPSTR prodcode, LPSTR squashed)
     hr = CoCreateGuid(&guid);
     ok(hr == S_OK, "Expected S_OK, got %d\n", hr);
 
-    size = StringFromGUID2(&guid, (LPOLESTR)guidW, MAX_PATH);
+    size = StringFromGUID2(&guid, guidW, MAX_PATH);
     ok(size == 39, "Expected 39, got %d\n", hr);
 
     WideCharToMultiByte(CP_ACP, 0, guidW, size, prodcode, MAX_PATH, NULL, NULL);
@@ -516,15 +516,20 @@ static void create_test_guid(LPSTR prodcode, LPSTR squashed)
 static void get_user_sid(LPSTR *usersid)
 {
     HANDLE token;
-    BYTE buf[1024];
     DWORD size;
     PTOKEN_USER user;
 
     OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token);
-    size = sizeof(buf);
-    GetTokenInformation(token, TokenUser, (void *)buf, size, &size);
-    user = (PTOKEN_USER)buf;
+
+    size = 0;
+    GetTokenInformation(token, TokenUser, NULL, size, &size);
+    user = HeapAlloc(GetProcessHeap(), 0, size);
+
+    GetTokenInformation(token, TokenUser, user, size, &size);
     pConvertSidToStringSidA(user->User.Sid, usersid);
+
+    HeapFree(GetProcessHeap(), 0, user);
+    CloseHandle(token);
 }
 
 static void test_MsiQueryProductState(void)
@@ -756,10 +761,8 @@ static const char table_enc85[] =
 /*
  *  Encodes a base85 guid given a GUID pointer
  *  Caller should provide a 21 character buffer for the encoded string.
- *
- *  returns TRUE if successful, FALSE if not
  */
-static BOOL encode_base85_guid( GUID *guid, LPWSTR str )
+static void encode_base85_guid( GUID *guid, LPWSTR str )
 {
     unsigned int x, *p, i;
 
@@ -778,8 +781,6 @@ static BOOL encode_base85_guid( GUID *guid, LPWSTR str )
         *str++ = table_enc85[x%85];
     }
     *str = 0;
-
-    return TRUE;
 }
 
 static void compose_base85_guid(LPSTR component, LPSTR comp_base85, LPSTR squashed)
@@ -794,7 +795,7 @@ static void compose_base85_guid(LPSTR component, LPSTR comp_base85, LPSTR squash
     hr = CoCreateGuid(&guid);
     ok(hr == S_OK, "Expected S_OK, got %d\n", hr);
 
-    size = StringFromGUID2(&guid, (LPOLESTR)guidW, MAX_PATH);
+    size = StringFromGUID2(&guid, guidW, MAX_PATH);
     ok(size == 39, "Expected 39, got %d\n", hr);
 
     WideCharToMultiByte(CP_ACP, 0, guidW, size, component, MAX_PATH, NULL, NULL);
@@ -806,12 +807,12 @@ static void compose_base85_guid(LPSTR component, LPSTR comp_base85, LPSTR squash
 
 static void test_MsiQueryFeatureState(void)
 {
-    HKEY userkey, localkey, compkey;
+    HKEY userkey, localkey, compkey, compkey2;
     CHAR prodcode[MAX_PATH];
     CHAR prod_squashed[MAX_PATH];
     CHAR component[MAX_PATH];
     CHAR comp_base85[MAX_PATH];
-    CHAR comp_squashed[MAX_PATH];
+    CHAR comp_squashed[MAX_PATH], comp_squashed2[MAX_PATH];
     CHAR keypath[MAX_PATH*2];
     INSTALLSTATE state;
     LPSTR usersid;
@@ -819,6 +820,7 @@ static void test_MsiQueryFeatureState(void)
 
     create_test_guid(prodcode, prod_squashed);
     compose_base85_guid(component, comp_base85, comp_squashed);
+    compose_base85_guid(component, comp_base85 + 20, comp_squashed2);
     get_user_sid(&usersid);
 
     /* NULL prodcode */
@@ -907,7 +909,7 @@ static void test_MsiQueryFeatureState(void)
     state = MsiQueryFeatureStateA(prodcode, "feature");
     ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
 
-    res = RegSetValueExA(localkey, "feature", 0, REG_SZ, (const BYTE *)comp_base85, 21);
+    res = RegSetValueExA(localkey, "feature", 0, REG_SZ, (const BYTE *)comp_base85, 41);
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
 
     state = MsiQueryFeatureStateA(prodcode, "feature");
@@ -921,6 +923,14 @@ static void test_MsiQueryFeatureState(void)
     res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &compkey);
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
 
+    lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\");
+    lstrcatA(keypath, usersid);
+    lstrcatA(keypath, "\\Components\\");
+    lstrcatA(keypath, comp_squashed2);
+
+    res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &compkey2);
+    ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
     state = MsiQueryFeatureStateA(prodcode, "feature");
     ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
 
@@ -928,9 +938,15 @@ static void test_MsiQueryFeatureState(void)
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
 
     state = MsiQueryFeatureStateA(prodcode, "feature");
-    ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
+    ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
 
-    res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"apple", 1);
+    res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"apple", 6);
+    ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
+    state = MsiQueryFeatureStateA(prodcode, "feature");
+    ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
+
+    res = RegSetValueExA(compkey2, prod_squashed, 0, REG_SZ, (const BYTE *)"orange", 7);
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
 
     /* INSTALLSTATE_LOCAL */
@@ -966,11 +982,14 @@ static void test_MsiQueryFeatureState(void)
     ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
 
     RegDeleteValueA(compkey, prod_squashed);
+    RegDeleteValueA(compkey2, prod_squashed);
     RegDeleteKeyA(compkey, "");
+    RegDeleteKeyA(compkey2, "");
     RegDeleteValueA(localkey, "feature");
     RegDeleteValueA(userkey, "feature");
     RegDeleteKeyA(userkey, "");
     RegCloseKey(compkey);
+    RegCloseKey(compkey2);
     RegCloseKey(localkey);
     RegCloseKey(userkey);
 
@@ -988,7 +1007,7 @@ static void test_MsiQueryFeatureState(void)
     state = MsiQueryFeatureStateA(prodcode, "feature");
     ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
 
-    res = RegSetValueExA(userkey, "feature", 0, REG_SZ, (const BYTE *)"", 2);
+    res = RegSetValueExA(userkey, "feature", 0, REG_SZ, (const BYTE *)"", 1);
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
 
     /* feature value exists */
@@ -1026,7 +1045,7 @@ static void test_MsiQueryFeatureState(void)
     state = MsiQueryFeatureStateA(prodcode, "feature");
     ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
 
-    res = RegSetValueExA(localkey, "feature", 0, REG_SZ, (const BYTE *)comp_base85, 21);
+    res = RegSetValueExA(localkey, "feature", 0, REG_SZ, (const BYTE *)comp_base85, 41);
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
 
     state = MsiQueryFeatureStateA(prodcode, "feature");
@@ -1040,6 +1059,14 @@ static void test_MsiQueryFeatureState(void)
     res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &compkey);
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
 
+    lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\");
+    lstrcatA(keypath, usersid);
+    lstrcatA(keypath, "\\Components\\");
+    lstrcatA(keypath, comp_squashed2);
+
+    res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &compkey2);
+    ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
     state = MsiQueryFeatureStateA(prodcode, "feature");
     ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
 
@@ -1047,20 +1074,29 @@ static void test_MsiQueryFeatureState(void)
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
 
     state = MsiQueryFeatureStateA(prodcode, "feature");
-    ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
+    ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
+
+    res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"apple", 6);
+    ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
 
-    res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"apple", 1);
+    state = MsiQueryFeatureStateA(prodcode, "feature");
+    ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
+
+    res = RegSetValueExA(compkey2, prod_squashed, 0, REG_SZ, (const BYTE *)"orange", 7);
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
 
     state = MsiQueryFeatureStateA(prodcode, "feature");
     ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
 
     RegDeleteValueA(compkey, prod_squashed);
+    RegDeleteValueA(compkey2, prod_squashed);
     RegDeleteKeyA(compkey, "");
+    RegDeleteKeyA(compkey2, "");
     RegDeleteValueA(localkey, "feature");
     RegDeleteValueA(userkey, "feature");
     RegDeleteKeyA(userkey, "");
     RegCloseKey(compkey);
+    RegCloseKey(compkey2);
     RegCloseKey(localkey);
     RegCloseKey(userkey);
 
@@ -1076,7 +1112,7 @@ static void test_MsiQueryFeatureState(void)
     state = MsiQueryFeatureStateA(prodcode, "feature");
     ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
 
-    res = RegSetValueExA(userkey, "feature", 0, REG_SZ, (const BYTE *)"", 2);
+    res = RegSetValueExA(userkey, "feature", 0, REG_SZ, (const BYTE *)"", 1);
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
 
     /* feature value exists */
@@ -1113,7 +1149,7 @@ static void test_MsiQueryFeatureState(void)
     state = MsiQueryFeatureStateA(prodcode, "feature");
     ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
 
-    res = RegSetValueExA(localkey, "feature", 0, REG_SZ, (const BYTE *)comp_base85, 21);
+    res = RegSetValueExA(localkey, "feature", 0, REG_SZ, (const BYTE *)comp_base85, 41);
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
 
     state = MsiQueryFeatureStateA(prodcode, "feature");
@@ -1126,6 +1162,13 @@ static void test_MsiQueryFeatureState(void)
     res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &compkey);
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
 
+    lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\");
+    lstrcatA(keypath, "S-1-5-18\\Components\\");
+    lstrcatA(keypath, comp_squashed2);
+
+    res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &compkey2);
+    ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
     state = MsiQueryFeatureStateA(prodcode, "feature");
     ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
 
@@ -1133,22 +1176,32 @@ static void test_MsiQueryFeatureState(void)
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
 
     state = MsiQueryFeatureStateA(prodcode, "feature");
-    ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
+    ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
+
+    res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"apple", 6);
+    ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
+    state = MsiQueryFeatureStateA(prodcode, "feature");
+    ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
 
-    res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"apple", 1);
+    res = RegSetValueExA(compkey2, prod_squashed, 0, REG_SZ, (const BYTE *)"orange", 7);
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
 
     state = MsiQueryFeatureStateA(prodcode, "feature");
     ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
 
     RegDeleteValueA(compkey, prod_squashed);
+    RegDeleteValueA(compkey2, prod_squashed);
     RegDeleteKeyA(compkey, "");
+    RegDeleteKeyA(compkey2, "");
     RegDeleteValueA(localkey, "feature");
     RegDeleteValueA(userkey, "feature");
     RegDeleteKeyA(userkey, "");
     RegCloseKey(compkey);
+    RegCloseKey(compkey2);
     RegCloseKey(localkey);
     RegCloseKey(userkey);
+    LocalFree(usersid);
 }
 
 static void test_MsiQueryComponentState(void)
@@ -1169,7 +1222,7 @@ static void test_MsiQueryComponentState(void)
 
     if (!pMsiQueryComponentStateA)
     {
-        skip("MsiQueryComponentStateA not implemented\n");
+        win_skip("MsiQueryComponentStateA not implemented\n");
         return;
     }
 
@@ -1274,7 +1327,14 @@ static void test_MsiQueryComponentState(void)
     state = MAGIC_ERROR;
     r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE, component, &state);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
-    ok(state == INSTALLSTATE_NOTUSED, "Expected INSTALLSTATE_NOTUSED, got %d\n", state);
+    ok(state == INSTALLSTATE_NOTUSED || state == INSTALLSTATE_LOCAL,
+       "Expected INSTALLSTATE_NOTUSED or INSTALLSTATE_LOCAL, got %d\n", state);
+
+    /* NULL component, product exists */
+    state = MAGIC_ERROR;
+    r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE, NULL, &state);
+    ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
+    ok(state == MAGIC_ERROR, "Expected state not changed, got %d\n", state);
 
     res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"hi", 2);
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
@@ -1389,7 +1449,8 @@ static void test_MsiQueryComponentState(void)
     state = MAGIC_ERROR;
     r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, component, &state);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
-    ok(state == INSTALLSTATE_NOTUSED, "Expected INSTALLSTATE_NOTUSED, got %d\n", state);
+    ok(state == INSTALLSTATE_NOTUSED || state == INSTALLSTATE_LOCAL,
+       "Expected INSTALLSTATE_NOTUSED or INSTALLSTATE_LOCAL, got %d\n", state);
 
     res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"hi", 2);
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
@@ -1460,6 +1521,7 @@ static void test_MsiQueryComponentState(void)
     RegDeleteKeyA(compkey, "");
     RegCloseKey(prodkey);
     RegCloseKey(compkey);
+    LocalFree(usersid);
 }
 
 static void test_MsiGetComponentPath(void)
@@ -1760,7 +1822,6 @@ static void test_MsiGetComponentPath(void)
     RegDeleteKeyA(compkey, "");
     RegCloseKey(prodkey);
     RegCloseKey(compkey);
-    RegCloseKey(installprop);
     DeleteFileA("C:\\imapath");
 
     lstrcpyA(keypath, "Software\\Classes\\Installer\\Products\\");
@@ -1813,6 +1874,7 @@ static void test_MsiGetComponentPath(void)
     RegCloseKey(prodkey);
     RegCloseKey(compkey);
     DeleteFileA("C:\\imapath");
+    LocalFree(usersid);
 }
 
 static void test_MsiGetProductCode(void)
@@ -1923,9 +1985,6 @@ static void test_MsiGetProductCode(void)
     RegDeleteKeyA(prodkey, "");
     RegCloseKey(prodkey);
 
-    RegDeleteKeyA(prodkey, "");
-    RegCloseKey(prodkey);
-
     lstrcpyA(keypath, "Software\\Microsoft\\Installer\\Products\\");
     lstrcatA(keypath, prod_squashed);
 
@@ -2072,6 +2131,7 @@ static void test_MsiGetProductCode(void)
     RegDeleteValueA(compkey, prod2_squashed);
     RegDeleteKeyA(compkey, "");
     RegCloseKey(compkey);
+    LocalFree(usersid);
 }
 
 static void test_MsiEnumClients(void)
@@ -2258,6 +2318,7 @@ static void test_MsiEnumClients(void)
     RegDeleteValueA(compkey, prod2_squashed);
     RegDeleteKeyA(compkey, "");
     RegCloseKey(compkey);
+    LocalFree(usersid);
 }
 
 static void get_version_info(LPSTR path, LPSTR *vercheck, LPDWORD verchecksz,
@@ -2456,8 +2517,7 @@ static void test_MsiGetFileVersion(void)
     r = MsiGetFileVersionA(path, version, &versz, lang, &langsz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     ok(versz == verchecksz, "Expected %d, got %d\n", verchecksz, versz);
-    ok(!lstrcmpA(lang, langcheck), "Expected %s, got %s\n", langcheck, lang);
-    ok(langsz == langchecksz, "Expected %d, got %d\n", langchecksz, langsz);
+    ok(strstr(lang, langcheck) != NULL, "Expected %s in %s\n", langcheck, lang);
     ok(!lstrcmpA(version, vercheck),
         "Expected %s, got %s\n", vercheck, version);
 
@@ -2475,8 +2535,7 @@ static void test_MsiGetFileVersion(void)
     lstrcpyA(lang, "lang");
     r = MsiGetFileVersionA(path, NULL, NULL, lang, &langsz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
-    ok(!lstrcmpA(lang, langcheck), "Expected %s, got %s\n", langcheck, lang);
-    ok(langsz == langchecksz, "Expected %d, got %d\n", langchecksz, langsz);
+    ok(strstr(lang, langcheck) != NULL, "Expected %s in %s\n", langcheck, lang);
 
     /* check neither version nor language */
     r = MsiGetFileVersionA(path, NULL, NULL, NULL, NULL);
@@ -2492,7 +2551,7 @@ static void test_MsiGetFileVersion(void)
     langsz = MAX_PATH;
     r = MsiGetFileVersionA(path, NULL, NULL, NULL, &langsz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
-    ok(langsz == langchecksz, "Expected %d, got %d\n", langchecksz, langsz);
+    ok(langsz >= langchecksz, "Expected %d >= %d\n", langsz, langchecksz);
 
     /* pcchVersionBuf not big enough */
     versz = 5;
@@ -2510,7 +2569,7 @@ static void test_MsiGetFileVersion(void)
     ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r);
     ok(!strncmp(lang, langcheck, 2),
        "Expected first character of %s, got %s\n", langcheck, lang);
-    ok(langsz == langchecksz, "Expected %d, got %d\n", langchecksz, langsz);
+    ok(langsz >= langchecksz, "Expected %d >= %d\n", langsz, langchecksz);
 
     HeapFree(GetProcessHeap(), 0, vercheck);
     HeapFree(GetProcessHeap(), 0, langcheck);
@@ -2720,7 +2779,7 @@ static void test_MsiGetProductInfo(void)
     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 */
+    /* lpValueBuf is non-NULL, pcchValueBuf is too small */
     sz = 2;
     lstrcpyA(buf, "apple");
     r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINK, buf, &sz);
@@ -2728,7 +2787,7 @@ static void test_MsiGetProductInfo(void)
     ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r);
     ok(sz == 4, "Expected 4, got %d\n", sz);
 
-    /* lpValueBuf is NULL, pcchValueBuf is exactly 4 */
+    /* lpValueBuf is non-NULL, pcchValueBuf is exactly 4 */
     sz = 4;
     lstrcpyA(buf, "apple");
     r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINK, buf, &sz);
@@ -3644,12 +3703,31 @@ static void test_MsiGetProductInfo(void)
     ok(!lstrcmpA(buf, "42"), "Expected \"42\", got \"%s\"\n", buf);
     ok(sz == 2, "Expected 2, got %d\n", sz);
 
+    /* SourceList key does not exist */
+    sz = MAX_PATH;
+    lstrcpyA(buf, "apple");
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PACKAGENAME, 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);
+    ok(sz == MAX_PATH, "Expected sz to be unchanged, got %d\n", sz);
+
     res = RegCreateKeyA(prodkey, "SourceList", &source);
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
 
+    /* SourceList key exists, but PackageName val does not exist */
+    sz = MAX_PATH;
+    lstrcpyA(buf, "apple");
+    r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PACKAGENAME, 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);
+
     res = RegSetValueExA(source, "PackageName", 0, REG_SZ, (LPBYTE)"packname", 9);
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
 
+    /* PackageName val exists */
     sz = MAX_PATH;
     lstrcpyA(buf, "apple");
     r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_PACKAGENAME, buf, &sz);
@@ -3770,6 +3848,7 @@ static void test_MsiGetProductInfo(void)
     RegCloseKey(localkey);
     RegCloseKey(source);
     RegCloseKey(prodkey);
+    LocalFree(usersid);
 }
 
 static void test_MsiGetProductInfoEx(void)
@@ -3789,7 +3868,7 @@ static void test_MsiGetProductInfoEx(void)
 
     if (!pMsiGetProductInfoExA)
     {
-        skip("MsiGetProductInfoExA is not available\n");
+        win_skip("MsiGetProductInfoExA is not available\n");
         return;
     }
 
@@ -4026,7 +4105,6 @@ static void test_MsiGetProductInfoEx(void)
                               INSTALLPROPERTY_HELPTELEPHONE, buf, &sz);
     ok(r == ERROR_MORE_DATA,
        "Expected ERROR_MORE_DATA, got %d\n", r);
-    ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf);
     ok(sz == 10, "Expected 10, got %d\n", sz);
 
     /* szValue is NULL, pcchValue is exactly 5 */
@@ -6508,6 +6586,7 @@ static void test_MsiGetProductInfoEx(void)
     RegDeleteValueA(prodkey, "HelpLink");
     RegDeleteKeyA(prodkey, "");
     RegCloseKey(prodkey);
+    LocalFree(usersid);
 }
 
 #define INIT_USERINFO() \
@@ -7087,6 +7166,7 @@ static void test_MsiGetUserInfo(void)
     RegCloseKey(userprod);
     RegDeleteKeyA(prodkey, "");
     RegCloseKey(prodkey);
+    LocalFree(usersid);
 }
 
 static void test_MsiOpenProduct(void)
@@ -7368,9 +7448,12 @@ static void test_MsiOpenProduct(void)
     /* LocalPackage has just the package name */
     hprod = 0xdeadbeef;
     r = MsiOpenProductA(prodcode, &hprod);
-    ok(r == ERROR_INSTALL_PACKAGE_OPEN_FAILED,
-       "Expected ERROR_INSTALL_PACKAGE_OPEN_FAILED, got %d\n", r);
-    ok(hprod == 0xdeadbeef, "Expected hprod to be unchanged\n");
+    ok(r == ERROR_INSTALL_PACKAGE_OPEN_FAILED || r == ERROR_SUCCESS,
+       "Expected ERROR_INSTALL_PACKAGE_OPEN_FAILED or ERROR_SUCCESS, got %d\n", r);
+    if (r == ERROR_SUCCESS)
+        MsiCloseHandle(hprod);
+    else
+        ok(hprod == 0xdeadbeef, "Expected hprod to be unchanged\n");
 
     lstrcpyA(val, path);
     lstrcatA(val, "\\winetest.msi");
@@ -7396,43 +7479,35 @@ static void test_MsiOpenProduct(void)
     RegCloseKey(prodkey);
 
     DeleteFileA(msifile);
+    LocalFree(usersid);
 }
 
-static void test_MsiEnumPatchesEx(void)
+static void test_MsiEnumPatchesEx_usermanaged(LPCSTR usersid, LPCSTR expectedsid)
 {
+    MSIINSTALLCONTEXT context;
     CHAR keypath[MAX_PATH], patch[MAX_PATH];
     CHAR patch_squashed[MAX_PATH], patchcode[MAX_PATH];
     CHAR targetsid[MAX_PATH], targetprod[MAX_PATH];
     CHAR prodcode[MAX_PATH], prod_squashed[MAX_PATH];
-    HKEY prodkey, patches, udprod, udpatch;
-    HKEY userkey, hpatch;
-    MSIINSTALLCONTEXT context;
+    HKEY prodkey, patches, udprod, udpatch, hpatch;
     DWORD size, data;
-    LPSTR usersid;
     LONG res;
     UINT r;
 
-    if (!pMsiEnumPatchesExA)
-    {
-        win_skip("MsiEnumPatchesExA not implemented\n");
-        return;
-    }
-
     create_test_guid(prodcode, prod_squashed);
     create_test_guid(patch, patch_squashed);
-    get_user_sid(&usersid);
 
-    /* empty szProductCode */
+    /* MSIPATCHSTATE_APPLIED */
+
     lstrcpyA(patchcode, "apple");
     lstrcpyA(targetprod, "banana");
     context = 0xdeadbeef;
     lstrcpyA(targetsid, "kiwi");
     size = MAX_PATH;
-    r = pMsiEnumPatchesExA("", usersid, MSIINSTALLCONTEXT_USERUNMANAGED,
-                           MSIPATCHSTATE_ALL, 0, patchcode, targetprod, &context,
-                           targetsid, &size);
-    ok(r == ERROR_INVALID_PARAMETER,
-       "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
+    r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_USERMANAGED,
+                           MSIPATCHSTATE_APPLIED, 0, patchcode, targetprod,
+                           &context, targetsid, &size);
+    ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
     ok(!lstrcmpA(patchcode, "apple"),
        "Expected patchcode to be unchanged, got %s\n", patchcode);
     ok(!lstrcmpA(targetprod, "banana"),
@@ -7443,17 +7518,24 @@ static void test_MsiEnumPatchesEx(void)
        "Expected targetsid to be unchanged, got %s\n", targetsid);
     ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
 
-    /* garbage szProductCode */
+    lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\Managed\\");
+    lstrcatA(keypath, expectedsid);
+    lstrcatA(keypath, "\\Installer\\Products\\");
+    lstrcatA(keypath, prod_squashed);
+
+    res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &prodkey);
+    ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
+    /* managed product key exists */
     lstrcpyA(patchcode, "apple");
     lstrcpyA(targetprod, "banana");
     context = 0xdeadbeef;
     lstrcpyA(targetsid, "kiwi");
     size = MAX_PATH;
-    r = pMsiEnumPatchesExA("garbage", usersid, MSIINSTALLCONTEXT_USERUNMANAGED,
-                           MSIPATCHSTATE_ALL, 0, patchcode, targetprod, &context,
-                           targetsid, &size);
-    ok(r == ERROR_INVALID_PARAMETER,
-       "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
+    r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_USERMANAGED,
+                           MSIPATCHSTATE_APPLIED, 0, patchcode, targetprod,
+                           &context, targetsid, &size);
+    ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
     ok(!lstrcmpA(patchcode, "apple"),
        "Expected patchcode to be unchanged, got %s\n", patchcode);
     ok(!lstrcmpA(targetprod, "banana"),
@@ -7464,18 +7546,19 @@ static void test_MsiEnumPatchesEx(void)
        "Expected targetsid to be unchanged, got %s\n", targetsid);
     ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
 
-    /* guid without brackets */
+    res = RegCreateKeyA(prodkey, "Patches", &patches);
+    ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
+    /* patches key exists */
     lstrcpyA(patchcode, "apple");
     lstrcpyA(targetprod, "banana");
     context = 0xdeadbeef;
     lstrcpyA(targetsid, "kiwi");
     size = MAX_PATH;
-    r = pMsiEnumPatchesExA("6700E8CF-95AB-4D9C-BC2C-15840DEA7A5D", usersid,
-                           MSIINSTALLCONTEXT_USERUNMANAGED, MSIPATCHSTATE_ALL,
-                           0, patchcode, targetprod, &context,
-                           targetsid, &size);
-    ok(r == ERROR_INVALID_PARAMETER,
-       "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
+    r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_USERMANAGED,
+                           MSIPATCHSTATE_APPLIED, 0, patchcode, targetprod,
+                           &context, targetsid, &size);
+    ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
     ok(!lstrcmpA(patchcode, "apple"),
        "Expected patchcode to be unchanged, got %s\n", patchcode);
     ok(!lstrcmpA(targetprod, "banana"),
@@ -7486,18 +7569,22 @@ static void test_MsiEnumPatchesEx(void)
        "Expected targetsid to be unchanged, got %s\n", targetsid);
     ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
 
-    /* guid with brackets */
+    res = RegSetValueExA(patches, "Patches", 0, REG_SZ,
+                         (const BYTE *)patch_squashed,
+                         lstrlenA(patch_squashed) + 1);
+    ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
+    /* Patches value exists, is not REG_MULTI_SZ */
     lstrcpyA(patchcode, "apple");
     lstrcpyA(targetprod, "banana");
     context = 0xdeadbeef;
     lstrcpyA(targetsid, "kiwi");
     size = MAX_PATH;
-    r = pMsiEnumPatchesExA("{6700E8CF-95AB-4D9C-BC2C-15840DDA7A5D}", usersid,
-                           MSIINSTALLCONTEXT_USERUNMANAGED, MSIPATCHSTATE_ALL,
-                           0, patchcode, targetprod, &context,
-                           targetsid, &size);
-    ok(r == ERROR_NO_MORE_ITEMS,
-       "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
+    r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_USERMANAGED,
+                           MSIPATCHSTATE_APPLIED, 0, patchcode, targetprod,
+                           &context, targetsid, &size);
+    ok(r == ERROR_BAD_CONFIGURATION,
+       "Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
     ok(!lstrcmpA(patchcode, "apple"),
        "Expected patchcode to be unchanged, got %s\n", patchcode);
     ok(!lstrcmpA(targetprod, "banana"),
@@ -7508,18 +7595,21 @@ static void test_MsiEnumPatchesEx(void)
        "Expected targetsid to be unchanged, got %s\n", targetsid);
     ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
 
-    /* szUserSid is S-1-5-18 */
+    res = RegSetValueExA(patches, "Patches", 0, REG_MULTI_SZ,
+                         (const BYTE *)"a\0b\0c\0\0", 7);
+    ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
+    /* Patches value exists, is not a squashed guid */
     lstrcpyA(patchcode, "apple");
     lstrcpyA(targetprod, "banana");
     context = 0xdeadbeef;
     lstrcpyA(targetsid, "kiwi");
     size = MAX_PATH;
-    r = pMsiEnumPatchesExA(prodcode, "S-1-5-18",
-                           MSIINSTALLCONTEXT_USERUNMANAGED, MSIPATCHSTATE_ALL,
-                           0, patchcode, targetprod, &context,
-                           targetsid, &size);
-    ok(r == ERROR_INVALID_PARAMETER,
-       "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
+    r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_USERMANAGED,
+                           MSIPATCHSTATE_APPLIED, 0, patchcode, targetprod,
+                           &context, targetsid, &size);
+    ok(r == ERROR_BAD_CONFIGURATION,
+       "Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
     ok(!lstrcmpA(patchcode, "apple"),
        "Expected patchcode to be unchanged, got %s\n", patchcode);
     ok(!lstrcmpA(targetprod, "banana"),
@@ -7530,17 +7620,22 @@ static void test_MsiEnumPatchesEx(void)
        "Expected targetsid to be unchanged, got %s\n", targetsid);
     ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
 
-    /* dwContext is MSIINSTALLCONTEXT_MACHINE, but szUserSid is non-NULL */
+    patch_squashed[lstrlenA(patch_squashed) + 1] = '\0';
+    res = RegSetValueExA(patches, "Patches", 0, REG_MULTI_SZ,
+                         (const BYTE *)patch_squashed,
+                         lstrlenA(patch_squashed) + 2);
+    ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
+    /* Patches value exists */
     lstrcpyA(patchcode, "apple");
     lstrcpyA(targetprod, "banana");
     context = 0xdeadbeef;
     lstrcpyA(targetsid, "kiwi");
     size = MAX_PATH;
-    r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_MACHINE,
-                           MSIPATCHSTATE_ALL, 0, patchcode, targetprod,
+    r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_USERMANAGED,
+                           MSIPATCHSTATE_APPLIED, 0, patchcode, targetprod,
                            &context, targetsid, &size);
-    ok(r == ERROR_INVALID_PARAMETER,
-       "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
+    ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
     ok(!lstrcmpA(patchcode, "apple"),
        "Expected patchcode to be unchanged, got %s\n", patchcode);
     ok(!lstrcmpA(targetprod, "banana"),
@@ -7551,38 +7646,41 @@ static void test_MsiEnumPatchesEx(void)
        "Expected targetsid to be unchanged, got %s\n", targetsid);
     ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
 
-    /* dwContext is out of bounds */
+    res = RegSetValueExA(patches, patch_squashed, 0, REG_SZ,
+                         (const BYTE *)"whatever", 9);
+    ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
+    /* patch squashed value exists */
     lstrcpyA(patchcode, "apple");
     lstrcpyA(targetprod, "banana");
     context = 0xdeadbeef;
     lstrcpyA(targetsid, "kiwi");
     size = MAX_PATH;
-    r = pMsiEnumPatchesExA(prodcode, usersid, 0,
-                           MSIPATCHSTATE_ALL, 0, patchcode, targetprod,
+    r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_USERMANAGED,
+                           MSIPATCHSTATE_APPLIED, 0, patchcode, targetprod,
                            &context, targetsid, &size);
-    ok(r == ERROR_INVALID_PARAMETER,
-       "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
-    ok(!lstrcmpA(patchcode, "apple"),
-       "Expected patchcode to be unchanged, got %s\n", patchcode);
-    ok(!lstrcmpA(targetprod, "banana"),
-       "Expected targetprod to be unchanged, got %s\n", targetprod);
-    ok(context == 0xdeadbeef,
-       "Expected context to be unchanged, got %d\n", context);
-    ok(!lstrcmpA(targetsid, "kiwi"),
-       "Expected targetsid to be unchanged, got %s\n", targetsid);
-    ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+    ok(!lstrcmpA(patchcode, patch),
+       "Expected \"%s\", got \"%s\"\n", patch, patchcode);
+    ok(!lstrcmpA(targetprod, prodcode),
+       "Expected \"%s\", got \"%s\"\n", prodcode, targetprod);
+    ok(context == MSIINSTALLCONTEXT_USERMANAGED,
+       "Expected MSIINSTALLCONTEXT_USERMANAGED, got %d\n", context);
+    ok(!lstrcmpA(targetsid, expectedsid),
+       "Expected \"%s\", got \"%s\"\n", expectedsid, targetsid);
+    ok(size == lstrlenA(expectedsid),
+       "Expected %d, got %d\n", lstrlenA(expectedsid), size);
 
-    /* dwContext is out of bounds */
+    /* increase the index */
     lstrcpyA(patchcode, "apple");
     lstrcpyA(targetprod, "banana");
     context = 0xdeadbeef;
     lstrcpyA(targetsid, "kiwi");
     size = MAX_PATH;
-    r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_ALL + 1,
-                           MSIPATCHSTATE_ALL, 0, patchcode, targetprod,
+    r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_USERMANAGED,
+                           MSIPATCHSTATE_APPLIED, 1, patchcode, targetprod,
                            &context, targetsid, &size);
-    ok(r == ERROR_INVALID_PARAMETER,
-       "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
+    ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
     ok(!lstrcmpA(patchcode, "apple"),
        "Expected patchcode to be unchanged, got %s\n", patchcode);
     ok(!lstrcmpA(targetprod, "banana"),
@@ -7593,14 +7691,14 @@ static void test_MsiEnumPatchesEx(void)
        "Expected targetsid to be unchanged, got %s\n", targetsid);
     ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
 
-    /* dwFilter is out of bounds */
+    /* increase again */
     lstrcpyA(patchcode, "apple");
     lstrcpyA(targetprod, "banana");
     context = 0xdeadbeef;
     lstrcpyA(targetsid, "kiwi");
     size = MAX_PATH;
-    r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED,
-                           MSIPATCHSTATE_INVALID, 0, patchcode, targetprod,
+    r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_USERMANAGED,
+                           MSIPATCHSTATE_APPLIED, 2, patchcode, targetprod,
                            &context, targetsid, &size);
     ok(r == ERROR_INVALID_PARAMETER,
        "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
@@ -7614,279 +7712,23 @@ static void test_MsiEnumPatchesEx(void)
        "Expected targetsid to be unchanged, got %s\n", targetsid);
     ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
 
-    /* dwFilter is out of bounds */
-    lstrcpyA(patchcode, "apple");
+    /* szPatchCode is NULL */
     lstrcpyA(targetprod, "banana");
     context = 0xdeadbeef;
     lstrcpyA(targetsid, "kiwi");
     size = MAX_PATH;
-    r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED,
-                           MSIPATCHSTATE_ALL + 1, 0, patchcode, targetprod,
+    r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_USERMANAGED,
+                           MSIPATCHSTATE_APPLIED, 0, NULL, targetprod,
                            &context, targetsid, &size);
-    ok(r == ERROR_INVALID_PARAMETER,
-       "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
-    ok(!lstrcmpA(patchcode, "apple"),
-       "Expected patchcode to be unchanged, got %s\n", patchcode);
-    ok(!lstrcmpA(targetprod, "banana"),
-       "Expected targetprod to be unchanged, got %s\n", targetprod);
-    ok(context == 0xdeadbeef,
-       "Expected context to be unchanged, got %d\n", context);
-    ok(!lstrcmpA(targetsid, "kiwi"),
-       "Expected targetsid to be unchanged, got %s\n", targetsid);
-    ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
-
-    /* pcchTargetUserSid is NULL while szTargetUserSid is non-NULL */
-    lstrcpyA(patchcode, "apple");
-    lstrcpyA(targetprod, "banana");
-    context = 0xdeadbeef;
-    lstrcpyA(targetsid, "kiwi");
-    r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED,
-                           MSIPATCHSTATE_ALL, 0, patchcode, targetprod,
-                           &context, targetsid, NULL);
-    ok(r == ERROR_INVALID_PARAMETER,
-       "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
-    ok(!lstrcmpA(patchcode, "apple"),
-       "Expected patchcode to be unchanged, got %s\n", patchcode);
-    ok(!lstrcmpA(targetprod, "banana"),
-       "Expected targetprod to be unchanged, got %s\n", targetprod);
-    ok(context == 0xdeadbeef,
-       "Expected context to be unchanged, got %d\n", context);
-    ok(!lstrcmpA(targetsid, "kiwi"),
-       "Expected targetsid to be unchanged, got %s\n", targetsid);
-
-    /* MSIINSTALLCONTEXT_USERMANAGED */
-
-    /* MSIPATCHSTATE_APPLIED */
-
-    lstrcpyA(patchcode, "apple");
-    lstrcpyA(targetprod, "banana");
-    context = 0xdeadbeef;
-    lstrcpyA(targetsid, "kiwi");
-    size = MAX_PATH;
-    r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_USERMANAGED,
-                           MSIPATCHSTATE_APPLIED, 0, patchcode, targetprod,
-                           &context, targetsid, &size);
-    ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
-    ok(!lstrcmpA(patchcode, "apple"),
-       "Expected patchcode to be unchanged, got %s\n", patchcode);
-    ok(!lstrcmpA(targetprod, "banana"),
-       "Expected targetprod to be unchanged, got %s\n", targetprod);
-    ok(context == 0xdeadbeef,
-       "Expected context to be unchanged, got %d\n", context);
-    ok(!lstrcmpA(targetsid, "kiwi"),
-       "Expected targetsid to be unchanged, got %s\n", targetsid);
-    ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
-
-    lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\Managed\\");
-    lstrcatA(keypath, usersid);
-    lstrcatA(keypath, "\\Installer\\Products\\");
-    lstrcatA(keypath, prod_squashed);
-
-    res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &prodkey);
-    ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
-
-    /* managed product key exists */
-    lstrcpyA(patchcode, "apple");
-    lstrcpyA(targetprod, "banana");
-    context = 0xdeadbeef;
-    lstrcpyA(targetsid, "kiwi");
-    size = MAX_PATH;
-    r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_USERMANAGED,
-                           MSIPATCHSTATE_APPLIED, 0, patchcode, targetprod,
-                           &context, targetsid, &size);
-    ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
-    ok(!lstrcmpA(patchcode, "apple"),
-       "Expected patchcode to be unchanged, got %s\n", patchcode);
-    ok(!lstrcmpA(targetprod, "banana"),
-       "Expected targetprod to be unchanged, got %s\n", targetprod);
-    ok(context == 0xdeadbeef,
-       "Expected context to be unchanged, got %d\n", context);
-    ok(!lstrcmpA(targetsid, "kiwi"),
-       "Expected targetsid to be unchanged, got %s\n", targetsid);
-    ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
-
-    res = RegCreateKeyA(prodkey, "Patches", &patches);
-    ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
-
-    /* patches key exists */
-    lstrcpyA(patchcode, "apple");
-    lstrcpyA(targetprod, "banana");
-    context = 0xdeadbeef;
-    lstrcpyA(targetsid, "kiwi");
-    size = MAX_PATH;
-    r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_USERMANAGED,
-                           MSIPATCHSTATE_APPLIED, 0, patchcode, targetprod,
-                           &context, targetsid, &size);
-    ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
-    ok(!lstrcmpA(patchcode, "apple"),
-       "Expected patchcode to be unchanged, got %s\n", patchcode);
-    ok(!lstrcmpA(targetprod, "banana"),
-       "Expected targetprod to be unchanged, got %s\n", targetprod);
-    ok(context == 0xdeadbeef,
-       "Expected context to be unchanged, got %d\n", context);
-    ok(!lstrcmpA(targetsid, "kiwi"),
-       "Expected targetsid to be unchanged, got %s\n", targetsid);
-    ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
-
-    res = RegSetValueExA(patches, "Patches", 0, REG_SZ,
-                         (const BYTE *)patch_squashed,
-                         lstrlenA(patch_squashed) + 1);
-    ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
-
-    /* Patches value exists, is not REG_MULTI_SZ */
-    lstrcpyA(patchcode, "apple");
-    lstrcpyA(targetprod, "banana");
-    context = 0xdeadbeef;
-    lstrcpyA(targetsid, "kiwi");
-    size = MAX_PATH;
-    r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_USERMANAGED,
-                           MSIPATCHSTATE_APPLIED, 0, patchcode, targetprod,
-                           &context, targetsid, &size);
-    ok(r == ERROR_BAD_CONFIGURATION,
-       "Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
-    ok(!lstrcmpA(patchcode, "apple"),
-       "Expected patchcode to be unchanged, got %s\n", patchcode);
-    ok(!lstrcmpA(targetprod, "banana"),
-       "Expected targetprod to be unchanged, got %s\n", targetprod);
-    ok(context == 0xdeadbeef,
-       "Expected context to be unchanged, got %d\n", context);
-    ok(!lstrcmpA(targetsid, "kiwi"),
-       "Expected targetsid to be unchanged, got %s\n", targetsid);
-    ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
-
-    res = RegSetValueExA(patches, "Patches", 0, REG_MULTI_SZ,
-                         (const BYTE *)"a\0b\0c\0\0", 7);
-    ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
-
-    /* Patches value exists, is not a squashed guid */
-    lstrcpyA(patchcode, "apple");
-    lstrcpyA(targetprod, "banana");
-    context = 0xdeadbeef;
-    lstrcpyA(targetsid, "kiwi");
-    size = MAX_PATH;
-    r = pMsiEnumPatchesExA(prodcode, NULL, MSIINSTALLCONTEXT_USERMANAGED,
-                           MSIPATCHSTATE_APPLIED, 0, patchcode, targetprod,
-                           &context, targetsid, &size);
-    ok(r == ERROR_BAD_CONFIGURATION,
-       "Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
-    ok(!lstrcmpA(patchcode, "apple"),
-       "Expected patchcode to be unchanged, got %s\n", patchcode);
-    ok(!lstrcmpA(targetprod, "banana"),
-       "Expected targetprod to be unchanged, got %s\n", targetprod);
-    ok(context == 0xdeadbeef,
-       "Expected context to be unchanged, got %d\n", context);
-    ok(!lstrcmpA(targetsid, "kiwi"),
-       "Expected targetsid to be unchanged, got %s\n", targetsid);
-    ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
-
-    res = RegSetValueExA(patches, "Patches", 0, REG_MULTI_SZ,
-                         (const BYTE *)patch_squashed,
-                         lstrlenA(patch_squashed) + 1);
-    ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
-
-    /* Patches value exists */
-    lstrcpyA(patchcode, "apple");
-    lstrcpyA(targetprod, "banana");
-    context = 0xdeadbeef;
-    lstrcpyA(targetsid, "kiwi");
-    size = MAX_PATH;
-    r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_USERMANAGED,
-                           MSIPATCHSTATE_APPLIED, 0, patchcode, targetprod,
-                           &context, targetsid, &size);
-    ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
-    ok(!lstrcmpA(patchcode, "apple"),
-       "Expected patchcode to be unchanged, got %s\n", patchcode);
-    ok(!lstrcmpA(targetprod, "banana"),
-       "Expected targetprod to be unchanged, got %s\n", targetprod);
-    ok(context == 0xdeadbeef,
-       "Expected context to be unchanged, got %d\n", context);
-    ok(!lstrcmpA(targetsid, "kiwi"),
-       "Expected targetsid to be unchanged, got %s\n", targetsid);
-    ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
-
-    res = RegSetValueExA(patches, patch_squashed, 0, REG_SZ,
-                         (const BYTE *)"whatever", 9);
-    ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
-
-    /* patch squashed value exists */
-    lstrcpyA(patchcode, "apple");
-    lstrcpyA(targetprod, "banana");
-    context = 0xdeadbeef;
-    lstrcpyA(targetsid, "kiwi");
-    size = MAX_PATH;
-    r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_USERMANAGED,
-                           MSIPATCHSTATE_APPLIED, 0, patchcode, targetprod,
-                           &context, targetsid, &size);
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
-    ok(!lstrcmpA(patchcode, patch),
-       "Expected \"%s\", got \"%s\"\n", patch, patchcode);
-    ok(!lstrcmpA(targetprod, prodcode),
-       "Expected \"%s\", got \"%s\"\n", prodcode, targetprod);
-    ok(context == MSIINSTALLCONTEXT_USERMANAGED,
-       "Expected MSIINSTALLCONTEXT_USERMANAGED, got %d\n", context);
-    ok(!lstrcmpA(targetsid, usersid),
-       "Expected \"%s\", got \"%s\"\n", usersid, targetsid);
-    ok(size == lstrlenA(usersid),
-       "Expected %d, got %d\n", lstrlenA(usersid), size);
-
-    /* increase the index */
-    lstrcpyA(patchcode, "apple");
-    lstrcpyA(targetprod, "banana");
-    context = 0xdeadbeef;
-    lstrcpyA(targetsid, "kiwi");
-    size = MAX_PATH;
-    r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_USERMANAGED,
-                           MSIPATCHSTATE_APPLIED, 1, patchcode, targetprod,
-                           &context, targetsid, &size);
-    ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
-    ok(!lstrcmpA(patchcode, "apple"),
-       "Expected patchcode to be unchanged, got %s\n", patchcode);
-    ok(!lstrcmpA(targetprod, "banana"),
-       "Expected targetprod to be unchanged, got %s\n", targetprod);
-    ok(context == 0xdeadbeef,
-       "Expected context to be unchanged, got %d\n", context);
-    ok(!lstrcmpA(targetsid, "kiwi"),
-       "Expected targetsid to be unchanged, got %s\n", targetsid);
-    ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
-
-    /* increase again */
-    lstrcpyA(patchcode, "apple");
-    lstrcpyA(targetprod, "banana");
-    context = 0xdeadbeef;
-    lstrcpyA(targetsid, "kiwi");
-    size = MAX_PATH;
-    r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_USERMANAGED,
-                           MSIPATCHSTATE_APPLIED, 2, patchcode, targetprod,
-                           &context, targetsid, &size);
-    ok(r == ERROR_INVALID_PARAMETER,
-       "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
-    ok(!lstrcmpA(patchcode, "apple"),
-       "Expected patchcode to be unchanged, got %s\n", patchcode);
-    ok(!lstrcmpA(targetprod, "banana"),
-       "Expected targetprod to be unchanged, got %s\n", targetprod);
-    ok(context == 0xdeadbeef,
-       "Expected context to be unchanged, got %d\n", context);
-    ok(!lstrcmpA(targetsid, "kiwi"),
-       "Expected targetsid to be unchanged, got %s\n", targetsid);
-    ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
-
-    /* szPatchCode is NULL */
-    lstrcpyA(targetprod, "banana");
-    context = 0xdeadbeef;
-    lstrcpyA(targetsid, "kiwi");
-    size = MAX_PATH;
-    r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_USERMANAGED,
-                           MSIPATCHSTATE_APPLIED, 0, NULL, targetprod,
-                           &context, targetsid, &size);
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
-    ok(!lstrcmpA(targetprod, prodcode),
-       "Expected \"%s\", got \"%s\"\n", prodcode, targetprod);
-    ok(context == MSIINSTALLCONTEXT_USERMANAGED,
-       "Expected MSIINSTALLCONTEXT_USERMANAGED, got %d\n", context);
-    ok(!lstrcmpA(targetsid, usersid),
-       "Expected \"%s\", got \"%s\"\n", usersid, targetsid);
-    ok(size == lstrlenA(usersid),
-       "Expected %d, got %d\n", lstrlenA(usersid), size);
+    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+    ok(!lstrcmpA(targetprod, prodcode),
+       "Expected \"%s\", got \"%s\"\n", prodcode, targetprod);
+    ok(context == MSIINSTALLCONTEXT_USERMANAGED,
+       "Expected MSIINSTALLCONTEXT_USERMANAGED, got %d\n", context);
+    ok(!lstrcmpA(targetsid, expectedsid),
+       "Expected \"%s\", got \"%s\"\n", expectedsid, targetsid);
+    ok(size == lstrlenA(expectedsid),
+       "Expected %d, got %d\n", lstrlenA(expectedsid), size);
 
     /* szTargetProductCode is NULL */
     lstrcpyA(patchcode, "apple");
@@ -7901,10 +7743,10 @@ static void test_MsiEnumPatchesEx(void)
        "Expected \"%s\", got \"%s\"\n", patch, patchcode);
     ok(context == MSIINSTALLCONTEXT_USERMANAGED,
        "Expected MSIINSTALLCONTEXT_USERMANAGED, got %d\n", context);
-    ok(!lstrcmpA(targetsid, usersid),
-       "Expected \"%s\", got \"%s\"\n", usersid, targetsid);
-    ok(size == lstrlenA(usersid),
-       "Expected %d, got %d\n", lstrlenA(usersid), size);
+    ok(!lstrcmpA(targetsid, expectedsid),
+       "Expected \"%s\", got \"%s\"\n", expectedsid, targetsid);
+    ok(size == lstrlenA(expectedsid),
+       "Expected %d, got %d\n", lstrlenA(expectedsid), size);
 
     /* pdwTargetProductContext is NULL */
     lstrcpyA(patchcode, "apple");
@@ -7919,10 +7761,10 @@ static void test_MsiEnumPatchesEx(void)
        "Expected \"%s\", got \"%s\"\n", patch, patchcode);
     ok(!lstrcmpA(targetprod, prodcode),
        "Expected \"%s\", got \"%s\"\n", prodcode, targetprod);
-    ok(!lstrcmpA(targetsid, usersid),
-       "Expected \"%s\", got \"%s\"\n", usersid, targetsid);
-    ok(size == lstrlenA(usersid),
-       "Expected %d, got %d\n", lstrlenA(usersid), size);
+    ok(!lstrcmpA(targetsid, expectedsid),
+       "Expected \"%s\", got \"%s\"\n", expectedsid, targetsid);
+    ok(size == lstrlenA(expectedsid),
+       "Expected %d, got %d\n", lstrlenA(expectedsid), size);
 
     /* szTargetUserSid is NULL */
     lstrcpyA(patchcode, "apple");
@@ -7939,15 +7781,15 @@ static void test_MsiEnumPatchesEx(void)
        "Expected \"%s\", got \"%s\"\n", prodcode, targetprod);
     ok(context == MSIINSTALLCONTEXT_USERMANAGED,
        "Expected MSIINSTALLCONTEXT_USERMANAGED, got %d\n", context);
-    ok(size == lstrlenA(usersid) * sizeof(WCHAR),
-       "Got %d\n", size);
+    ok(size == lstrlenA(expectedsid) * sizeof(WCHAR),
+       "Expected %d*sizeof(WCHAR), got %d\n", lstrlenA(expectedsid), size);
 
     /* pcchTargetUserSid is exactly the length of szTargetUserSid */
     lstrcpyA(patchcode, "apple");
     lstrcpyA(targetprod, "banana");
     context = 0xdeadbeef;
     lstrcpyA(targetsid, "kiwi");
-    size = lstrlenA(usersid);
+    size = lstrlenA(expectedsid);
     r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_USERMANAGED,
                            MSIPATCHSTATE_APPLIED, 0, patchcode, targetprod,
                            &context, targetsid, &size);
@@ -7958,17 +7800,17 @@ static void test_MsiEnumPatchesEx(void)
        "Expected \"%s\", got \"%s\"\n", prodcode, targetprod);
     ok(context == MSIINSTALLCONTEXT_USERMANAGED,
        "Expected MSIINSTALLCONTEXT_USERMANAGED, got %d\n", context);
-    ok(!strncmp(targetsid, usersid, lstrlenA(usersid) - 1),
-       "Expected \"%s\", got \"%s\"\n", usersid, targetsid);
-    ok(size == lstrlenA(usersid) * sizeof(WCHAR),
-       "Got %d\n", size);
+    ok(!strncmp(targetsid, expectedsid, lstrlenA(expectedsid) - 1),
+       "Expected \"%s\", got \"%s\"\n", expectedsid, targetsid);
+    ok(size == lstrlenA(expectedsid) * sizeof(WCHAR),
+       "Expected %d*sizeof(WCHAR), got %d\n", lstrlenA(expectedsid), size);
 
     /* pcchTargetUserSid has enough room for NULL terminator */
     lstrcpyA(patchcode, "apple");
     lstrcpyA(targetprod, "banana");
     context = 0xdeadbeef;
     lstrcpyA(targetsid, "kiwi");
-    size = lstrlenA(usersid) + 1;
+    size = lstrlenA(expectedsid) + 1;
     r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_USERMANAGED,
                            MSIPATCHSTATE_APPLIED, 0, patchcode, targetprod,
                            &context, targetsid, &size);
@@ -7979,10 +7821,10 @@ static void test_MsiEnumPatchesEx(void)
        "Expected \"%s\", got \"%s\"\n", prodcode, targetprod);
     ok(context == MSIINSTALLCONTEXT_USERMANAGED,
        "Expected MSIINSTALLCONTEXT_USERMANAGED, got %d\n", context);
-    ok(!lstrcmpA(targetsid, usersid),
-       "Expected \"%s\", got \"%s\"\n", usersid, targetsid);
-    ok(size == lstrlenA(usersid),
-       "Expected %d, got %d\n", lstrlenA(usersid), size);
+    ok(!lstrcmpA(targetsid, expectedsid),
+       "Expected \"%s\", got \"%s\"\n", expectedsid, targetsid);
+    ok(size == lstrlenA(expectedsid),
+       "Expected %d, got %d\n", lstrlenA(expectedsid), size);
 
     /* both szTargetuserSid and pcchTargetUserSid are NULL */
     lstrcpyA(patchcode, "apple");
@@ -8021,7 +7863,7 @@ static void test_MsiEnumPatchesEx(void)
     ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
 
     lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\");
-    lstrcatA(keypath, usersid);
+    lstrcatA(keypath, expectedsid);
     lstrcatA(keypath, "\\Products\\");
     lstrcatA(keypath, prod_squashed);
 
@@ -8116,10 +7958,10 @@ static void test_MsiEnumPatchesEx(void)
        "Expected \"%s\", got \"%s\"\n", prodcode, targetprod);
     ok(context == MSIINSTALLCONTEXT_USERMANAGED,
        "Expected MSIINSTALLCONTEXT_USERMANAGED, got %d\n", context);
-    ok(!lstrcmpA(targetsid, usersid),
-       "Expected \"%s\", got \"%s\"\n", usersid, targetsid);
-    ok(size == lstrlenA(usersid),
-       "Expected %d, got %d\n", lstrlenA(usersid), size);
+    ok(!lstrcmpA(targetsid, expectedsid),
+       "Expected \"%s\", got \"%s\"\n", expectedsid, targetsid);
+    ok(size == lstrlenA(expectedsid),
+       "Expected %d, got %d\n", lstrlenA(expectedsid), size);
 
     /* MSIPATCHSTATE_OBSOLETED */
 
@@ -8163,10 +8005,10 @@ static void test_MsiEnumPatchesEx(void)
        "Expected \"%s\", got \"%s\"\n", prodcode, targetprod);
     ok(context == MSIINSTALLCONTEXT_USERMANAGED,
        "Expected MSIINSTALLCONTEXT_USERMANAGED, got %d\n", context);
-    ok(!lstrcmpA(targetsid, usersid),
-       "Expected \"%s\", got \"%s\"\n", usersid, targetsid);
-    ok(size == lstrlenA(usersid),
-       "Expected %d, got %d\n", lstrlenA(usersid), size);
+    ok(!lstrcmpA(targetsid, expectedsid),
+       "Expected \"%s\", got \"%s\"\n", expectedsid, targetsid);
+    ok(size == lstrlenA(expectedsid),
+       "Expected %d, got %d\n", lstrlenA(expectedsid), size);
 
     /* MSIPATCHSTATE_REGISTERED */
     /* FIXME */
@@ -8189,10 +8031,10 @@ static void test_MsiEnumPatchesEx(void)
        "Expected \"%s\", got \"%s\"\n", prodcode, targetprod);
     ok(context == MSIINSTALLCONTEXT_USERMANAGED,
        "Expected MSIINSTALLCONTEXT_USERMANAGED, got %d\n", context);
-    ok(!lstrcmpA(targetsid, usersid),
-       "Expected \"%s\", got \"%s\"\n", usersid, targetsid);
-    ok(size == lstrlenA(usersid),
-       "Expected %d, got %d\n", lstrlenA(usersid), size);
+    ok(!lstrcmpA(targetsid, expectedsid),
+       "Expected \"%s\", got \"%s\"\n", expectedsid, targetsid);
+    ok(size == lstrlenA(expectedsid),
+       "Expected %d, got %d\n", lstrlenA(expectedsid), size);
 
     /* same patch in multiple places, only one is enumerated */
     lstrcpyA(patchcode, "apple");
@@ -8226,18 +8068,33 @@ static void test_MsiEnumPatchesEx(void)
     RegCloseKey(patches);
     RegDeleteKeyA(prodkey, "");
     RegCloseKey(prodkey);
+}
 
-    /* MSIINSTALLCONTEXT_USERUNMANAGED */
-
-    /* MSIPATCHSTATE_APPLIED */
-
-    lstrcpyA(patchcode, "apple");
-    lstrcpyA(targetprod, "banana");
-    context = 0xdeadbeef;
-    lstrcpyA(targetsid, "kiwi");
-    size = MAX_PATH;
-    r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED,
-                           MSIPATCHSTATE_APPLIED, 0, patchcode, targetprod,
+static void test_MsiEnumPatchesEx_userunmanaged(LPCSTR usersid, LPCSTR expectedsid)
+{
+    MSIINSTALLCONTEXT context;
+    CHAR keypath[MAX_PATH], patch[MAX_PATH];
+    CHAR patch_squashed[MAX_PATH], patchcode[MAX_PATH];
+    CHAR targetsid[MAX_PATH], targetprod[MAX_PATH];
+    CHAR prodcode[MAX_PATH], prod_squashed[MAX_PATH];
+    HKEY prodkey, patches, udprod, udpatch;
+    HKEY userkey, hpatch;
+    DWORD size, data;
+    LONG res;
+    UINT r;
+
+    create_test_guid(prodcode, prod_squashed);
+    create_test_guid(patch, patch_squashed);
+
+    /* MSIPATCHSTATE_APPLIED */
+
+    lstrcpyA(patchcode, "apple");
+    lstrcpyA(targetprod, "banana");
+    context = 0xdeadbeef;
+    lstrcpyA(targetsid, "kiwi");
+    size = MAX_PATH;
+    r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED,
+                           MSIPATCHSTATE_APPLIED, 0, patchcode, targetprod,
                            &context, targetsid, &size);
     ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
     ok(!lstrcmpA(patchcode, "apple"),
@@ -8400,7 +8257,7 @@ static void test_MsiEnumPatchesEx(void)
     ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
 
     lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\");
-    lstrcatA(keypath, usersid);
+    lstrcatA(keypath, expectedsid);
     lstrcatA(keypath, "\\Patches\\");
     lstrcatA(keypath, patch_squashed);
 
@@ -8423,10 +8280,10 @@ static void test_MsiEnumPatchesEx(void)
        "Expected \"%s\", got \"%s\"\n", prodcode, targetprod);
     ok(context == MSIINSTALLCONTEXT_USERUNMANAGED,
        "Expected MSIINSTALLCONTEXT_USERUNMANAGED, got %d\n", context);
-    ok(!lstrcmpA(targetsid, usersid),
-       "Expected \"%s\", got \"%s\"\n", usersid, targetsid);
-    ok(size == lstrlenA(usersid),
-       "Expected %d, got %d\n", lstrlenA(usersid), size);
+    ok(!lstrcmpA(targetsid, expectedsid),
+       "Expected \"%s\", got \"%s\"\n", expectedsid, targetsid);
+    ok(size == lstrlenA(expectedsid),
+       "Expected %d, got %d\n", lstrlenA(expectedsid), size);
 
     /* MSIPATCHSTATE_SUPERSEDED */
 
@@ -8450,7 +8307,7 @@ static void test_MsiEnumPatchesEx(void)
     ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
 
     lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\");
-    lstrcatA(keypath, usersid);
+    lstrcatA(keypath, expectedsid);
     lstrcatA(keypath, "\\Products\\");
     lstrcatA(keypath, prod_squashed);
 
@@ -8545,10 +8402,10 @@ static void test_MsiEnumPatchesEx(void)
        "Expected \"%s\", got \"%s\"\n", prodcode, targetprod);
     ok(context == MSIINSTALLCONTEXT_USERUNMANAGED,
        "Expected MSIINSTALLCONTEXT_USERUNMANAGED, got %d\n", context);
-    ok(!lstrcmpA(targetsid, usersid),
-       "Expected \"%s\", got \"%s\"\n", usersid, targetsid);
-    ok(size == lstrlenA(usersid),
-       "Expected %d, got %d\n", lstrlenA(usersid), size);
+    ok(!lstrcmpA(targetsid, expectedsid),
+       "Expected \"%s\", got \"%s\"\n", expectedsid, targetsid);
+    ok(size == lstrlenA(expectedsid),
+       "Expected %d, got %d\n", lstrlenA(expectedsid), size);
 
     /* MSIPATCHSTATE_OBSOLETED */
 
@@ -8592,10 +8449,10 @@ static void test_MsiEnumPatchesEx(void)
        "Expected \"%s\", got \"%s\"\n", prodcode, targetprod);
     ok(context == MSIINSTALLCONTEXT_USERUNMANAGED,
        "Expected MSIINSTALLCONTEXT_USERUNMANAGED, got %d\n", context);
-    ok(!lstrcmpA(targetsid, usersid),
-       "Expected \"%s\", got \"%s\"\n", usersid, targetsid);
-    ok(size == lstrlenA(usersid),
-       "Expected %d, got %d\n", lstrlenA(usersid), size);
+    ok(!lstrcmpA(targetsid, expectedsid),
+       "Expected \"%s\", got \"%s\"\n", expectedsid, targetsid);
+    ok(size == lstrlenA(expectedsid),
+       "Expected %d, got %d\n", lstrlenA(expectedsid), size);
 
     /* MSIPATCHSTATE_REGISTERED */
     /* FIXME */
@@ -8618,10 +8475,10 @@ static void test_MsiEnumPatchesEx(void)
        "Expected \"%s\", got \"%s\"\n", prodcode, targetprod);
     ok(context == MSIINSTALLCONTEXT_USERUNMANAGED,
        "Expected MSIINSTALLCONTEXT_USERUNMANAGED, got %d\n", context);
-    ok(!lstrcmpA(targetsid, usersid),
-       "Expected \"%s\", got \"%s\"\n", usersid, targetsid);
-    ok(size == lstrlenA(usersid),
-       "Expected %d, got %d\n", lstrlenA(usersid), size);
+    ok(!lstrcmpA(targetsid, expectedsid),
+       "Expected \"%s\", got \"%s\"\n", expectedsid, targetsid);
+    ok(size == lstrlenA(expectedsid),
+       "Expected %d, got %d\n", lstrlenA(expectedsid), size);
 
     /* same patch in multiple places, only one is enumerated */
     lstrcpyA(patchcode, "apple");
@@ -8648,6 +8505,8 @@ static void test_MsiEnumPatchesEx(void)
     RegCloseKey(hpatch);
     RegDeleteKeyA(udpatch, "");
     RegCloseKey(udpatch);
+    RegDeleteKeyA(udprod, "");
+    RegCloseKey(udprod);
     RegDeleteKeyA(userkey, "");
     RegCloseKey(userkey);
     RegDeleteValueA(patches, patch_squashed);
@@ -8656,8 +8515,23 @@ static void test_MsiEnumPatchesEx(void)
     RegCloseKey(patches);
     RegDeleteKeyA(prodkey, "");
     RegCloseKey(prodkey);
+}
 
-    /* MSIINSTALLCONTEXT_MACHINE */
+static void test_MsiEnumPatchesEx_machine(void)
+{
+    CHAR keypath[MAX_PATH], patch[MAX_PATH];
+    CHAR patch_squashed[MAX_PATH], patchcode[MAX_PATH];
+    CHAR targetsid[MAX_PATH], targetprod[MAX_PATH];
+    CHAR prodcode[MAX_PATH], prod_squashed[MAX_PATH];
+    HKEY prodkey, patches, udprod, udpatch;
+    HKEY hpatch;
+    MSIINSTALLCONTEXT context;
+    DWORD size, data;
+    LONG res;
+    UINT r;
+
+    create_test_guid(prodcode, prod_squashed);
+    create_test_guid(patch, patch_squashed);
 
     /* MSIPATCHSTATE_APPLIED */
 
@@ -8780,9 +8654,10 @@ static void test_MsiEnumPatchesEx(void)
        "Expected targetsid to be unchanged, got %s\n", targetsid);
     ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
 
+    patch_squashed[lstrlenA(patch_squashed) + 1] = '\0';
     res = RegSetValueExA(patches, "Patches", 0, REG_MULTI_SZ,
                          (const BYTE *)patch_squashed,
-                         lstrlenA(patch_squashed) + 1);
+                         lstrlenA(patch_squashed) + 2);
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
 
     /* Patches value exists */
@@ -8933,10 +8808,286 @@ static void test_MsiEnumPatchesEx(void)
     context = 0xdeadbeef;
     lstrcpyA(targetsid, "kiwi");
     size = MAX_PATH;
-    r = pMsiEnumPatchesExA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE,
-                           MSIPATCHSTATE_SUPERSEDED, 0, patchcode, targetprod,
+    r = pMsiEnumPatchesExA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE,
+                           MSIPATCHSTATE_SUPERSEDED, 0, patchcode, targetprod,
+                           &context, targetsid, &size);
+    ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
+    ok(!lstrcmpA(patchcode, "apple"),
+       "Expected patchcode to be unchanged, got %s\n", patchcode);
+    ok(!lstrcmpA(targetprod, "banana"),
+       "Expected targetprod to be unchanged, got %s\n", targetprod);
+    ok(context == 0xdeadbeef,
+       "Expected context to be unchanged, got %d\n", context);
+    ok(!lstrcmpA(targetsid, "kiwi"),
+       "Expected targetsid to be unchanged, got %s\n", targetsid);
+    ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+
+    data = MSIPATCHSTATE_SUPERSEDED;
+    res = RegSetValueExA(hpatch, "State", 0, REG_DWORD,
+                         (const BYTE *)&data, sizeof(DWORD));
+    ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
+    /* State value is MSIPATCHSTATE_SUPERSEDED */
+    lstrcpyA(patchcode, "apple");
+    lstrcpyA(targetprod, "banana");
+    context = 0xdeadbeef;
+    lstrcpyA(targetsid, "kiwi");
+    size = MAX_PATH;
+    r = pMsiEnumPatchesExA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE,
+                           MSIPATCHSTATE_SUPERSEDED, 0, patchcode, targetprod,
+                           &context, targetsid, &size);
+    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+    ok(!lstrcmpA(patchcode, patch),
+       "Expected \"%s\", got \"%s\"\n", patch, patchcode);
+    ok(!lstrcmpA(targetprod, prodcode),
+       "Expected \"%s\", got \"%s\"\n", prodcode, targetprod);
+    ok(context == MSIINSTALLCONTEXT_MACHINE,
+       "Expected MSIINSTALLCONTEXT_MACHINE, got %d\n", context);
+    ok(!lstrcmpA(targetsid, ""), "Expected \"\", got \"%s\"\n", targetsid);
+    ok(size == 0, "Expected 0, got %d\n", size);
+
+    /* MSIPATCHSTATE_OBSOLETED */
+
+    lstrcpyA(patchcode, "apple");
+    lstrcpyA(targetprod, "banana");
+    context = 0xdeadbeef;
+    lstrcpyA(targetsid, "kiwi");
+    size = MAX_PATH;
+    r = pMsiEnumPatchesExA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE,
+                           MSIPATCHSTATE_OBSOLETED, 0, patchcode, targetprod,
+                           &context, targetsid, &size);
+    ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
+    ok(!lstrcmpA(patchcode, "apple"),
+       "Expected patchcode to be unchanged, got %s\n", patchcode);
+    ok(!lstrcmpA(targetprod, "banana"),
+       "Expected targetprod to be unchanged, got %s\n", targetprod);
+    ok(context == 0xdeadbeef,
+       "Expected context to be unchanged, got %d\n", context);
+    ok(!lstrcmpA(targetsid, "kiwi"),
+       "Expected targetsid to be unchanged, got %s\n", targetsid);
+    ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+
+    data = MSIPATCHSTATE_OBSOLETED;
+    res = RegSetValueExA(hpatch, "State", 0, REG_DWORD,
+                         (const BYTE *)&data, sizeof(DWORD));
+    ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
+    /* State value is obsoleted */
+    lstrcpyA(patchcode, "apple");
+    lstrcpyA(targetprod, "banana");
+    context = 0xdeadbeef;
+    lstrcpyA(targetsid, "kiwi");
+    size = MAX_PATH;
+    r = pMsiEnumPatchesExA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE,
+                           MSIPATCHSTATE_OBSOLETED, 0, patchcode, targetprod,
+                           &context, targetsid, &size);
+    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+    ok(!lstrcmpA(patchcode, patch),
+       "Expected \"%s\", got \"%s\"\n", patch, patchcode);
+    ok(!lstrcmpA(targetprod, prodcode),
+       "Expected \"%s\", got \"%s\"\n", prodcode, targetprod);
+    ok(context == MSIINSTALLCONTEXT_MACHINE,
+       "Expected MSIINSTALLCONTEXT_MACHINE, got %d\n", context);
+    ok(!lstrcmpA(targetsid, ""), "Expected \"\", got \"%s\"\n", targetsid);
+    ok(size == 0, "Expected 0, got %d\n", size);
+
+    /* MSIPATCHSTATE_REGISTERED */
+    /* FIXME */
+
+    /* MSIPATCHSTATE_ALL */
+
+    /* 1st */
+    lstrcpyA(patchcode, "apple");
+    lstrcpyA(targetprod, "banana");
+    context = 0xdeadbeef;
+    lstrcpyA(targetsid, "kiwi");
+    size = MAX_PATH;
+    r = pMsiEnumPatchesExA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE,
+                           MSIPATCHSTATE_ALL, 0, patchcode, targetprod,
+                           &context, targetsid, &size);
+    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+    ok(!lstrcmpA(patchcode, patch),
+       "Expected \"%s\", got \"%s\"\n", patch, patchcode);
+    ok(!lstrcmpA(targetprod, prodcode),
+       "Expected \"%s\", got \"%s\"\n", prodcode, targetprod);
+    ok(context == MSIINSTALLCONTEXT_MACHINE,
+       "Expected MSIINSTALLCONTEXT_MACHINE, got %d\n", context);
+    ok(!lstrcmpA(targetsid, ""), "Expected \"\", got \"%s\"\n", targetsid);
+    ok(size == 0, "Expected 0, got %d\n", size);
+
+    /* same patch in multiple places, only one is enumerated */
+    lstrcpyA(patchcode, "apple");
+    lstrcpyA(targetprod, "banana");
+    context = 0xdeadbeef;
+    lstrcpyA(targetsid, "kiwi");
+    size = MAX_PATH;
+    r = pMsiEnumPatchesExA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE,
+                           MSIPATCHSTATE_ALL, 1, patchcode, targetprod,
+                           &context, targetsid, &size);
+    ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
+    ok(!lstrcmpA(patchcode, "apple"),
+       "Expected patchcode to be unchanged, got %s\n", patchcode);
+    ok(!lstrcmpA(targetprod, "banana"),
+       "Expected targetprod to be unchanged, got %s\n", targetprod);
+    ok(context == 0xdeadbeef,
+       "Expected context to be unchanged, got %d\n", context);
+    ok(!lstrcmpA(targetsid, "kiwi"),
+       "Expected targetsid to be unchanged, got %s\n", targetsid);
+    ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+
+    RegDeleteValueA(patches, patch_squashed);
+    RegDeleteValueA(patches, "Patches");
+    RegDeleteKeyA(patches, "");
+    RegCloseKey(patches);
+    RegDeleteValueA(hpatch, "State");
+    RegDeleteKeyA(hpatch, "");
+    RegCloseKey(hpatch);
+    RegDeleteKeyA(udpatch, "");
+    RegCloseKey(udpatch);
+    RegDeleteKeyA(udprod, "");
+    RegCloseKey(udprod);
+    RegDeleteKeyA(prodkey, "");
+    RegCloseKey(prodkey);
+}
+
+static void test_MsiEnumPatchesEx(void)
+{
+    CHAR targetsid[MAX_PATH], targetprod[MAX_PATH];
+    CHAR prodcode[MAX_PATH], prod_squashed[MAX_PATH];
+    CHAR patchcode[MAX_PATH];
+    MSIINSTALLCONTEXT context;
+    LPSTR usersid;
+    DWORD size;
+    UINT r;
+
+    if (!pMsiEnumPatchesExA)
+    {
+        win_skip("MsiEnumPatchesExA not implemented\n");
+        return;
+    }
+
+    create_test_guid(prodcode, prod_squashed);
+    get_user_sid(&usersid);
+
+    /* empty szProductCode */
+    lstrcpyA(patchcode, "apple");
+    lstrcpyA(targetprod, "banana");
+    context = 0xdeadbeef;
+    lstrcpyA(targetsid, "kiwi");
+    size = MAX_PATH;
+    r = pMsiEnumPatchesExA("", usersid, MSIINSTALLCONTEXT_USERUNMANAGED,
+                           MSIPATCHSTATE_ALL, 0, patchcode, targetprod, &context,
+                           targetsid, &size);
+    ok(r == ERROR_INVALID_PARAMETER,
+       "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
+    ok(!lstrcmpA(patchcode, "apple"),
+       "Expected patchcode to be unchanged, got %s\n", patchcode);
+    ok(!lstrcmpA(targetprod, "banana"),
+       "Expected targetprod to be unchanged, got %s\n", targetprod);
+    ok(context == 0xdeadbeef,
+       "Expected context to be unchanged, got %d\n", context);
+    ok(!lstrcmpA(targetsid, "kiwi"),
+       "Expected targetsid to be unchanged, got %s\n", targetsid);
+    ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+
+    /* garbage szProductCode */
+    lstrcpyA(patchcode, "apple");
+    lstrcpyA(targetprod, "banana");
+    context = 0xdeadbeef;
+    lstrcpyA(targetsid, "kiwi");
+    size = MAX_PATH;
+    r = pMsiEnumPatchesExA("garbage", usersid, MSIINSTALLCONTEXT_USERUNMANAGED,
+                           MSIPATCHSTATE_ALL, 0, patchcode, targetprod, &context,
+                           targetsid, &size);
+    ok(r == ERROR_INVALID_PARAMETER,
+       "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
+    ok(!lstrcmpA(patchcode, "apple"),
+       "Expected patchcode to be unchanged, got %s\n", patchcode);
+    ok(!lstrcmpA(targetprod, "banana"),
+       "Expected targetprod to be unchanged, got %s\n", targetprod);
+    ok(context == 0xdeadbeef,
+       "Expected context to be unchanged, got %d\n", context);
+    ok(!lstrcmpA(targetsid, "kiwi"),
+       "Expected targetsid to be unchanged, got %s\n", targetsid);
+    ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+
+    /* guid without brackets */
+    lstrcpyA(patchcode, "apple");
+    lstrcpyA(targetprod, "banana");
+    context = 0xdeadbeef;
+    lstrcpyA(targetsid, "kiwi");
+    size = MAX_PATH;
+    r = pMsiEnumPatchesExA("6700E8CF-95AB-4D9C-BC2C-15840DEA7A5D", usersid,
+                           MSIINSTALLCONTEXT_USERUNMANAGED, MSIPATCHSTATE_ALL,
+                           0, patchcode, targetprod, &context,
+                           targetsid, &size);
+    ok(r == ERROR_INVALID_PARAMETER,
+       "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
+    ok(!lstrcmpA(patchcode, "apple"),
+       "Expected patchcode to be unchanged, got %s\n", patchcode);
+    ok(!lstrcmpA(targetprod, "banana"),
+       "Expected targetprod to be unchanged, got %s\n", targetprod);
+    ok(context == 0xdeadbeef,
+       "Expected context to be unchanged, got %d\n", context);
+    ok(!lstrcmpA(targetsid, "kiwi"),
+       "Expected targetsid to be unchanged, got %s\n", targetsid);
+    ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+
+    /* guid with brackets */
+    lstrcpyA(patchcode, "apple");
+    lstrcpyA(targetprod, "banana");
+    context = 0xdeadbeef;
+    lstrcpyA(targetsid, "kiwi");
+    size = MAX_PATH;
+    r = pMsiEnumPatchesExA("{6700E8CF-95AB-4D9C-BC2C-15840DDA7A5D}", usersid,
+                           MSIINSTALLCONTEXT_USERUNMANAGED, MSIPATCHSTATE_ALL,
+                           0, patchcode, targetprod, &context,
+                           targetsid, &size);
+    ok(r == ERROR_NO_MORE_ITEMS,
+       "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
+    ok(!lstrcmpA(patchcode, "apple"),
+       "Expected patchcode to be unchanged, got %s\n", patchcode);
+    ok(!lstrcmpA(targetprod, "banana"),
+       "Expected targetprod to be unchanged, got %s\n", targetprod);
+    ok(context == 0xdeadbeef,
+       "Expected context to be unchanged, got %d\n", context);
+    ok(!lstrcmpA(targetsid, "kiwi"),
+       "Expected targetsid to be unchanged, got %s\n", targetsid);
+    ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+
+    /* szUserSid is S-1-5-18 */
+    lstrcpyA(patchcode, "apple");
+    lstrcpyA(targetprod, "banana");
+    context = 0xdeadbeef;
+    lstrcpyA(targetsid, "kiwi");
+    size = MAX_PATH;
+    r = pMsiEnumPatchesExA(prodcode, "S-1-5-18",
+                           MSIINSTALLCONTEXT_USERUNMANAGED, MSIPATCHSTATE_ALL,
+                           0, patchcode, targetprod, &context,
+                           targetsid, &size);
+    ok(r == ERROR_INVALID_PARAMETER,
+       "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
+    ok(!lstrcmpA(patchcode, "apple"),
+       "Expected patchcode to be unchanged, got %s\n", patchcode);
+    ok(!lstrcmpA(targetprod, "banana"),
+       "Expected targetprod to be unchanged, got %s\n", targetprod);
+    ok(context == 0xdeadbeef,
+       "Expected context to be unchanged, got %d\n", context);
+    ok(!lstrcmpA(targetsid, "kiwi"),
+       "Expected targetsid to be unchanged, got %s\n", targetsid);
+    ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
+
+    /* dwContext is MSIINSTALLCONTEXT_MACHINE, but szUserSid is non-NULL */
+    lstrcpyA(patchcode, "apple");
+    lstrcpyA(targetprod, "banana");
+    context = 0xdeadbeef;
+    lstrcpyA(targetsid, "kiwi");
+    size = MAX_PATH;
+    r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_MACHINE,
+                           MSIPATCHSTATE_ALL, 0, patchcode, targetprod,
                            &context, targetsid, &size);
-    ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
+    ok(r == ERROR_INVALID_PARAMETER,
+       "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(patchcode, "apple"),
        "Expected patchcode to be unchanged, got %s\n", patchcode);
     ok(!lstrcmpA(targetprod, "banana"),
@@ -8947,41 +9098,38 @@ static void test_MsiEnumPatchesEx(void)
        "Expected targetsid to be unchanged, got %s\n", targetsid);
     ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
 
-    data = MSIPATCHSTATE_SUPERSEDED;
-    res = RegSetValueExA(hpatch, "State", 0, REG_DWORD,
-                         (const BYTE *)&data, sizeof(DWORD));
-    ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
-
-    /* State value is MSIPATCHSTATE_SUPERSEDED */
+    /* dwContext is out of bounds */
     lstrcpyA(patchcode, "apple");
     lstrcpyA(targetprod, "banana");
     context = 0xdeadbeef;
     lstrcpyA(targetsid, "kiwi");
     size = MAX_PATH;
-    r = pMsiEnumPatchesExA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE,
-                           MSIPATCHSTATE_SUPERSEDED, 0, patchcode, targetprod,
+    r = pMsiEnumPatchesExA(prodcode, usersid, 0,
+                           MSIPATCHSTATE_ALL, 0, patchcode, targetprod,
                            &context, targetsid, &size);
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
-    ok(!lstrcmpA(patchcode, patch),
-       "Expected \"%s\", got \"%s\"\n", patch, patchcode);
-    ok(!lstrcmpA(targetprod, prodcode),
-       "Expected \"%s\", got \"%s\"\n", prodcode, targetprod);
-    ok(context == MSIINSTALLCONTEXT_MACHINE,
-       "Expected MSIINSTALLCONTEXT_MACHINE, got %d\n", context);
-    ok(!lstrcmpA(targetsid, ""), "Expected \"\", got \"%s\"\n", targetsid);
-    ok(size == 0, "Expected 0, got %d\n", size);
-
-    /* MSIPATCHSTATE_OBSOLETED */
+    ok(r == ERROR_INVALID_PARAMETER,
+       "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
+    ok(!lstrcmpA(patchcode, "apple"),
+       "Expected patchcode to be unchanged, got %s\n", patchcode);
+    ok(!lstrcmpA(targetprod, "banana"),
+       "Expected targetprod to be unchanged, got %s\n", targetprod);
+    ok(context == 0xdeadbeef,
+       "Expected context to be unchanged, got %d\n", context);
+    ok(!lstrcmpA(targetsid, "kiwi"),
+       "Expected targetsid to be unchanged, got %s\n", targetsid);
+    ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
 
+    /* dwContext is out of bounds */
     lstrcpyA(patchcode, "apple");
     lstrcpyA(targetprod, "banana");
     context = 0xdeadbeef;
     lstrcpyA(targetsid, "kiwi");
     size = MAX_PATH;
-    r = pMsiEnumPatchesExA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE,
-                           MSIPATCHSTATE_OBSOLETED, 0, patchcode, targetprod,
+    r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_ALL + 1,
+                           MSIPATCHSTATE_ALL, 0, patchcode, targetprod,
                            &context, targetsid, &size);
-    ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
+    ok(r == ERROR_INVALID_PARAMETER,
+       "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(patchcode, "apple"),
        "Expected patchcode to be unchanged, got %s\n", patchcode);
     ok(!lstrcmpA(targetprod, "banana"),
@@ -8992,64 +9140,58 @@ static void test_MsiEnumPatchesEx(void)
        "Expected targetsid to be unchanged, got %s\n", targetsid);
     ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
 
-    data = MSIPATCHSTATE_OBSOLETED;
-    res = RegSetValueExA(hpatch, "State", 0, REG_DWORD,
-                         (const BYTE *)&data, sizeof(DWORD));
-    ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
-
-    /* State value is obsoleted */
+    /* dwFilter is out of bounds */
     lstrcpyA(patchcode, "apple");
     lstrcpyA(targetprod, "banana");
     context = 0xdeadbeef;
     lstrcpyA(targetsid, "kiwi");
     size = MAX_PATH;
-    r = pMsiEnumPatchesExA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE,
-                           MSIPATCHSTATE_OBSOLETED, 0, patchcode, targetprod,
+    r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED,
+                           MSIPATCHSTATE_INVALID, 0, patchcode, targetprod,
                            &context, targetsid, &size);
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
-    ok(!lstrcmpA(patchcode, patch),
-       "Expected \"%s\", got \"%s\"\n", patch, patchcode);
-    ok(!lstrcmpA(targetprod, prodcode),
-       "Expected \"%s\", got \"%s\"\n", prodcode, targetprod);
-    ok(context == MSIINSTALLCONTEXT_MACHINE,
-       "Expected MSIINSTALLCONTEXT_MACHINE, got %d\n", context);
-    ok(!lstrcmpA(targetsid, ""), "Expected \"\", got \"%s\"\n", targetsid);
-    ok(size == 0, "Expected 0, got %d\n", size);
-
-    /* MSIPATCHSTATE_REGISTERED */
-    /* FIXME */
-
-    /* MSIPATCHSTATE_ALL */
+    ok(r == ERROR_INVALID_PARAMETER,
+       "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
+    ok(!lstrcmpA(patchcode, "apple"),
+       "Expected patchcode to be unchanged, got %s\n", patchcode);
+    ok(!lstrcmpA(targetprod, "banana"),
+       "Expected targetprod to be unchanged, got %s\n", targetprod);
+    ok(context == 0xdeadbeef,
+       "Expected context to be unchanged, got %d\n", context);
+    ok(!lstrcmpA(targetsid, "kiwi"),
+       "Expected targetsid to be unchanged, got %s\n", targetsid);
+    ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
 
-    /* 1st */
+    /* dwFilter is out of bounds */
     lstrcpyA(patchcode, "apple");
     lstrcpyA(targetprod, "banana");
     context = 0xdeadbeef;
     lstrcpyA(targetsid, "kiwi");
     size = MAX_PATH;
-    r = pMsiEnumPatchesExA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE,
-                           MSIPATCHSTATE_ALL, 0, patchcode, targetprod,
+    r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED,
+                           MSIPATCHSTATE_ALL + 1, 0, patchcode, targetprod,
                            &context, targetsid, &size);
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
-    ok(!lstrcmpA(patchcode, patch),
-       "Expected \"%s\", got \"%s\"\n", patch, patchcode);
-    ok(!lstrcmpA(targetprod, prodcode),
-       "Expected \"%s\", got \"%s\"\n", prodcode, targetprod);
-    ok(context == MSIINSTALLCONTEXT_MACHINE,
-       "Expected MSIINSTALLCONTEXT_MACHINE, got %d\n", context);
-    ok(!lstrcmpA(targetsid, ""), "Expected \"\", got \"%s\"\n", targetsid);
-    ok(size == 0, "Expected 0, got %d\n", size);
+    ok(r == ERROR_INVALID_PARAMETER,
+       "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
+    ok(!lstrcmpA(patchcode, "apple"),
+       "Expected patchcode to be unchanged, got %s\n", patchcode);
+    ok(!lstrcmpA(targetprod, "banana"),
+       "Expected targetprod to be unchanged, got %s\n", targetprod);
+    ok(context == 0xdeadbeef,
+       "Expected context to be unchanged, got %d\n", context);
+    ok(!lstrcmpA(targetsid, "kiwi"),
+       "Expected targetsid to be unchanged, got %s\n", targetsid);
+    ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
 
-    /* same patch in multiple places, only one is enumerated */
+    /* pcchTargetUserSid is NULL while szTargetUserSid is non-NULL */
     lstrcpyA(patchcode, "apple");
     lstrcpyA(targetprod, "banana");
     context = 0xdeadbeef;
     lstrcpyA(targetsid, "kiwi");
-    size = MAX_PATH;
-    r = pMsiEnumPatchesExA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE,
-                           MSIPATCHSTATE_ALL, 1, patchcode, targetprod,
-                           &context, targetsid, &size);
-    ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r);
+    r = pMsiEnumPatchesExA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED,
+                           MSIPATCHSTATE_ALL, 0, patchcode, targetprod,
+                           &context, targetsid, NULL);
+    ok(r == ERROR_INVALID_PARAMETER,
+       "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
     ok(!lstrcmpA(patchcode, "apple"),
        "Expected patchcode to be unchanged, got %s\n", patchcode);
     ok(!lstrcmpA(targetprod, "banana"),
@@ -9058,21 +9200,15 @@ static void test_MsiEnumPatchesEx(void)
        "Expected context to be unchanged, got %d\n", context);
     ok(!lstrcmpA(targetsid, "kiwi"),
        "Expected targetsid to be unchanged, got %s\n", targetsid);
-    ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
 
-    RegDeleteValueA(patches, patch_squashed);
-    RegDeleteValueA(patches, "Patches");
-    RegDeleteKeyA(patches, "");
-    RegCloseKey(patches);
-    RegDeleteValueA(hpatch, "State");
-    RegDeleteKeyA(hpatch, "");
-    RegCloseKey(hpatch);
-    RegDeleteKeyA(udpatch, "");
-    RegCloseKey(udpatch);
-    RegDeleteKeyA(udprod, "");
-    RegCloseKey(udprod);
-    RegDeleteKeyA(prodkey, "");
-    RegCloseKey(prodkey);
+    test_MsiEnumPatchesEx_usermanaged(usersid, usersid);
+    test_MsiEnumPatchesEx_usermanaged(NULL, usersid);
+    test_MsiEnumPatchesEx_usermanaged("S-1-2-34", "S-1-2-34");
+    test_MsiEnumPatchesEx_userunmanaged(usersid, usersid);
+    test_MsiEnumPatchesEx_userunmanaged(NULL, usersid);
+    /* FIXME: Successfully test userunmanaged with a different user */
+    test_MsiEnumPatchesEx_machine();
+    LocalFree(usersid);
 }
 
 static void test_MsiEnumPatches(void)
@@ -9081,6 +9217,7 @@ static void test_MsiEnumPatches(void)
     CHAR patchcode[MAX_PATH], patch_squashed[MAX_PATH];
     CHAR prodcode[MAX_PATH], prod_squashed[MAX_PATH];
     CHAR transforms[MAX_PATH];
+    WCHAR patchW[MAX_PATH], prodcodeW[MAX_PATH], transformsW[MAX_PATH];
     HKEY prodkey, patches, udprod;
     HKEY userkey, hpatch, udpatch;
     DWORD size, data;
@@ -9257,9 +9394,10 @@ static void test_MsiEnumPatches(void)
        "Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms);
     ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
 
+    patch_squashed[lstrlenA(patch_squashed) + 1] = '\0';
     res = RegSetValueExA(patches, "Patches", 0, REG_MULTI_SZ,
                          (const BYTE *)patch_squashed,
-                         lstrlenA(patch_squashed) + 1);
+                         lstrlenA(patch_squashed) + 2);
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
 
     /* Patches value exists */
@@ -9288,7 +9426,7 @@ static void test_MsiEnumPatches(void)
        "Expected \"%s\", got \"%s\"\n", patchcode, patch);
     ok(!lstrcmpA(transforms, "whatever"),
        "Expected \"whatever\", got \"%s\"\n", transforms);
-    ok(size == 8, "Expected 8, got %d\n", size);
+    ok(size == 8 || size == MAX_PATH, "Expected 8 or MAX_PATH, got %d\n", size);
 
     /* lpPatchBuf is NULL */
     size = MAX_PATH;
@@ -9331,7 +9469,7 @@ static void test_MsiEnumPatches(void)
        "Expected \"%s\", got \"%s\"\n", patchcode, patch);
     ok(!lstrcmpA(transforms, "whate"),
        "Expected \"whate\", got \"%s\"\n", transforms);
-    ok(size == 16, "Expected 16, got %d\n", size);
+    ok(size == 8 || size == 16, "Expected 8 or 16, got %d\n", size);
 
     /* increase the index */
     size = MAX_PATH;
@@ -9445,9 +9583,10 @@ static void test_MsiEnumPatches(void)
        "Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms);
     ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
 
+    patch_squashed[lstrlenA(patch_squashed) + 1] = '\0';
     res = RegSetValueExA(patches, "Patches", 0, REG_MULTI_SZ,
                          (const BYTE *)patch_squashed,
-                         lstrlenA(patch_squashed) + 1);
+                         lstrlenA(patch_squashed) + 2);
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
 
     /* Patches value exists */
@@ -9496,7 +9635,7 @@ static void test_MsiEnumPatches(void)
        "Expected \"%s\", got \"%s\"\n", patchcode, patch);
     ok(!lstrcmpA(transforms, "whatever"),
        "Expected \"whatever\", got \"%s\"\n", transforms);
-    ok(size == 8, "Expected 8, got %d\n", size);
+    ok(size == 8 || size == MAX_PATH, "Expected 8 or MAX_PATH, got %d\n", size);
 
     RegDeleteKeyA(userkey, "");
     RegCloseKey(userkey);
@@ -9589,9 +9728,10 @@ static void test_MsiEnumPatches(void)
        "Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms);
     ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size);
 
+    patch_squashed[lstrlenA(patch_squashed) + 1] = '\0';
     res = RegSetValueExA(patches, "Patches", 0, REG_MULTI_SZ,
                          (const BYTE *)patch_squashed,
-                         lstrlenA(patch_squashed) + 1);
+                         lstrlenA(patch_squashed) + 2);
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
 
     /* Patches value exists */
@@ -9620,7 +9760,7 @@ static void test_MsiEnumPatches(void)
        "Expected \"%s\", got \"%s\"\n", patchcode, patch);
     ok(!lstrcmpA(transforms, "whatever"),
        "Expected \"whatever\", got \"%s\"\n", transforms);
-    ok(size == 8, "Expected 8, got %d\n", size);
+    ok(size == 8 || size == MAX_PATH, "Expected 8 or MAX_PATH, got %d\n", size);
 
     lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\");
     lstrcatA(keypath, "Installer\\UserData\\S-1-5-18\\Products\\");
@@ -9639,7 +9779,7 @@ static void test_MsiEnumPatches(void)
        "Expected \"%s\", got \"%s\"\n", patchcode, patch);
     ok(!lstrcmpA(transforms, "whatever"),
        "Expected \"whatever\", got \"%s\"\n", transforms);
-    ok(size == 8, "Expected 8, got %d\n", size);
+    ok(size == 8 || size == MAX_PATH, "Expected 8 or MAX_PATH, got %d\n", size);
 
     res = RegCreateKeyA(udprod, "Patches", &udpatch);
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
@@ -9654,7 +9794,7 @@ static void test_MsiEnumPatches(void)
        "Expected \"%s\", got \"%s\"\n", patchcode, patch);
     ok(!lstrcmpA(transforms, "whatever"),
        "Expected \"whatever\", got \"%s\"\n", transforms);
-    ok(size == 8, "Expected 8, got %d\n", size);
+    ok(size == 8 || size == MAX_PATH, "Expected 8 or MAX_PATH, got %d\n", size);
 
     res = RegCreateKeyA(udpatch, patch_squashed, &hpatch);
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
@@ -9686,8 +9826,39 @@ static void test_MsiEnumPatches(void)
        "Expected \"%s\", got \"%s\"\n", patchcode, patch);
     ok(!lstrcmpA(transforms, "whatever"),
        "Expected \"whatever\", got \"%s\"\n", transforms);
+    ok(size == 8 || size == MAX_PATH, "Expected 8 or MAX_PATH, got %d\n", size);
+
+    /* now duplicate some of the tests for the W version */
+
+    /* pcchTransformsBuf is too small */
+    size = 6;
+    MultiByteToWideChar( CP_ACP, 0, prodcode, -1, prodcodeW, MAX_PATH );
+    MultiByteToWideChar( CP_ACP, 0, "apple", -1, patchW, MAX_PATH );
+    MultiByteToWideChar( CP_ACP, 0, "banana", -1, transformsW, MAX_PATH );
+    r = MsiEnumPatchesW(prodcodeW, 0, patchW, transformsW, &size);
+    ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r);
+    WideCharToMultiByte( CP_ACP, 0, patchW, -1, patch, MAX_PATH, NULL, NULL );
+    WideCharToMultiByte( CP_ACP, 0, transformsW, -1, transforms, MAX_PATH, NULL, NULL );
+    ok(!lstrcmpA(patch, patchcode),
+       "Expected \"%s\", got \"%s\"\n", patchcode, patch);
+    ok(!lstrcmpA(transforms, "whate"),
+       "Expected \"whate\", got \"%s\"\n", transforms);
     ok(size == 8, "Expected 8, got %d\n", size);
 
+    /* patch code value exists */
+    size = MAX_PATH;
+    MultiByteToWideChar( CP_ACP, 0, "apple", -1, patchW, MAX_PATH );
+    MultiByteToWideChar( CP_ACP, 0, "banana", -1, transformsW, MAX_PATH );
+    r = MsiEnumPatchesW(prodcodeW, 0, patchW, transformsW, &size);
+    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+    WideCharToMultiByte( CP_ACP, 0, patchW, -1, patch, MAX_PATH, NULL, NULL );
+    WideCharToMultiByte( CP_ACP, 0, transformsW, -1, transforms, MAX_PATH, NULL, NULL );
+    ok(!lstrcmpA(patch, patchcode),
+       "Expected \"%s\", got \"%s\"\n", patchcode, patch);
+    ok(!lstrcmpA(transforms, "whatever"),
+       "Expected \"whatever\", got \"%s\"\n", transforms);
+    ok(size == 8 || size == MAX_PATH, "Expected 8 or MAX_PATH, got %d\n", size);
+
     RegDeleteValueA(patches, patch_squashed);
     RegDeleteValueA(patches, "Patches");
     RegDeleteKeyA(patches, "");
@@ -9701,6 +9872,7 @@ static void test_MsiEnumPatches(void)
     RegCloseKey(udprod);
     RegDeleteKeyA(prodkey, "");
     RegCloseKey(prodkey);
+    LocalFree(usersid);
 }
 
 static void test_MsiGetPatchInfoEx(void)
@@ -10713,6 +10885,254 @@ static void test_MsiGetPatchInfoEx(void)
     RegCloseKey(props);
     RegDeleteKeyA(udprod, "");
     RegCloseKey(udprod);
+    LocalFree(usersid);
+}
+
+static void test_MsiGetPatchInfo(void)
+{
+    UINT r;
+    char prod_code[MAX_PATH], prod_squashed[MAX_PATH], val[MAX_PATH];
+    char patch_code[MAX_PATH], patch_squashed[MAX_PATH], keypath[MAX_PATH];
+    WCHAR valW[MAX_PATH], patch_codeW[MAX_PATH];
+    HKEY hkey_product, hkey_patch, hkey_patches, hkey_udprops, hkey_udproduct;
+    HKEY hkey_udpatch, hkey_udpatches, hkey_udproductpatches, hkey_udproductpatch;
+    DWORD size;
+    LONG res;
+
+    create_test_guid(patch_code, patch_squashed);
+    create_test_guid(prod_code, prod_squashed);
+    MultiByteToWideChar(CP_ACP, 0, patch_code, -1, patch_codeW, MAX_PATH);
+
+    r = MsiGetPatchInfoA(NULL, NULL, NULL, NULL);
+    ok(r == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", r);
+
+    r = MsiGetPatchInfoA(patch_code, NULL, NULL, NULL);
+    ok(r == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", r);
+
+    r = MsiGetPatchInfoA(patch_code, INSTALLPROPERTY_LOCALPACKAGEA, NULL, NULL);
+    ok(r == ERROR_UNKNOWN_PRODUCT, "expected ERROR_UNKNOWN_PRODUCT, got %u\n", r);
+
+    size = 0;
+    r = MsiGetPatchInfoA(patch_code, NULL, NULL, &size);
+    ok(r == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", r);
+
+    r = MsiGetPatchInfoA(patch_code, "", NULL, &size);
+    ok(r == ERROR_UNKNOWN_PROPERTY, "expected ERROR_UNKNOWN_PROPERTY, got %u\n", r);
+
+    lstrcpyA(keypath, "Software\\Classes\\Installer\\Products\\");
+    lstrcatA(keypath, prod_squashed);
+
+    res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &hkey_product);
+    ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS got %d\n", res);
+
+    /* product key exists */
+    size = MAX_PATH;
+    lstrcpyA(val, "apple");
+    r = MsiGetPatchInfoA(patch_code, INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
+    ok(r == ERROR_UNKNOWN_PRODUCT, "expected ERROR_UNKNOWN_PRODUCT got %u\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 %u\n", size);
+
+    res = RegCreateKeyA(hkey_product, "Patches", &hkey_patches);
+    ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS got %d\n", res);
+
+    /* patches key exists */
+    size = MAX_PATH;
+    lstrcpyA(val, "apple");
+    r = MsiGetPatchInfoA(patch_code, INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
+    ok(r == ERROR_UNKNOWN_PRODUCT, "expected ERROR_UNKNOWN_PRODUCT got %u\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 %u\n", size);
+
+    res = RegCreateKeyA(hkey_patches, patch_squashed, &hkey_patch);
+    ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS got %d\n", res);
+
+    /* patch key exists */
+    size = MAX_PATH;
+    lstrcpyA(val, "apple");
+    r = MsiGetPatchInfoA(patch_code, INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
+    ok(r == ERROR_UNKNOWN_PRODUCT, "expected ERROR_UNKNOWN_PRODUCT got %u\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 %u\n", size);
+
+    lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer");
+    lstrcatA(keypath, "\\UserData\\S-1-5-18\\Products\\");
+    lstrcatA(keypath, prod_squashed);
+
+    res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &hkey_udproduct);
+    ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", res);
+
+    /* UserData product key exists */
+    size = MAX_PATH;
+    lstrcpyA(val, "apple");
+    r = MsiGetPatchInfoA(patch_code, INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
+    ok(r == ERROR_UNKNOWN_PRODUCT, "expected ERROR_UNKNOWN_PRODUCT got %u\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 %u\n", size);
+
+    res = RegCreateKeyA(hkey_udproduct, "InstallProperties", &hkey_udprops);
+    ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS got %d\n", res);
+
+    /* InstallProperties key exists */
+    size = MAX_PATH;
+    lstrcpyA(val, "apple");
+    r = MsiGetPatchInfoA(patch_code, INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
+    ok(r == ERROR_UNKNOWN_PRODUCT, "expected ERROR_UNKNOWN_PRODUCT got %u\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 %u\n", size);
+
+    res = RegCreateKeyA(hkey_udproduct, "Patches", &hkey_udpatches);
+    ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS got %d\n", res);
+
+    /* UserData Patches key exists */
+    size = MAX_PATH;
+    lstrcpyA(val, "apple");
+    r = MsiGetPatchInfoA(patch_code, INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
+    ok(r == ERROR_UNKNOWN_PRODUCT, "expected ERROR_UNKNOWN_PRODUCT got %u\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 %u\n", size);
+
+    res = RegCreateKeyA(hkey_udproduct, "Patches", &hkey_udproductpatches);
+    ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
+    res = RegCreateKeyA(hkey_udproductpatches, patch_squashed, &hkey_udproductpatch);
+    ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
+    /* UserData product patch key exists */
+    size = MAX_PATH;
+    lstrcpyA(val, "apple");
+    r = MsiGetPatchInfoA(patch_code, INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
+    ok(r == ERROR_UNKNOWN_PRODUCT, "expected ERROR_UNKNOWN_PRODUCT got %u\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 %u\n", size);
+
+    lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer");
+    lstrcatA(keypath, "\\UserData\\S-1-5-18\\Patches\\");
+    lstrcatA(keypath, patch_squashed);
+
+    res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &hkey_udpatch);
+    ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS got %d\n", res);
+
+    res = RegSetValueExA(hkey_udpatch, "LocalPackage", 0, REG_SZ, (const BYTE *)"c:\\test.msp", 12);
+    ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS got %d\n", res);
+
+    /* UserData Patch key exists */
+    size = 0;
+    lstrcpyA(val, "apple");
+    r = MsiGetPatchInfoA(patch_code, INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
+    ok(r == ERROR_MORE_DATA, "expected ERROR_MORE_DATA got %u\n", r);
+    ok(!lstrcmpA(val, "apple"), "expected \"apple\", got \"%s\"\n", val);
+    ok(size == 11, "expected 11 got %u\n", size);
+
+    size = MAX_PATH;
+    lstrcpyA(val, "apple");
+    r = MsiGetPatchInfoA(patch_code, INSTALLPROPERTY_LOCALPACKAGEA, val, &size);
+    ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS got %u\n", r);
+    ok(!lstrcmpA(val, "c:\\test.msp"), "expected \"c:\\test.msp\", got \"%s\"\n", val);
+    ok(size == 11, "expected 11 got %u\n", size);
+
+    size = 0;
+    valW[0] = 0;
+    r = MsiGetPatchInfoW(patch_codeW, INSTALLPROPERTY_LOCALPACKAGEW, valW, &size);
+    ok(r == ERROR_MORE_DATA, "expected ERROR_MORE_DATA got %u\n", r);
+    ok(!valW[0], "expected 0 got %u\n", valW[0]);
+    ok(size == 11, "expected 11 got %u\n", size);
+
+    size = MAX_PATH;
+    valW[0] = 0;
+    r = MsiGetPatchInfoW(patch_codeW, INSTALLPROPERTY_LOCALPACKAGEW, valW, &size);
+    ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS got %u\n", r);
+    ok(valW[0], "expected > 0 got %u\n", valW[0]);
+    ok(size == 11, "expected 11 got %u\n", size);
+
+    RegDeleteKeyA(hkey_udproductpatch, "");
+    RegCloseKey(hkey_udproductpatch);
+    RegDeleteKeyA(hkey_udproductpatches, "");
+    RegCloseKey(hkey_udproductpatches);
+    RegDeleteKeyA(hkey_udpatch, "");
+    RegCloseKey(hkey_udpatch);
+    RegDeleteKeyA(hkey_patches, "");
+    RegCloseKey(hkey_patches);
+    RegDeleteKeyA(hkey_product, "");
+    RegCloseKey(hkey_product);
+    RegDeleteKeyA(hkey_patch, "");
+    RegCloseKey(hkey_patch);
+    RegDeleteKeyA(hkey_udpatches, "");
+    RegCloseKey(hkey_udpatches);
+    RegDeleteKeyA(hkey_udprops, "");
+    RegCloseKey(hkey_udprops);
+    RegDeleteKeyA(hkey_udproduct, "");
+    RegCloseKey(hkey_udproduct);
+}
+
+static void test_MsiEnumProducts(void)
+{
+    UINT r;
+    int found1, found2, found3;
+    DWORD index;
+    char product1[39], product2[39], product3[39], guid[39];
+    char product_squashed1[33], product_squashed2[33], product_squashed3[33];
+    char keypath1[MAX_PATH], keypath2[MAX_PATH], keypath3[MAX_PATH];
+    char *usersid;
+    HKEY key1, key2, key3;
+
+    create_test_guid(product1, product_squashed1);
+    create_test_guid(product2, product_squashed2);
+    create_test_guid(product3, product_squashed3);
+    get_user_sid(&usersid);
+
+    strcpy(keypath1, "Software\\Classes\\Installer\\Products\\");
+    strcat(keypath1, product_squashed1);
+
+    r = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath1, &key1);
+    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);
+
+    r = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath2, &key2);
+    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+
+    strcpy(keypath3, "Software\\Microsoft\\Installer\\Products\\");
+    strcat(keypath3, product_squashed3);
+
+    r = RegCreateKeyA(HKEY_CURRENT_USER, keypath3, &key3);
+    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+
+    index = 0;
+    r = MsiEnumProductsA(index, NULL);
+    ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", r);
+
+    index = 2;
+    r = MsiEnumProductsA(index, guid);
+    ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", r);
+
+    index = 0;
+    r = MsiEnumProductsA(index, guid);
+    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
+
+    found1 = found2 = found3 = 0;
+    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;
+        index++;
+    }
+    ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %u\n", r);
+    ok(found1, "product1 not found\n");
+    ok(found2, "product2 not found\n");
+    ok(found3, "product3 not found\n");
+
+    RegDeleteKeyA(key1, "");
+    RegDeleteKeyA(key2, "");
+    RegDeleteKeyA(key3, "");
+    RegCloseKey(key1);
+    RegCloseKey(key2);
+    RegCloseKey(key3);
+    LocalFree(usersid);
 }
 
 START_TEST(msi)
@@ -10725,7 +11145,7 @@ START_TEST(msi)
     test_MsiGetFileHash();
 
     if (!pConvertSidToStringSidA)
-        skip("ConvertSidToStringSidA not implemented\n");
+        win_skip("ConvertSidToStringSidA not implemented\n");
     else
     {
         /* These tests rely on get_user_sid that needs ConvertSidToStringSidA */
@@ -10742,6 +11162,8 @@ START_TEST(msi)
         test_MsiEnumPatchesEx();
         test_MsiEnumPatches();
         test_MsiGetPatchInfoEx();
+        test_MsiGetPatchInfo();
+        test_MsiEnumProducts();
     }
 
     test_MsiGetFileVersion();