* Create a main header and move some inclusions to it.
* Remove inclusions and definitions that already exist in the main header.
CORE-7716
svn path=/trunk/; revision=61429
* comments just above that function for information.
*/
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
+#include "precomp.h"
#include <assert.h>
-#include <stdarg.h>
-//#include <string.h>
-
-#define COBJMACROS
-
-//#include "winerror.h"
-#include <windef.h>
-#include <winbase.h>
-//#include "wingdi.h"
-//#include "winuser.h"
-#include <ole2.h>
-#include <olectl.h>
-//#include "connpt.h"
-
-#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(ole);
*
*/
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-//#include <stdlib.h>
-//#include <string.h>
-#include <stdarg.h>
-//#include <stdio.h>
-//#include <ctype.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
-#include <oleauto.h>
-//#include "winerror.h"
-
-#include <wine/debug.h>
+#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);
* 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
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <winnls.h>
-#include <objbase.h>
-//#include "oaidl.h"
-#include <wine/debug.h>
+#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
STRINGTABLE
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
LANGUAGE LANG_WELSH, SUBLANG_DEFAULT
STRINGTABLE
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
STRINGTABLE
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
STRINGTABLE
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
#pragma code_page(65001)
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
STRINGTABLE
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
STRINGTABLE
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
STRINGTABLE
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
STRINGTABLE
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
STRINGTABLE
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
STRINGTABLE
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
STRINGTABLE
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
STRINGTABLE
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
/* UTF-8 */
#pragma code_page(65001)
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
STRINGTABLE
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
STRINGTABLE
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
STRINGTABLE
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
STRINGTABLE
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
#pragma code_page(65001)
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
/* UTF-8 */
#pragma code_page(65001)
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
#pragma code_page(65001)
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
STRINGTABLE
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
LANGUAGE LANG_THAI, SUBLANG_DEFAULT
STRINGTABLE
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
STRINGTABLE
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
/* UTF-8 */
#pragma code_page(65001)
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
/* Chinese text is encoded in UTF-8 */
#pragma code_page(65001)
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
+#include "precomp.h"
-#include <stdarg.h>
-//#include <string.h>
-//#include <limits.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-//#include "winuser.h"
-//#include "winerror.h"
-
-#include <ole2.h>
-#include <olectl.h>
-//#include "oleauto.h"
#include <initguid.h>
-#include "typelib.h"
#include <oleaut32_oaidl.h>
-#include <wine/debug.h>
-//#include "wine/unicode.h"
+#include "typelib.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);
WINE_DECLARE_DEBUG_CHANNEL(heap);
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-//#include "windef.h"
-//#include "winbase.h"
-//#include "resource.h"
+#include <windef.h>
+
+#include "resource.h"
#ifdef LANGUAGE_BG_BG
#include "lang/oleaut32_Bg.rc"
* 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
-
-//#include <assert.h>
-//#include <stdarg.h>
-#include <string.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-//#include "winerror.h"
-#include <windef.h>
-//#include "winbase.h"
-#include <wingdi.h>
-//#include "winuser.h"
+
+#include "precomp.h"
+
#include <wine/list.h>
-#include <wine/unicode.h>
-#include <objbase.h>
-#include <oleauto.h> /* for SysAllocString(....) */
-//#include "ole2.h"
-#include <olectl.h>
-#include <wine/debug.h>
-#include "connpt.h" /* for CreateConnectionPoint */
-//#include "oaidl.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);
*
*/
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-//#include "wine/port.h"
+#include "precomp.h"
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
-//#include <stdarg.h>
-#include <stdio.h>
-//#include <string.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-//#include "winerror.h"
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-//#include "winuser.h"
+
#include <ole2.h>
-#include <olectl.h>
-//#include "oleauto.h"
-#include "connpt.h"
-//#include "urlmon.h"
#include <initguid.h>
#include <wincodec.h>
-#include <wine/debug.h>
-#include <wine/unicode.h>
-//#include "wine/library.h"
WINE_DEFAULT_DEBUG_CHANNEL(olepicture);
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
+#include "precomp.h"
-#include <stdarg.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <ole2.h>
-#include <olectl.h>
#include <oledlg.h>
-#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(ole);
--- /dev/null
+#ifndef _OLEAUT32_PCH_
+#define _OLEAUT32_PCH_
+
+#include <config.h>
+
+#include <stdarg.h>
+#include <stdio.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+
+#define COBJMACROS
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
+#include <windef.h>
+#include <winbase.h>
+#include <wingdi.h>
+#include <winreg.h>
+#include <objbase.h>
+#include <olectl.h>
+#include <oleauto.h>
+
+#include <wine/debug.h>
+#include <wine/unicode.h>
+
+#include "connpt.h"
+#include "variant.h"
+
+#endif /* _OLEAUT32_PCH_ */
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
-//#include "oaidl.h"
-#include <oleauto.h>
-
-#include <wine/unicode.h>
-#include <wine/debug.h>
+#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+
#ifndef WINE_OLEAUT32_RESOURCE_H
#define WINE_OLEAUT32_RESOURCE_H
-#include <windef.h>
-
/* Localised boolean text */
#define IDS_TRUE 100
#define IDS_FALSE 101
* 0x10: SAFEARRAYBOUNDS[0...]
*/
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-//#include <string.h>
-#include <stdarg.h>
-//#include <stdio.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-//#include "winerror.h"
-#include <winbase.h>
-#include <variant.h>
-#include <wine/debug.h>
+#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(variant);
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-//#include "wine/port.h"
-
-#include <assert.h>
-//#include <stdlib.h>
-//#include <string.h>
-//#include <stdarg.h>
-#include <stdio.h>
-//#include <ctype.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-//#include "winerror.h"
-#include <windef.h>
-#include <winbase.h>
-#include <winnls.h>
-#include <winreg.h>
-//#include "winuser.h"
+#include "precomp.h"
#include <ole2.h>
-//#include "propidl.h" /* for LPSAFEARRAY_User* functions */
+
#include "typelib.h"
-#include "variant.h"
-#include <wine/debug.h>
+
#include <wine/exception.h>
static const WCHAR IDispatchW[] = { 'I','D','i','s','p','a','t','c','h',0};
*
*/
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-//#include "wine/port.h"
-
-//#include <stdlib.h>
-//#include <string.h>
-//#include <stdarg.h>
-#include <stdio.h>
-//#include <ctype.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <winerror.h>
-#include <windef.h>
-#include <winbase.h>
-//#include "winnls.h"
-#include <winreg.h>
-#include <winuser.h>
+#include "precomp.h"
+
#include <winternl.h>
#include <lzexpand.h>
-#include <wine/unicode.h>
-#include <objbase.h>
#include "typelib.h"
-#include <wine/debug.h>
-#include "variant.h"
+
#include <wine/list.h>
WINE_DEFAULT_DEBUG_CHANNEL(ole);
#ifndef _WINE_TYPELIB_H
#define _WINE_TYPELIB_H
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-#include <oleauto.h>
-
#define HELPDLLFLAG (0x0100)
#define DO_NOT_SEEK (-1)
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-//#include <string.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-#include <winbase.h>
-//#include "wingdi.h"
-//#include "winuser.h"
-//#include "winerror.h"
+#include "precomp.h"
#include <ole2.h>
-//#include "oleauto.h"
-//#include "typelib.h"
-#include <ocidl.h>
-#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(ole);
* Please submit a test case if you find a difference.
*/
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-//#include <string.h>
-//#include <stdlib.h>
-//#include <stdarg.h>
-//#include <stdio.h>
-
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-//#include "windef.h"
-//#include "winbase.h"
-#include <wine/unicode.h>
-//#include "winerror.h"
-#include "variant.h"
-#include <wine/debug.h>
+#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(variant);
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
+#include "precomp.h"
-#include <config.h>
-
-//#include <string.h>
-//#include <stdlib.h>
-//#include <stdarg.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-//#include "windef.h"
-//#include "winbase.h"
-#include <wine/unicode.h>
-//#include "winerror.h"
-#include "variant.h"
#include "resource.h"
-#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(variant);
* 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 NONAMELESSUNION
-#define NONAMELESSSTRUCT
-//#include "windef.h"
-//#include "winerror.h"
-#include <objbase.h>
-#include <oleauto.h>
+
+#pragma once
+
#include <math.h>
/* Get just the type from a variant pointer */
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <wine/debug.h>
-#include <wine/unicode.h>
-//#include "winbase.h"
-#include <winuser.h>
-//#include "winnt.h"
-#include "variant.h"
+#include "precomp.h"
+
#include "resource.h"
WINE_DEFAULT_DEBUG_CHANNEL(variant);