James Hawkins : msi: Use the newly added defines from the msidbSumInfoSourceType enumeration.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7538f9ac193555fd2da61f59780a0e81b2812045
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7538f9ac193555fd2da61f5978...

Author: James Hawkins 
Date:   Tue Jul 22 00:54:27 2008 -0500

msi: Use the newly added defines from the msidbSumInfoSourceType enumeration.

---

dlls/msi/action.c  |    2 +-
 dlls/msi/msipriv.h |    5 -----
 dlls/msi/package.c |    2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index cde5c98..5bb7008 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -1486,7 +1486,7 @@ static UINT load_file(MSIRECORD *row, LPVOID param)
     }
     else
     {
-        file->IsCompressed = package->WordCount & MSIWORDCOUNT_COMPRESSED;
+        file->IsCompressed = package->WordCount & msidbSumInfoSourceTypeCompressed;
     }

if (!file->IsCompressed)
diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h
index fe880c6..19abc3f 100644
--- a/dlls/msi/msipriv.h
+++ b/dlls/msi/msipriv.h
@@ -42,11 +42,6 @@
 #define MSITYPE_KEY      0x2000
 #define MSITYPE_TEMPORARY 0x4000

-/* Word Count masks */
-#define MSIWORDCOUNT_SHORTFILENAMES     0x0001
-#define MSIWORDCOUNT_COMPRESSED         0x0002
-#define MSIWORDCOUNT_ADMINISTRATIVE     0x0004
-#define MSIWORDCOUNT_PRIVILEGES         0x0008

/* Install UI level mask for AND operation to exclude flags */
 #define INSTALLUILEVEL_MASK             0x0007
diff --git a/dlls/msi/package.c b/dlls/msi/package.c
index 0b9dacf..1b5f2d1 100644
--- a/dlls/msi/package.c
+++ b/dlls/msi/package.c
@@ -797,7 +797,7 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url )
             return NULL;
         }

-        if (package->WordCount & MSIWORDCOUNT_ADMINISTRATIVE)
+        if (package->WordCount & msidbSumInfoSourceTypeAdminImage)
             msi_load_admin_properties( package );
     }