[PATCH 10/16] [Msi]: tests

Eric Pouech eric.pouech at wanadoo.fr
Sun Oct 22 14:48:34 CDT 2006


- replace PropVariantClear with a simple memset for yet
  uninitialized prop variants, as we can't clear a yet
  unitialiazed item
  (spotted by valgrind)

A+
---

 dlls/msi/tests/suminfo.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/msi/tests/suminfo.c b/dlls/msi/tests/suminfo.c
index d8825b9..a5ac8a4 100644
--- a/dlls/msi/tests/suminfo.c
+++ b/dlls/msi/tests/suminfo.c
@@ -299,49 +299,49 @@ static void test_create_database_binary(
     r = IPropertyStorage_SetClass( ps, &FMTID_SummaryInformation );
     ok( r == S_OK, "failed to set class\n");
 
-    PropVariantClear( &propvar[0] );
+    memset(&propvar[0], 0, sizeof(propvar[0]));
     propspec[0].lpwstr = NULL;
     propspec[0].ulKind = PRSPEC_PROPID;
     propspec[0].propid = PID_TITLE;
     propvar[0].vt = VT_LPSTR;
     U(propvar[0]).pszVal = LOSE_CONST("test title");
 
-    PropVariantClear( &propvar[1] );
+    memset(&propvar[1], 0, sizeof(propvar[1]));
     propspec[1].lpwstr = NULL;
     propspec[1].ulKind = PRSPEC_PROPID;
     propspec[1].propid = PID_SUBJECT;
     propvar[1].vt = VT_LPSTR;
     U(propvar[1]).pszVal = LOSE_CONST("msi suminfo / property storage test");
 
-    PropVariantClear( &propvar[2] );
+    memset(&propvar[2], 0, sizeof(propvar[2]));
     propspec[2].lpwstr = NULL;
     propspec[2].ulKind = PRSPEC_PROPID;
     propspec[2].propid = PID_AUTHOR;
     propvar[2].vt = VT_LPSTR;
     U(propvar[2]).pszVal = LOSE_CONST("mike_m");
 
-    PropVariantClear( &propvar[3] );
+    memset(&propvar[3], 0, sizeof(propvar[3]));
     propspec[3].lpwstr = NULL;
     propspec[3].ulKind = PRSPEC_PROPID;
     propspec[3].propid = PID_TEMPLATE;
     propvar[3].vt = VT_LPSTR;
     U(propvar[3]).pszVal = LOSE_CONST(";1033");  /* actually the string table's codepage */
 
-    PropVariantClear( &propvar[4] );
+    memset(&propvar[4], 0, sizeof(propvar[4]));
     propspec[4].lpwstr = NULL;
     propspec[4].ulKind = PRSPEC_PROPID;
     propspec[4].propid = PID_REVNUMBER;
     propvar[4].vt = VT_LPSTR;
     U(propvar[4]).pszVal = LOSE_CONST("{913B8D18-FBB6-4CAC-A239-C74C11E3FA74}");
 
-    PropVariantClear( &propvar[5] );
+    memset(&propvar[5], 0, sizeof(propvar[5]));
     propspec[5].lpwstr = NULL;
     propspec[5].ulKind = PRSPEC_PROPID;
     propspec[5].propid = PID_PAGECOUNT;
     propvar[5].vt = VT_I4;
     U(propvar[5]).lVal = 100;
 
-    PropVariantClear( &propvar[6] );
+    memset(&propvar[6], 0, sizeof(propvar[6]));
     propspec[6].lpwstr = NULL;
     propspec[6].ulKind = PRSPEC_PROPID;
     propspec[6].propid = PID_WORDCOUNT;
@@ -349,7 +349,7 @@ static void test_create_database_binary(
     U(propvar[6]).lVal = 0;
 
     /* MSDN says that PID_LASTPRINTED should be a VT_FILETIME... */
-    PropVariantClear( &propvar[7] );
+    memset(&propvar[7], 0, sizeof(propvar[7]));
     propspec[7].lpwstr = NULL;
     propspec[7].ulKind = PRSPEC_PROPID;
     propspec[7].propid = PID_LASTPRINTED;



More information about the wine-patches mailing list