Forgot these files, sorry...

svn path=/trunk/; revision=36385

diff --git a/reactos/include/psdk/msi.h b/reactos/include/psdk/msi.h
index 4f89920..1ffce4e 100644 (file)
--- a/reactos/include/psdk/msi.h
+++ b/reactos/include/psdk/msi.h
@@ -421,10 +421,6 @@ UINT WINAPI MsiOpenProductA(LPCSTR, MSIHANDLE*);
 UINT WINAPI MsiOpenProductW(LPCWSTR, MSIHANDLE*);
 #define     MsiOpenProduct WINELIB_NAME_AW(MsiOpenProduct)
 
-UINT WINAPI MsiProvideComponentFromDescriptorA(LPCSTR,LPSTR,DWORD*,DWORD*);
-UINT WINAPI MsiProvideComponentFromDescriptorW(LPCWSTR,LPWSTR,DWORD*,DWORD*);
-#define     MsiProvideComponentFromDescriptor WINELIB_NAME_AW(MsiProvideComponentFromDescriptor)
-
 UINT WINAPI MsiGetProductPropertyA(MSIHANDLE,LPCSTR,LPSTR,LPDWORD);
 UINT WINAPI MsiGetProductPropertyW(MSIHANDLE,LPCWSTR,LPWSTR,LPDWORD);
 #define     MsiGetProductProperty WINELIB_NAME_AW(MsiGetProductProperty)

diff --git a/reactos/include/psdk/msidefs.h b/reactos/include/psdk/msidefs.h
index 5680a68..141e203 100644 (file)
--- a/reactos/include/psdk/msidefs.h
+++ b/reactos/include/psdk/msidefs.h
@@ -19,10 +19,6 @@
 #ifndef __WINE_MSIDEFS_H
 #define __WINE_MSIDEFS_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 enum msidbUpgradeAttributes {
     msidbUpgradeAttributesMigrateFeatures = 0x0000001,
     msidbUpgradeAttributesOnlyDetect = 0x00000002,
@@ -211,6 +207,14 @@ enum msidbAssemblyAttributes
     msidbAssemblyAttributesWin32 = 0x00000001,
 };
 
+enum msidbSumInfoSourceType
+{
+    msidbSumInfoSourceTypeSFN = 0x00000001,
+    msidbSumInfoSourceTypeCompressed = 0x00000002,
+    msidbSumInfoSourceTypeAdminImage = 0x00000004,
+    msidbSumInfoSourceTypeLUAPackage = 0x00000008,
+};
+
 /*
  * Windows SDK braindamage alert
  *
@@ -254,8 +258,4 @@ enum msidbAssemblyAttributes
 #define PID_MSISOURCE PID_WORDCOUNT
 #define PID_MSIRESTRICT PID_CHARCOUNT
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* __WINE_MSIDEFS_H */

diff --git a/reactos/include/psdk/msiquery.h b/reactos/include/psdk/msiquery.h
index 1c52a76..fa42f17 100644 (file)
--- a/reactos/include/psdk/msiquery.h
+++ b/reactos/include/psdk/msiquery.h
@@ -61,7 +61,7 @@ typedef enum tagMSIMODIFY
     MSIMODIFY_VALIDATE_DELETE = 11
 } MSIMODIFY;
 
-#ifndef __WINESRC__
+#ifndef WINE_NO_UNICODE_MACROS
 #define MSIDBOPEN_READONLY (LPCTSTR)0
 #define MSIDBOPEN_TRANSACT (LPCTSTR)1
 #define MSIDBOPEN_DIRECT   (LPCTSTR)2
@@ -75,6 +75,8 @@ typedef enum tagMSIMODIFY
 #define MSIDBOPEN_CREATEDIRECT (LPCWSTR)4
 #endif
 
+#define MSIDBOPEN_PATCHFILE 32 / sizeof(*MSIDBOPEN_READONLY)
+
 typedef enum tagMSIRUNMODE
 {
     MSIRUNMODE_ADMIN = 0,