[MSI]

* Move some inclusions to the main header.
* Remove inclusions and definitions that already exist in the main header.
CORE-7716

svn path=/trunk/; revision=61416

diff --git a/reactos/dll/win32/msi/CMakeLists.txt b/reactos/dll/win32/msi/CMakeLists.txt
index 0a6098d..1fec59c 100644 (file)
--- a/reactos/dll/win32/msi/CMakeLists.txt
+++ b/reactos/dll/win32/msi/CMakeLists.txt
@@ -56,10 +56,6 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/msi_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/msi.def)
 
-if(MSVC)
-    set_source_files_properties(custom.c PROPERTIES COMPILE_FLAGS /FImsvchelper.h)
-endif()
-
 add_library(msi SHARED ${SOURCE})
 add_idl_headers(msi_idlheader msiserver.idl)
 add_typelib(msiserver.idl)

diff --git a/reactos/dll/win32/msi/action.c b/reactos/dll/win32/msi/action.c
index 6c291ba..b6c1861 100644 (file)
--- a/reactos/dll/win32/msi/action.c
+++ b/reactos/dll/win32/msi/action.c
@@ -18,31 +18,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdarg.h>
-
-#define COBJMACROS
+#include "msipriv.h"
 
-#include <windef.h>
-//#include "winbase.h"
-//#include "winerror.h"
-#include <winreg.h>
 #include <winsvc.h>
 #include <odbcinst.h>
-#include <wine/debug.h>
-//#include "msidefs.h"
-#include "msipriv.h"
-//#include "winuser.h"
-#include <shlobj.h>
-//#include "objbase.h"
-//#include "mscoree.h"
-//#include "shlwapi.h"
 #include <imagehlp.h>
-#include <wine/unicode.h>
-//#include "winver.h"
 
 #define REG_PROGRESS_VALUE 13200
 #define COMPONENT_PROGRESS_VALUE 24000

diff --git a/reactos/dll/win32/msi/alter.c b/reactos/dll/win32/msi/alter.c
index 97e94d7..fff3785 100644 (file)
--- a/reactos/dll/win32/msi/alter.c
+++ b/reactos/dll/win32/msi/alter.c
@@ -18,23 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-#include <wine/debug.h>
-//#include "msi.h"
-//#include "msiquery.h"
-//#include "objbase.h"
-//#include "objidl.h"
-//#include "msipriv.h"
-
-#include "query.h"
+#include "msipriv.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msidb);
 

diff --git a/reactos/dll/win32/msi/appsearch.c b/reactos/dll/win32/msi/appsearch.c
index dc27c78..a204397 100644 (file)
--- a/reactos/dll/win32/msi/appsearch.c
+++ b/reactos/dll/win32/msi/appsearch.c
@@ -17,24 +17,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-//#include "msi.h"
-//#include "msiquery.h"
-//#include "msidefs.h"
-//#include "winver.h"
-#include <shlwapi.h>
-#include <wine/unicode.h>
-#include <wine/debug.h>
+
 #include "msipriv.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);

diff --git a/reactos/dll/win32/msi/assembly.c b/reactos/dll/win32/msi/assembly.c
index 2553f06..d7939e8 100644 (file)
--- a/reactos/dll/win32/msi/assembly.c
+++ b/reactos/dll/win32/msi/assembly.c
@@ -18,19 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-//#include "winbase.h"
-#include <winreg.h>
-#include <wine/debug.h>
-#include <wine/unicode.h>
 #include "msipriv.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);

diff --git a/reactos/dll/win32/msi/automation.c b/reactos/dll/win32/msi/automation.c
index 895aabc..dda9430 100644 (file)
--- a/reactos/dll/win32/msi/automation.c
+++ b/reactos/dll/win32/msi/automation.c
@@ -18,27 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-
-//#include <stdarg.h>
-#include <windef.h>
-//#include "winbase.h"
-//#include "winerror.h"
-//#include "winuser.h"
-#include <winreg.h>
-//#include "msidefs.h"
 #include "msipriv.h"
-#include <activscp.h>
-#include <oleauto.h>
-#include <shlwapi.h>
-#include <wine/debug.h>
-#include <wine/unicode.h>
-
-#include <msiserver.h>
 #include "msiserver_dispids.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);

diff --git a/reactos/dll/win32/msi/classes.c b/reactos/dll/win32/msi/classes.c
index e57d1be..90df902 100644 (file)
--- a/reactos/dll/win32/msi/classes.c
+++ b/reactos/dll/win32/msi/classes.c
@@ -30,20 +30,7 @@
  * UnregisterMIMEInfo
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdarg.h>
-
-#include <windef.h>
-//#include "winbase.h"
-//#include "winerror.h"
-#include <winreg.h>
-#include <wine/debug.h>
 #include "msipriv.h"
-//#include "winuser.h"
-#include <wine/unicode.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 

diff --git a/reactos/dll/win32/msi/cond.tab.c b/reactos/dll/win32/msi/cond.tab.c
index d4676a8..4f69ace 100644 (file)
--- a/reactos/dll/win32/msi/cond.tab.c
+++ b/reactos/dll/win32/msi/cond.tab.c
@@ -97,31 +97,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-
-#include <config.h>
-
-#include <stdarg.h>
-//#include <stdio.h>
-//#include <stdlib.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-//#include "msi.h"
-//#include "msiquery.h"
-#include <objbase.h>
-#include <oleauto.h>
-
 #include "msipriv.h"
-#include <msiserver.h>
-#include <wine/debug.h>
-#include <wine/unicode.h>
-//#include "wine/list.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 

diff --git a/reactos/dll/win32/msi/create.c b/reactos/dll/win32/msi/create.c
index f48549e..3c10bed 100644 (file)
--- a/reactos/dll/win32/msi/create.c
+++ b/reactos/dll/win32/msi/create.c
@@ -18,29 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
-//#include "msi.h"
-//#include "msiquery.h"
-//#include "objbase.h"
-//#include "objidl.h"
-//#include "msipriv.h"
-//#include "winnls.h"
-
-#include "query.h"
+#include "msipriv.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msidb);
 
-
 /* below is the query interface to a table */
 
 typedef struct tagMSICREATEVIEW

diff --git a/reactos/dll/win32/msi/custom.c b/reactos/dll/win32/msi/custom.c
index ecc3b53..aeab7b5 100644 (file)
--- a/reactos/dll/win32/msi/custom.c
+++ b/reactos/dll/win32/msi/custom.c
@@ -18,29 +18,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-//#include "wine/port.h"
-
-#define COBJMACROS
-
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"
-//#include "msidefs.h"
-#include <winuser.h>
-#include <objbase.h>
-#include <oleauto.h>
-
 #include "msipriv.h"
-#include <msiserver.h>
-#include <wine/debug.h>
-#include <wine/unicode.h>
+
 #include <wine/exception.h>
 
+#ifdef _MSC_VER
+#include "msvchelper.h"
+#endif
+
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 
 #define CUSTOM_ACTION_TYPE_MASK 0x3F

diff --git a/reactos/dll/win32/msi/database.c b/reactos/dll/win32/msi/database.c
index f10889d..a73317c 100644 (file)
--- a/reactos/dll/win32/msi/database.c
+++ b/reactos/dll/win32/msi/database.c
@@ -18,32 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include "msipriv.h"
 
-//#include <stdarg.h>
 #include <stdio.h>
 
-#define COBJMACROS
-#define NONAMELESSUNION
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winreg.h"
-//#include "winnls.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
-//#include "msi.h"
-#include "msiquery.h"
-//#include "msipriv.h"
-//#include "objidl.h"
-#include <objbase.h>
-#include <msiserver.h>
-#include "query.h"
-
-//#include "initguid.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 
 /*

diff --git a/reactos/dll/win32/msi/delete.c b/reactos/dll/win32/msi/delete.c
index 9f65415..d3c16bf 100644 (file)
--- a/reactos/dll/win32/msi/delete.c
+++ b/reactos/dll/win32/msi/delete.c
@@ -18,28 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-#include <wine/debug.h>
-//#include "msi.h"
-//#include "msiquery.h"
-//#include "objbase.h"
-//#include "objidl.h"
 #include "msipriv.h"
-//#include "winnls.h"
-
-//#include "query.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msidb);
 
-
 /*
  * Code to delete rows from a table.
  *

diff --git a/reactos/dll/win32/msi/dialog.c b/reactos/dll/win32/msi/dialog.c
index 403a097..923b9c6 100644 (file)
--- a/reactos/dll/win32/msi/dialog.c
+++ b/reactos/dll/win32/msi/dialog.c
@@ -19,36 +19,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <stdarg.h>
-
-#include <windef.h>
-//#include "winbase.h"
-#include <wingdi.h>
-//#include "winuser.h"
-//#include "winnls.h"
-//#include "msi.h"
 #include "msipriv.h"
-//#include "msidefs.h"
-//#include "ocidl.h"
+
 #include <olectl.h>
 #include <richedit.h>
-#include <commctrl.h>
-#include <winreg.h>
-#include <shlwapi.h>
-#include <msiserver.h>
 #include <shellapi.h>
 
-#include <wine/debug.h>
-#include <wine/unicode.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 
 extern HINSTANCE msi_hInstance;

diff --git a/reactos/dll/win32/msi/distinct.c b/reactos/dll/win32/msi/distinct.c
index dbefc95..7834931 100644 (file)
--- a/reactos/dll/win32/msi/distinct.c
+++ b/reactos/dll/win32/msi/distinct.c
@@ -18,24 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-#include <wine/debug.h>
-//#include "msi.h"
-//#include "msiquery.h"
-//#include "objbase.h"
-//#include "objidl.h"
 #include "msipriv.h"
-//#include "winnls.h"
-
-//#include "query.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msidb);
 

diff --git a/reactos/dll/win32/msi/drop.c b/reactos/dll/win32/msi/drop.c
index cab2a59..dd0af10 100644 (file)
--- a/reactos/dll/win32/msi/drop.c
+++ b/reactos/dll/win32/msi/drop.c
@@ -18,23 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-#include <wine/debug.h>
-//#include "msi.h"
-//#include "msiquery.h"
-//#include "objbase.h"
-//#include "objidl.h"
-//#include "msipriv.h"
-
-#include "query.h"
+#include "msipriv.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msidb);
 

diff --git a/reactos/dll/win32/msi/files.c b/reactos/dll/win32/msi/files.c
index 075fe25..fda9ee3 100644 (file)
--- a/reactos/dll/win32/msi/files.c
+++ b/reactos/dll/win32/msi/files.c
@@ -30,24 +30,7 @@
  * RemoveFiles
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-#include <wine/debug.h>
-//#include "fdi.h"
-//#include "msi.h"
-//#include "msidefs.h"
 #include "msipriv.h"
-//#include "winuser.h"
-#include <winreg.h>
-#include <shlwapi.h>
-#include <wine/unicode.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 

diff --git a/reactos/dll/win32/msi/font.c b/reactos/dll/win32/msi/font.c
index 00a4985..e2a7734 100644 (file)
--- a/reactos/dll/win32/msi/font.c
+++ b/reactos/dll/win32/msi/font.c
@@ -18,18 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdarg.h>
-#include <windef.h>
-//#include "winbase.h"
-//#include "winerror.h"
-#include <winreg.h>
-#include <wine/debug.h>
 #include "msipriv.h"
-#include <wine/unicode.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 

diff --git a/reactos/dll/win32/msi/format.c b/reactos/dll/win32/msi/format.c
index c3fcbcf..a56b8f8 100644 (file)
--- a/reactos/dll/win32/msi/format.c
+++ b/reactos/dll/win32/msi/format.c
@@ -19,27 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
-//#include <stdio.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"
-#include <wine/debug.h>
-//#include "msi.h"
-//#include "winnls.h"
-#include <objbase.h>
-#include <oleauto.h>
-
 #include "msipriv.h"
-#include <msiserver.h>
-#include <wine/unicode.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 

diff --git a/reactos/dll/win32/msi/handle.c b/reactos/dll/win32/msi/handle.c
index 0c19657..1b3a7e1 100644 (file)
--- a/reactos/dll/win32/msi/handle.c
+++ b/reactos/dll/win32/msi/handle.c
@@ -18,21 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winreg.h"
-//#include "shlwapi.h"
-#include <wine/debug.h>
-//#include "msi.h"
-//#include "msiquery.h"
 #include "msipriv.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);

diff --git a/reactos/dll/win32/msi/insert.c b/reactos/dll/win32/msi/insert.c
index ad42e6b..d9a4ad8 100644 (file)
--- a/reactos/dll/win32/msi/insert.c
+++ b/reactos/dll/win32/msi/insert.c
@@ -18,29 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
-//#include "msi.h"
-//#include "msiquery.h"
-//#include "objbase.h"
-//#include "objidl.h"
-//#include "msipriv.h"
-//#include "winnls.h"
-
-#include "query.h"
+#include "msipriv.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msidb);
 
-
 /* below is the query interface to a table */
 
 typedef struct tagMSIINSERTVIEW

diff --git a/reactos/dll/win32/msi/install.c b/reactos/dll/win32/msi/install.c
index 7a7dc28..da21ad3 100644 (file)
--- a/reactos/dll/win32/msi/install.c
+++ b/reactos/dll/win32/msi/install.c
@@ -20,26 +20,7 @@
 
 /* Msi top level apis directly related to installs */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-//#include "winerror.h"
-#include <wine/debug.h>
-//#include "msi.h"
-//#include "msidefs.h"
-#include <objbase.h>
-#include <oleauto.h>
-
 #include "msipriv.h"
-#include <msiserver.h>
-#include <wine/unicode.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 

diff --git a/reactos/dll/win32/msi/media.c b/reactos/dll/win32/msi/media.c
index 1dc3a96..24f8969 100644 (file)
--- a/reactos/dll/win32/msi/media.c
+++ b/reactos/dll/win32/msi/media.c
@@ -18,24 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdarg.h>
-
-#define COBJMACROS
-
-//#include "windef.h"
-//#include "winerror.h"
-#include <wine/debug.h>
-//#include "fdi.h"
 #include "msipriv.h"
-#include <winuser.h>
-#include <winreg.h>
-#include <shlwapi.h>
-//#include "objidl.h"
-#include <wine/unicode.h>
+
+#include <fdi.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 

diff --git a/reactos/dll/win32/msi/msi.c b/reactos/dll/win32/msi/msi.c
index 5c33d1b..1098055 100644 (file)
--- a/reactos/dll/win32/msi/msi.c
+++ b/reactos/dll/win32/msi/msi.c
@@ -18,40 +18,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-//#include "winnls.h"
-#include <shlwapi.h>
-//#include "msi.h"
-//#include "msidefs.h"
-//#include "msiquery.h"
 #include "msipriv.h"
-#include <msiserver.h>
-//#include "wincrypt.h"
-//#include "winver.h"
-//#include "winuser.h"
-#include <shlobj.h>
-//#include "shobjidl.h"
-//#include "objidl.h"
-//#include "wintrust.h"
-#include <softpub.h>
 
+#include <softpub.h>
 #include <initguid.h>
 #include <msxml2.h>
 
-#include <wine/debug.h>
-#include <wine/unicode.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 
 static const WCHAR installerW[] = {'\\','I','n','s','t','a','l','l','e','r',0};

diff --git a/reactos/dll/win32/msi/msi_main.c b/reactos/dll/win32/msi/msi_main.c
index c0d3fde..0bf9921 100644 (file)
--- a/reactos/dll/win32/msi/msi_main.c
+++ b/reactos/dll/win32/msi/msi_main.c
@@ -18,25 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-#include <shlwapi.h>
-//#include "oleauto.h"
-#include <rpcproxy.h>
 #include "msipriv.h"
-#include <msiserver.h>
 
-#include <wine/debug.h>
+#include <rpcproxy.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 

diff --git a/reactos/dll/win32/msi/msipriv.h b/reactos/dll/win32/msi/msipriv.h
index cbb23dc..179c142 100644 (file)
--- a/reactos/dll/win32/msi/msipriv.h
+++ b/reactos/dll/win32/msi/msipriv.h
@@ -22,21 +22,35 @@
 #ifndef __WINE_MSI_PRIVATE__
 #define __WINE_MSI_PRIVATE__
 
+#include <config.h>
+
 #include <stdarg.h>
+#include <assert.h>
+
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define COBJMACROS
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 
-#include "windef.h"
+#include <windef.h>
 #include <winbase.h>
-#include "fdi.h"
-#include "msi.h"
+#include <winreg.h>
+#include <wincon.h>
+#include <winver.h>
 #include <msiquery.h>
 #include <msidefs.h>
-#include "objbase.h"
-#include "objidl.h"
+#include <objbase.h>
+#include <msiserver.h>
+#include <shlobj.h>
+#include <shlwapi.h>
 #include <fusion.h>
-#include "winnls.h"
-#include "winver.h"
+#include <sddl.h>
+
 #include <wine/list.h>
-#include "wine/debug.h"
+#include <wine/debug.h>
+#include <wine/unicode.h>
 
 static const BOOL is_64bit = sizeof(void *) > sizeof(int);
 BOOL is_wow64;
@@ -1251,4 +1265,6 @@ static inline LPWSTR strdupW( LPCWSTR src )
     return dest;
 }
 
+#include "query.h"
+
 #endif /* __WINE_MSI_PRIVATE__ */

diff --git a/reactos/dll/win32/msi/msiquery.c b/reactos/dll/win32/msi/msiquery.c
index cf8d893..002a164 100644 (file)
--- a/reactos/dll/win32/msi/msiquery.c
+++ b/reactos/dll/win32/msi/msiquery.c
@@ -18,30 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdarg.h>
-
-#define COBJMACROS
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
-//#include "msi.h"
-//#include "msiquery.h"
-//#include "objbase.h"
-//#include "objidl.h"
-//#include "msipriv.h"
-//#include "winnls.h"
-
-#include "query.h"
-#include <msiserver.h>
-
-//#include "initguid.h"
+#include "msipriv.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 

diff --git a/reactos/dll/win32/msi/package.c b/reactos/dll/win32/msi/package.c
index bfa6ed8..5034359 100644 (file)
--- a/reactos/dll/win32/msi/package.c
+++ b/reactos/dll/win32/msi/package.c
@@ -18,39 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-#define COBJMACROS
-
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-//#include "winnls.h"
-#include <shlwapi.h>
-#include <wingdi.h>
-#include <wincon.h>
-#include <wine/debug.h>
-//#include "msi.h"
-//#include "msiquery.h"
-//#include "objidl.h"
-//#include "wincrypt.h"
-//#include "winuser.h"
-#include <wininet.h>
-//#include "winver.h"
-//#include "urlmon.h"
-#include <shlobj.h>
-#include <wine/unicode.h>
-//#include "objbase.h"
-//#include "msidefs.h"
-#include <sddl.h>
-
 #include "msipriv.h"
-#include <msiserver.h>
+
+#include <wininet.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 

diff --git a/reactos/dll/win32/msi/patch.c b/reactos/dll/win32/msi/patch.c
index 7735589..24fa3a9 100644 (file)
--- a/reactos/dll/win32/msi/patch.c
+++ b/reactos/dll/win32/msi/patch.c
@@ -19,19 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
-#define COBJMACROS
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-#include <objbase.h>
-#include <shlwapi.h>
-#include <wine/debug.h>
-#include <wine/unicode.h>
 #include "msipriv.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);

diff --git a/reactos/dll/win32/msi/query.h b/reactos/dll/win32/msi/query.h
index c154b6c..73feac5 100644 (file)
--- a/reactos/dll/win32/msi/query.h
+++ b/reactos/dll/win32/msi/query.h
@@ -21,18 +21,6 @@
 #ifndef __WINE_MSI_QUERY_H
 #define __WINE_MSI_QUERY_H
 
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "objbase.h"
-//#include "objidl.h"
-//#include "msi.h"
-//#include "msiquery.h"
-#include "msipriv.h"
-//#include "wine/list.h"
-
-
 #define OP_EQ       1
 #define OP_AND      2
 #define OP_OR       3

diff --git a/reactos/dll/win32/msi/record.c b/reactos/dll/win32/msi/record.c
index ff2674a..792dc6e 100644 (file)
--- a/reactos/dll/win32/msi/record.c
+++ b/reactos/dll/win32/msi/record.c
@@ -18,31 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdarg.h>
-
-#define COBJMACROS
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winuser.h"
-//#include "winerror.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
-//#include "msi.h"
-//#include "msiquery.h"
 #include "msipriv.h"
-//#include "objidl.h"
-//#include "winnls.h"
-#include <ole2.h>
-
-#include <winreg.h>
-#include <shlwapi.h>
-
-//#include "query.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msidb);
 

diff --git a/reactos/dll/win32/msi/registry.c b/reactos/dll/win32/msi/registry.c
index 5b4bea5..afa2dfc 100644 (file)
--- a/reactos/dll/win32/msi/registry.c
+++ b/reactos/dll/win32/msi/registry.c
@@ -19,28 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdarg.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-
-#include <windef.h>
-//#include "winbase.h"
-#include <winreg.h>
-//#include "winnls.h"
-//#include "shlwapi.h"
-#include <wine/debug.h>
-//#include "msi.h"
 #include "msipriv.h"
-//#include "wincrypt.h"
-#include <wine/unicode.h>
-//#include "winver.h"
-//#include "winuser.h"
-#include <sddl.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 

diff --git a/reactos/dll/win32/msi/script.c b/reactos/dll/win32/msi/script.c
index 7f61d91..f700da7 100644 (file)
--- a/reactos/dll/win32/msi/script.c
+++ b/reactos/dll/win32/msi/script.c
@@ -18,25 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-
-#include <stdarg.h>
-#include <windef.h>
-//#include "winbase.h"
-//#include "winerror.h"
-//#include "winuser.h"
-//#include "msidefs.h"
 #include "msipriv.h"
-#include <activscp.h>
-#include <oleauto.h>
-#include <wine/debug.h>
-#include <wine/unicode.h>
 
-//#include "msiserver.h"
+#include <activscp.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 

diff --git a/reactos/dll/win32/msi/select.c b/reactos/dll/win32/msi/select.c
index cc63216..a285917 100644 (file)
--- a/reactos/dll/win32/msi/select.c
+++ b/reactos/dll/win32/msi/select.c
@@ -18,28 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-#include <wine/debug.h>
-//#include "msi.h"
-//#include "msiquery.h"
-//#include "objbase.h"
-//#include "objidl.h"
 #include "msipriv.h"
-//#include "winnls.h"
-
-//#include "query.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msidb);
 
-
 /* below is the query interface to a table */
 
 typedef struct tagMSISELECTVIEW

diff --git a/reactos/dll/win32/msi/source.c b/reactos/dll/win32/msi/source.c
index 6c70464..37cdec2 100644 (file)
--- a/reactos/dll/win32/msi/source.c
+++ b/reactos/dll/win32/msi/source.c
@@ -18,29 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdarg.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-
-#include <windef.h>
-//#include "winbase.h"
-#include <winreg.h>
-//#include "winnls.h"
-//#include "shlwapi.h"
-#include <wine/debug.h>
-//#include "msi.h"
-//#include "msiquery.h"
 #include "msipriv.h"
-//#include "wincrypt.h"
-//#include "winver.h"
-//#include "winuser.h"
-#include <wine/unicode.h>
-#include <sddl.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 

diff --git a/reactos/dll/win32/msi/sql.tab.c b/reactos/dll/win32/msi/sql.tab.c
index 27213d2..a60ec09 100644 (file)
--- a/reactos/dll/win32/msi/sql.tab.c
+++ b/reactos/dll/win32/msi/sql.tab.c
@@ -97,22 +97,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-
-#include <stdarg.h>
-//#include <stdio.h>
-//#include <stdlib.h>
-
-#include <windef.h>
-//#include "winbase.h"
-#include "query.h"
-//#include "wine/list.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
+#include "msipriv.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 

diff --git a/reactos/dll/win32/msi/storages.c b/reactos/dll/win32/msi/storages.c
index d3172cc..ef57633 100644 (file)
--- a/reactos/dll/win32/msi/storages.c
+++ b/reactos/dll/win32/msi/storages.c
@@ -18,26 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "winerror.h"
-#include <ole2.h>
-//#include "msi.h"
-//#include "msiquery.h"
-//#include "objbase.h"
 #include "msipriv.h"
-//#include "query.h"
-
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(msidb);
 

diff --git a/reactos/dll/win32/msi/streams.c b/reactos/dll/win32/msi/streams.c
index 51064ed..c4cee86 100644 (file)
--- a/reactos/dll/win32/msi/streams.c
+++ b/reactos/dll/win32/msi/streams.c
@@ -18,25 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdarg.h>
-
-#define COBJMACROS
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-//#include "msi.h"
-//#include "msiquery.h"
-//#include "objbase.h"
 #include "msipriv.h"
-//#include "query.h"
-
-#include <wine/debug.h>
-//#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msidb);
 

diff --git a/reactos/dll/win32/msi/string.c b/reactos/dll/win32/msi/string.c
index d71e6f1..0718866 100644 (file)
--- a/reactos/dll/win32/msi/string.c
+++ b/reactos/dll/win32/msi/string.c
@@ -20,28 +20,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-
-//#include <stdarg.h>
-//#include <assert.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
-//#include "msi.h"
-//#include "msiquery.h"
-//#include "objbase.h"
-//#include "objidl.h"
 #include "msipriv.h"
-//#include "winnls.h"
-
-//#include "query.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msidb);
 

diff --git a/reactos/dll/win32/msi/suminfo.c b/reactos/dll/win32/msi/suminfo.c
index d04e469..5d23ab6 100644 (file)
--- a/reactos/dll/win32/msi/suminfo.c
+++ b/reactos/dll/win32/msi/suminfo.c
@@ -18,31 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdarg.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-
-#include <windef.h>
-//#include "winbase.h"
-#include <winreg.h>
-//#include "winnls.h"
-//#include "shlwapi.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
-#include <objbase.h>
-//#include "objidl.h"
-#include <propvarutil.h>
-//#include "msi.h"
-//#include "msiquery.h"
-#include <msidefs.h>
 #include "msipriv.h"
 
-#include <msiserver.h>
+#include <propvarutil.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 

diff --git a/reactos/dll/win32/msi/table.c b/reactos/dll/win32/msi/table.c
index 75e9a19..87f7fbb 100644 (file)
--- a/reactos/dll/win32/msi/table.c
+++ b/reactos/dll/win32/msi/table.c
@@ -18,30 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdarg.h>
-#include <assert.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-//#include "msi.h"
-//#include "msiquery.h"
-//#include "objbase.h"
-//#include "objidl.h"
-//#include "winnls.h"
-//#include "msipriv.h"
-#include "query.h"
-
-#include <wine/debug.h>
-#include <wine/unicode.h>
+#include "msipriv.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msidb);
 

diff --git a/reactos/dll/win32/msi/tokenize.c b/reactos/dll/win32/msi/tokenize.c
index 28bdde3..d21d599 100644 (file)
--- a/reactos/dll/win32/msi/tokenize.c
+++ b/reactos/dll/win32/msi/tokenize.c
@@ -16,18 +16,7 @@
 ** parser for analysis.
 */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <ctype.h>
-//#include <stdarg.h>
-//#include <stdlib.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-#include <wine/unicode.h>
-#include "query.h"
+#include "msipriv.h"
 #include "sql.tab.h"
 
 /*

diff --git a/reactos/dll/win32/msi/update.c b/reactos/dll/win32/msi/update.c
index a29c2ba..b09c8ed 100644 (file)
--- a/reactos/dll/win32/msi/update.c
+++ b/reactos/dll/win32/msi/update.c
@@ -18,28 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-#include <wine/debug.h>
-//#include "msi.h"
-//#include "msiquery.h"
-//#include "objbase.h"
-//#include "objidl.h"
-//#include "msipriv.h"
-//#include "winnls.h"
-
-#include "query.h"
+#include "msipriv.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msidb);
 
-
 /* below is the query interface to a table */
 
 typedef struct tagMSIUPDATEVIEW

diff --git a/reactos/dll/win32/msi/upgrade.c b/reactos/dll/win32/msi/upgrade.c
index fe56718..445d33a 100644 (file)
--- a/reactos/dll/win32/msi/upgrade.c
+++ b/reactos/dll/win32/msi/upgrade.c
@@ -26,21 +26,7 @@
  * RemoveExistingProducts (TODO)
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdarg.h>
-
-#include <windef.h>
-//#include "winbase.h"
-//#include "winerror.h"
-#include <winreg.h>
-#include <wine/debug.h>
-//#include "msidefs.h"
 #include "msipriv.h"
-//#include "winuser.h"
-#include <wine/unicode.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 

diff --git a/reactos/dll/win32/msi/where.c b/reactos/dll/win32/msi/where.c
index e283924..9ce7eaa 100644 (file)
--- a/reactos/dll/win32/msi/where.c
+++ b/reactos/dll/win32/msi/where.c
@@ -19,26 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdarg.h>
-#include <assert.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
-//#include "msi.h"
-//#include "msiquery.h"
-//#include "objbase.h"
-//#include "objidl.h"
-//#include "msipriv.h"
-//#include "winnls.h"
-
-#include "query.h"
+#include "msipriv.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msidb);