system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-06 09:17:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

msi/tests: Use nameless unions/structs.

Browse source
This commit is contained in:
Alexandre Julliard 2023-07-20 11:37:08 +02:00
parent 175d873c72
commit 490aee03e4
2 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dlls/msi/tests/package.c
View file

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

32
dlls/msi/tests/suminfo.c
View file

@ -343,45 +343,45 @@ static void test_create_database_binary(void)
ok( r == S_OK, "failed to set class\n"); ok( r == S_OK, "failed to set class\n");
propspec[0].ulKind = PRSPEC_PROPID; propspec[0].ulKind = PRSPEC_PROPID;
U(propspec[0]).propid = PID_TITLE; propspec[0].propid = PID_TITLE;
propvar[0].vt = VT_LPSTR; 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; propspec[1].ulKind = PRSPEC_PROPID;
U(propspec[1]).propid = PID_SUBJECT; propspec[1].propid = PID_SUBJECT;
propvar[1].vt = VT_LPSTR; 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; propspec[2].ulKind = PRSPEC_PROPID;
U(propspec[2]).propid = PID_AUTHOR; propspec[2].propid = PID_AUTHOR;
propvar[2].vt = VT_LPSTR; 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; propspec[3].ulKind = PRSPEC_PROPID;
U(propspec[3]).propid = PID_TEMPLATE; propspec[3].propid = PID_TEMPLATE;
propvar[3].vt = VT_LPSTR; 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; propspec[4].ulKind = PRSPEC_PROPID;
U(propspec[4]).propid = PID_REVNUMBER; propspec[4].propid = PID_REVNUMBER;
propvar[4].vt = VT_LPSTR; 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; propspec[5].ulKind = PRSPEC_PROPID;
U(propspec[5]).propid = PID_PAGECOUNT; propspec[5].propid = PID_PAGECOUNT;
propvar[5].vt = VT_I4; propvar[5].vt = VT_I4;
U(propvar[5]).lVal = 100; propvar[5].lVal = 100;
propspec[6].ulKind = PRSPEC_PROPID; propspec[6].ulKind = PRSPEC_PROPID;
U(propspec[6]).propid = PID_WORDCOUNT; propspec[6].propid = PID_WORDCOUNT;
propvar[6].vt = VT_I4; propvar[6].vt = VT_I4;
U(propvar[6]).lVal = 0; propvar[6].lVal = 0;
/* MSDN says that PID_LASTPRINTED should be a VT_FILETIME... */ /* MSDN says that PID_LASTPRINTED should be a VT_FILETIME... */
propspec[7].ulKind = PRSPEC_PROPID; propspec[7].ulKind = PRSPEC_PROPID;
U(propspec[7]).propid = PID_LASTPRINTED; propspec[7].propid = PID_LASTPRINTED;
propvar[7].vt = VT_LPSTR; 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 ); r = IPropertyStorage_WriteMultiple( ps, 8, propspec, propvar, PID_FIRST_USABLE );
ok( r == S_OK, "failed to write properties\n"); ok( r == S_OK, "failed to write properties\n");