msi/tests: Use nameless unions/structs.

dlls/msi/tests/package.c

@@ -4717,7 +4717,7 @@ static void test_appsearch_reglocator(void)
     memset(&si, 0, sizeof(si));
     GetNativeSystemInfo(&si);
 
-    if (S(U(si)).wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL)
+    if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL)
     {
         size = ExpandEnvironmentStringsA("%PATH%", NULL, 0);
         pathvar = malloc(size);
@@ -5748,7 +5748,7 @@ static void test_installprops(void)
     sprintf(buf, "%d", LOBYTE(LOWORD(GetVersion())) * 100 + HIBYTE(LOWORD(GetVersion())));
     check_prop(hpkg, "VersionNT", buf, 1, 1);
 
-    if (S(U(si)).wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
+    if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
     {
         sprintf(buf, "%d", si.wProcessorLevel);
         check_prop(hpkg, "Intel", buf, 1, 0);
@@ -5785,7 +5785,7 @@ static void test_installprops(void)
         strcat(path, "\\");
         check_prop(hpkg, "CommonFiles64Folder", path, 0, 0);
     }
-    else if (S(U(si)).wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL)
+    else if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL)
     {
         sprintf(buf, "%d", si.wProcessorLevel);
         check_prop(hpkg, "Intel", buf, 1, 0);

dlls/msi/tests/suminfo.c

@@ -343,45 +343,45 @@ static void test_create_database_binary(void)
     ok( r == S_OK, "failed to set class\n");
 
     propspec[0].ulKind = PRSPEC_PROPID;
-    U(propspec[0]).propid = PID_TITLE;
+    propspec[0].propid = PID_TITLE;
     propvar[0].vt = VT_LPSTR;
-    U(propvar[0]).pszVal = LOSE_CONST("test title");
+    propvar[0].pszVal = LOSE_CONST("test title");
 
     propspec[1].ulKind = PRSPEC_PROPID;
-    U(propspec[1]).propid = PID_SUBJECT;
+    propspec[1].propid = PID_SUBJECT;
     propvar[1].vt = VT_LPSTR;
-    U(propvar[1]).pszVal = LOSE_CONST("msi suminfo / property storage test");
+    propvar[1].pszVal = LOSE_CONST("msi suminfo / property storage test");
 
     propspec[2].ulKind = PRSPEC_PROPID;
-    U(propspec[2]).propid = PID_AUTHOR;
+    propspec[2].propid = PID_AUTHOR;
     propvar[2].vt = VT_LPSTR;
-    U(propvar[2]).pszVal = LOSE_CONST("mike_m");
+    propvar[2].pszVal = LOSE_CONST("mike_m");
 
     propspec[3].ulKind = PRSPEC_PROPID;
-    U(propspec[3]).propid = PID_TEMPLATE;
+    propspec[3].propid = PID_TEMPLATE;
     propvar[3].vt = VT_LPSTR;
-    U(propvar[3]).pszVal = LOSE_CONST(";1033");  /* actually the string table's codepage */
+    propvar[3].pszVal = LOSE_CONST(";1033");  /* actually the string table's codepage */
 
     propspec[4].ulKind = PRSPEC_PROPID;
-    U(propspec[4]).propid = PID_REVNUMBER;
+    propspec[4].propid = PID_REVNUMBER;
     propvar[4].vt = VT_LPSTR;
-    U(propvar[4]).pszVal = LOSE_CONST("{913B8D18-FBB6-4CAC-A239-C74C11E3FA74}");
+    propvar[4].pszVal = LOSE_CONST("{913B8D18-FBB6-4CAC-A239-C74C11E3FA74}");
 
     propspec[5].ulKind = PRSPEC_PROPID;
-    U(propspec[5]).propid = PID_PAGECOUNT;
+    propspec[5].propid = PID_PAGECOUNT;
     propvar[5].vt = VT_I4;
-    U(propvar[5]).lVal = 100;
+    propvar[5].lVal = 100;
 
     propspec[6].ulKind = PRSPEC_PROPID;
-    U(propspec[6]).propid = PID_WORDCOUNT;
+    propspec[6].propid = PID_WORDCOUNT;
     propvar[6].vt = VT_I4;
-    U(propvar[6]).lVal = 0;
+    propvar[6].lVal = 0;
 
     /* MSDN says that PID_LASTPRINTED should be a VT_FILETIME... */
     propspec[7].ulKind = PRSPEC_PROPID;
-    U(propspec[7]).propid = PID_LASTPRINTED;
+    propspec[7].propid = PID_LASTPRINTED;
     propvar[7].vt = VT_LPSTR;
-    U(propvar[7]).pszVal = LOSE_CONST("7/1/1999 5:17");
+    propvar[7].pszVal = LOSE_CONST("7/1/1999 5:17");
 
     r = IPropertyStorage_WriteMultiple( ps, 8, propspec, propvar, PID_FIRST_USABLE );
     ok( r == S_OK, "failed to write properties\n");