[ros-diffs] [akhaldi] 61416: [MSI] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716

Author: akhaldi
Date: Wed Dec 25 20:42:59 2013
New Revision: 61416

URL: http://svn.reactos.org/svn/reactos?rev=61416&view=rev
Log:
[MSI]
* Move some inclusions to the main header.
* Remove inclusions and definitions that already exist in the main header.
CORE-7716

Modified:
    trunk/reactos/dll/win32/msi/CMakeLists.txt
    trunk/reactos/dll/win32/msi/action.c
    trunk/reactos/dll/win32/msi/alter.c
    trunk/reactos/dll/win32/msi/appsearch.c
    trunk/reactos/dll/win32/msi/assembly.c
    trunk/reactos/dll/win32/msi/automation.c
    trunk/reactos/dll/win32/msi/classes.c
    trunk/reactos/dll/win32/msi/cond.tab.c
    trunk/reactos/dll/win32/msi/create.c
    trunk/reactos/dll/win32/msi/custom.c
    trunk/reactos/dll/win32/msi/database.c
    trunk/reactos/dll/win32/msi/delete.c
    trunk/reactos/dll/win32/msi/dialog.c
    trunk/reactos/dll/win32/msi/distinct.c
    trunk/reactos/dll/win32/msi/drop.c
    trunk/reactos/dll/win32/msi/files.c
    trunk/reactos/dll/win32/msi/font.c
    trunk/reactos/dll/win32/msi/format.c
    trunk/reactos/dll/win32/msi/handle.c
    trunk/reactos/dll/win32/msi/insert.c
    trunk/reactos/dll/win32/msi/install.c
    trunk/reactos/dll/win32/msi/media.c
    trunk/reactos/dll/win32/msi/msi.c
    trunk/reactos/dll/win32/msi/msi_main.c
    trunk/reactos/dll/win32/msi/msipriv.h
    trunk/reactos/dll/win32/msi/msiquery.c
    trunk/reactos/dll/win32/msi/package.c
    trunk/reactos/dll/win32/msi/patch.c
    trunk/reactos/dll/win32/msi/query.h
    trunk/reactos/dll/win32/msi/record.c
    trunk/reactos/dll/win32/msi/registry.c
    trunk/reactos/dll/win32/msi/script.c
    trunk/reactos/dll/win32/msi/select.c
    trunk/reactos/dll/win32/msi/source.c
    trunk/reactos/dll/win32/msi/sql.tab.c
    trunk/reactos/dll/win32/msi/storages.c
    trunk/reactos/dll/win32/msi/streams.c
    trunk/reactos/dll/win32/msi/string.c
    trunk/reactos/dll/win32/msi/suminfo.c
    trunk/reactos/dll/win32/msi/table.c
    trunk/reactos/dll/win32/msi/tokenize.c
    trunk/reactos/dll/win32/msi/update.c
    trunk/reactos/dll/win32/msi/upgrade.c
    trunk/reactos/dll/win32/msi/where.c

Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/CMakeLists.t…
==============================================================================
--- trunk/reactos/dll/win32/msi/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/CMakeLists.txt	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -56,10 +56,6 @@
     ${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)

Modified: trunk/reactos/dll/win32/msi/action.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev…
==============================================================================
--- trunk/reactos/dll/win32/msi/action.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/action.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -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 <windef.h>
-//#include "winbase.h"
-//#include "winerror.h"
-#include <winreg.h>
+#include "msipriv.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

Modified: trunk/reactos/dll/win32/msi/alter.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/alter.c?rev=…
==============================================================================
--- trunk/reactos/dll/win32/msi/alter.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/alter.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/msi/appsearch.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/appsearch.c?…
==============================================================================
--- trunk/reactos/dll/win32/msi/appsearch.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/appsearch.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -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);

Modified: trunk/reactos/dll/win32/msi/assembly.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/assembly.c?r…
==============================================================================
--- trunk/reactos/dll/win32/msi/assembly.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/assembly.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -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);

Modified: trunk/reactos/dll/win32/msi/automation.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/automation.c…
==============================================================================
--- trunk/reactos/dll/win32/msi/automation.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/automation.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -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);

Modified: trunk/reactos/dll/win32/msi/classes.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/classes.c?re…
==============================================================================
--- trunk/reactos/dll/win32/msi/classes.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/classes.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/msi/cond.tab.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/cond.tab.c?r…
==============================================================================
--- trunk/reactos/dll/win32/msi/cond.tab.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/cond.tab.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/msi/create.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/create.c?rev…
==============================================================================
--- trunk/reactos/dll/win32/msi/create.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/create.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -18,28 +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>
-
-//#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 */
 

Modified: trunk/reactos/dll/win32/msi/custom.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/custom.c?rev…
==============================================================================
--- trunk/reactos/dll/win32/msi/custom.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/custom.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -18,28 +18,13 @@
  * 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);
 

Modified: trunk/reactos/dll/win32/msi/database.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/database.c?r…
==============================================================================
--- trunk/reactos/dll/win32/msi/database.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/database.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -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>
+#include "msipriv.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);
 

Modified: trunk/reactos/dll/win32/msi/delete.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/delete.c?rev…
==============================================================================
--- trunk/reactos/dll/win32/msi/delete.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/delete.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -18,27 +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>
-
-//#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.

Modified: trunk/reactos/dll/win32/msi/dialog.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/dialog.c?rev…
==============================================================================
--- trunk/reactos/dll/win32/msi/dialog.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/dialog.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -19,35 +19,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
-
-#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);
 

Modified: trunk/reactos/dll/win32/msi/distinct.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/distinct.c?r…
==============================================================================
--- trunk/reactos/dll/win32/msi/distinct.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/distinct.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/msi/drop.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/drop.c?rev=6…
==============================================================================
--- trunk/reactos/dll/win32/msi/drop.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/drop.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/msi/files.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/files.c?rev=…
==============================================================================
--- trunk/reactos/dll/win32/msi/files.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/files.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/msi/font.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/font.c?rev=6…
==============================================================================
--- trunk/reactos/dll/win32/msi/font.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/font.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/msi/format.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/format.c?rev…
==============================================================================
--- trunk/reactos/dll/win32/msi/format.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/format.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/msi/handle.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/handle.c?rev…
==============================================================================
--- trunk/reactos/dll/win32/msi/handle.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/handle.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -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);

Modified: trunk/reactos/dll/win32/msi/insert.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/insert.c?rev…
==============================================================================
--- trunk/reactos/dll/win32/msi/insert.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/insert.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -18,28 +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>
-
-//#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 */
 

Modified: trunk/reactos/dll/win32/msi/install.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/install.c?re…
==============================================================================
--- trunk/reactos/dll/win32/msi/install.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/install.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/msi/media.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/media.c?rev=…
==============================================================================
--- trunk/reactos/dll/win32/msi/media.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/media.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/msi/msi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.c?rev=61…
==============================================================================
--- trunk/reactos/dll/win32/msi/msi.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/msi.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -18,39 +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
-#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 <initguid.h>
 #include <msxml2.h>
-
-#include <wine/debug.h>
-#include <wine/unicode.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 

Modified: trunk/reactos/dll/win32/msi/msi_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_main.c?r…
==============================================================================
--- trunk/reactos/dll/win32/msi/msi_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/msi_main.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -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 "msipriv.h"
+
 #include <rpcproxy.h>
-#include "msipriv.h"
-#include <msiserver.h>
-
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 

Modified: trunk/reactos/dll/win32/msi/msipriv.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msipriv.h?re…
==============================================================================
--- trunk/reactos/dll/win32/msi/msipriv.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/msipriv.h	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -22,21 +22,35 @@
 #ifndef __WINE_MSI_PRIVATE__
 #define __WINE_MSI_PRIVATE__
 
+#include <config.h>
+
 #include <stdarg.h>
-
-#include "windef.h"
+#include <assert.h>
+
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define COBJMACROS
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
+#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 @@
     return dest;
 }
 
+#include "query.h"
+
 #endif /* __WINE_MSI_PRIVATE__ */

Modified: trunk/reactos/dll/win32/msi/msiquery.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiquery.c?r…
==============================================================================
--- trunk/reactos/dll/win32/msi/msiquery.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/msiquery.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/msi/package.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/package.c?re…
==============================================================================
--- trunk/reactos/dll/win32/msi/package.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/package.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -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 "msipriv.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>
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 

Modified: trunk/reactos/dll/win32/msi/patch.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/patch.c?rev=…
==============================================================================
--- trunk/reactos/dll/win32/msi/patch.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/patch.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -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);

Modified: trunk/reactos/dll/win32/msi/query.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/query.h?rev=…
==============================================================================
--- trunk/reactos/dll/win32/msi/query.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/query.h	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -20,18 +20,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

Modified: trunk/reactos/dll/win32/msi/record.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/record.c?rev…
==============================================================================
--- trunk/reactos/dll/win32/msi/record.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/record.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/msi/registry.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/registry.c?r…
==============================================================================
--- trunk/reactos/dll/win32/msi/registry.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/registry.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/msi/script.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/script.c?rev…
==============================================================================
--- trunk/reactos/dll/win32/msi/script.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/script.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -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"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 

Modified: trunk/reactos/dll/win32/msi/select.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/select.c?rev…
==============================================================================
--- trunk/reactos/dll/win32/msi/select.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/select.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -18,27 +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>
-
-//#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 */
 

Modified: trunk/reactos/dll/win32/msi/source.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/source.c?rev…
==============================================================================
--- trunk/reactos/dll/win32/msi/source.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/source.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/msi/sql.tab.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/sql.tab.c?re…
==============================================================================
--- trunk/reactos/dll/win32/msi/sql.tab.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/sql.tab.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/msi/storages.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/storages.c?r…
==============================================================================
--- trunk/reactos/dll/win32/msi/storages.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/storages.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/msi/streams.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/streams.c?re…
==============================================================================
--- trunk/reactos/dll/win32/msi/streams.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/streams.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/msi/string.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/string.c?rev…
==============================================================================
--- trunk/reactos/dll/win32/msi/string.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/string.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/msi/suminfo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/suminfo.c?re…
==============================================================================
--- trunk/reactos/dll/win32/msi/suminfo.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/suminfo.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -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 "msipriv.h"
+
 #include <propvarutil.h>
-//#include "msi.h"
-//#include "msiquery.h"
-#include <msidefs.h>
-#include "msipriv.h"
-
-#include <msiserver.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 

Modified: trunk/reactos/dll/win32/msi/table.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/table.c?rev=…
==============================================================================
--- trunk/reactos/dll/win32/msi/table.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/table.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/msi/tokenize.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/tokenize.c?r…
==============================================================================
--- trunk/reactos/dll/win32/msi/tokenize.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/tokenize.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -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"
 
 /*

Modified: trunk/reactos/dll/win32/msi/update.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/update.c?rev…
==============================================================================
--- trunk/reactos/dll/win32/msi/update.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/update.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -18,27 +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>
-
-//#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 */
 

Modified: trunk/reactos/dll/win32/msi/upgrade.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/upgrade.c?re…
==============================================================================
--- trunk/reactos/dll/win32/msi/upgrade.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/upgrade.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -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);
 

Modified: trunk/reactos/dll/win32/msi/where.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/where.c?rev=…
==============================================================================
--- trunk/reactos/dll/win32/msi/where.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/where.c	[iso-8859-1] Wed Dec 25 20:42:59 2013
@@ -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);