Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 19:22:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

[OLEAUT32]

Browse source 
* 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
This commit is contained in:
Amine Khaldi 2013-12-26 18:50:10 +00:00
parent eada6279cd
commit 1129d0f099
46 changed files with 56 additions and 347 deletions
Download patch file Download diff file Expand all files Collapse all files

18
reactos/dll/win32/oleaut32/connpt.c
View file

@ -22,25 +22,9 @@
* comments just above that function for information. * comments just above that function for information.
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#define _INC_WINDOWS
#include <assert.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); WINE_DEFAULT_DEBUG_CHANNEL(ole);

21
reactos/dll/win32/oleaut32/dispatch.c
View file

@ -19,26 +19,7 @@
* *
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#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>
WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DEFAULT_DEBUG_CHANNEL(ole);

11
reactos/dll/win32/oleaut32/hash.c
View file

@ -18,17 +18,8 @@
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h> #include "precomp.h"
#include <windef.h>
#include <winbase.h>
#include <winnls.h>
#include <objbase.h>
//#include "oaidl.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DEFAULT_DEBUG_CHANNEL(ole);

2
reactos/dll/win32/oleaut32/lang/oleaut32_Bg.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "resource.h"
LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/oleaut32/lang/oleaut32_Cy.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "resource.h"
LANGUAGE LANG_WELSH, SUBLANG_DEFAULT LANGUAGE LANG_WELSH, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/oleaut32/lang/oleaut32_Cz.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "resource.h"
LANGUAGE LANG_CZECH, SUBLANG_DEFAULT LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/oleaut32/lang/oleaut32_Da.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "resource.h"
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/oleaut32/lang/oleaut32_De.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "resource.h"
#pragma code_page(65001) #pragma code_page(65001)
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL

2
reactos/dll/win32/oleaut32/lang/oleaut32_El.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "resource.h"
LANGUAGE LANG_GREEK, SUBLANG_DEFAULT LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/oleaut32/lang/oleaut32_En.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "resource.h"
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/oleaut32/lang/oleaut32_Es.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "resource.h"
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/oleaut32/lang/oleaut32_Fr.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "resource.h"
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/oleaut32/lang/oleaut32_He.rc
View file

@ -20,8 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "resource.h"
LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/oleaut32/lang/oleaut32_Hu.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "resource.h"
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/oleaut32/lang/oleaut32_It.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "resource.h"
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/oleaut32/lang/oleaut32_Ko.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "resource.h"
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/oleaut32/lang/oleaut32_Lt.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "resource.h"
/* UTF-8 */ /* UTF-8 */
#pragma code_page(65001) #pragma code_page(65001)

2
reactos/dll/win32/oleaut32/lang/oleaut32_Nl.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "resource.h"
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/oleaut32/lang/oleaut32_No.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "resource.h"
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/oleaut32/lang/oleaut32_Pl.rc
View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "resource.h"
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/oleaut32/lang/oleaut32_Pt.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "resource.h"
LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/oleaut32/lang/oleaut32_Ro.rc
View file

@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "resource.h"
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
#pragma code_page(65001) #pragma code_page(65001)

2
reactos/dll/win32/oleaut32/lang/oleaut32_Ru.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "resource.h"
/* UTF-8 */ /* UTF-8 */
#pragma code_page(65001) #pragma code_page(65001)

2
reactos/dll/win32/oleaut32/lang/oleaut32_Si.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "resource.h"
#pragma code_page(65001) #pragma code_page(65001)
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT

2
reactos/dll/win32/oleaut32/lang/oleaut32_Sv.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "resource.h"
LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/oleaut32/lang/oleaut32_Th.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "resource.h"
LANGUAGE LANG_THAI, SUBLANG_DEFAULT LANGUAGE LANG_THAI, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/oleaut32/lang/oleaut32_Tr.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "resource.h"
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE

2
reactos/dll/win32/oleaut32/lang/oleaut32_Uk.rc
View file

@ -20,8 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "resource.h"
/* UTF-8 */ /* UTF-8 */
#pragma code_page(65001) #pragma code_page(65001)

2
reactos/dll/win32/oleaut32/lang/oleaut32_Zh.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "resource.h"
/* Chinese text is encoded in UTF-8 */ /* Chinese text is encoded in UTF-8 */
#pragma code_page(65001) #pragma code_page(65001)

22
reactos/dll/win32/oleaut32/oleaut.c
View file

@ -18,30 +18,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#define _INC_WINDOWS
#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 <initguid.h>
#include "typelib.h"
#include <oleaut32_oaidl.h> #include <oleaut32_oaidl.h>
#include <wine/debug.h> #include "typelib.h"
//#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DEFAULT_DEBUG_CHANNEL(ole);
WINE_DECLARE_DEBUG_CHANNEL(heap); WINE_DECLARE_DEBUG_CHANNEL(heap);

6
reactos/dll/win32/oleaut32/oleaut32.rc
View file

@ -18,9 +18,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
//#include "windef.h" #include <windef.h>
//#include "winbase.h"
//#include "resource.h" #include "resource.h"
#ifdef LANGUAGE_BG_BG #ifdef LANGUAGE_BG_BG
#include "lang/oleaut32_Bg.rc" #include "lang/oleaut32_Bg.rc"

23
reactos/dll/win32/oleaut32/olefont.c
View file

@ -21,31 +21,10 @@
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WIN32_NO_STATUS
#define _INC_WINDOWS
//#include <assert.h> #include "precomp.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 <wine/list.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); WINE_DEFAULT_DEBUG_CHANNEL(ole);

25
reactos/dll/win32/oleaut32/olepicture.c
View file

@ -36,38 +36,15 @@
* *
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#define _INC_WINDOWS
#include <config.h>
//#include "wine/port.h"
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
# include <unistd.h> # include <unistd.h>
#endif #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 <ole2.h>
#include <olectl.h>
//#include "oleauto.h"
#include "connpt.h"
//#include "urlmon.h"
#include <initguid.h> #include <initguid.h>
#include <wincodec.h> #include <wincodec.h>
#include <wine/debug.h>
#include <wine/unicode.h>
//#include "wine/library.h"
WINE_DEFAULT_DEBUG_CHANNEL(olepicture); WINE_DEFAULT_DEBUG_CHANNEL(olepicture);

15
reactos/dll/win32/oleaut32/olepropframe.c
View file

@ -19,22 +19,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#define _INC_WINDOWS
#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 <oledlg.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DEFAULT_DEBUG_CHANNEL(ole);

30
reactos/dll/win32/oleaut32/precomp.h Normal file
View file

@ -0,0 +1,30 @@
#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_ */

18
reactos/dll/win32/oleaut32/recinfo.c
View file

@ -16,23 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#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>
WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DEFAULT_DEBUG_CHANNEL(ole);

3
reactos/dll/win32/oleaut32/resource.h
View file

@ -17,11 +17,10 @@
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef WINE_OLEAUT32_RESOURCE_H #ifndef WINE_OLEAUT32_RESOURCE_H
#define WINE_OLEAUT32_RESOURCE_H #define WINE_OLEAUT32_RESOURCE_H
#include <windef.h>
/* Localised boolean text */ /* Localised boolean text */
#define IDS_TRUE 100 #define IDS_TRUE 100
#define IDS_FALSE 101 #define IDS_FALSE 101

17
reactos/dll/win32/oleaut32/safearray.c
View file

@ -31,22 +31,7 @@
* 0x10: SAFEARRAYBOUNDS[0...] * 0x10: SAFEARRAYBOUNDS[0...]
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#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>
WINE_DEFAULT_DEBUG_CHANNEL(variant); WINE_DEFAULT_DEBUG_CHANNEL(variant);

29
reactos/dll/win32/oleaut32/tmarshal.c
View file

@ -21,35 +21,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#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 <ole2.h> #include <ole2.h>
//#include "propidl.h" /* for LPSAFEARRAY_User* functions */
#include "typelib.h" #include "typelib.h"
#include "variant.h"
#include <wine/debug.h>
#include <wine/exception.h> #include <wine/exception.h>
static const WCHAR IDispatchW[] = { 'I','D','i','s','p','a','t','c','h',0}; static const WCHAR IDispatchW[] = { 'I','D','i','s','p','a','t','c','h',0};

27
reactos/dll/win32/oleaut32/typelib.c
View file

@ -47,36 +47,13 @@
* *
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#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 <winternl.h> #include <winternl.h>
#include <lzexpand.h> #include <lzexpand.h>
#include <wine/unicode.h>
#include <objbase.h>
#include "typelib.h" #include "typelib.h"
#include <wine/debug.h>
#include "variant.h"
#include <wine/list.h> #include <wine/list.h>
WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DEFAULT_DEBUG_CHANNEL(ole);

6
reactos/dll/win32/oleaut32/typelib.h
View file

@ -21,12 +21,6 @@
#ifndef _WINE_TYPELIB_H #ifndef _WINE_TYPELIB_H
#define _WINE_TYPELIB_H #define _WINE_TYPELIB_H
//#include <stdarg.h>
//#include "windef.h"
//#include "winbase.h"
#include <oleauto.h>
#define HELPDLLFLAG (0x0100) #define HELPDLLFLAG (0x0100)
#define DO_NOT_SEEK (-1) #define DO_NOT_SEEK (-1)

20
reactos/dll/win32/oleaut32/usrmarshal.c
View file

@ -19,27 +19,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#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 <ole2.h> #include <ole2.h>
//#include "oleauto.h"
//#include "typelib.h"
#include <ocidl.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DEFAULT_DEBUG_CHANNEL(ole);

19
reactos/dll/win32/oleaut32/varformat.c
View file

@ -25,24 +25,7 @@
* Please submit a test case if you find a difference. * Please submit a test case if you find a difference.
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#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>
WINE_DEFAULT_DEBUG_CHANNEL(variant); WINE_DEFAULT_DEBUG_CHANNEL(variant);

19
reactos/dll/win32/oleaut32/variant.c
View file

@ -25,26 +25,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#define _INC_WINDOWS
#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 "resource.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(variant); WINE_DEFAULT_DEBUG_CHANNEL(variant);

9
reactos/dll/win32/oleaut32/variant.h
View file

@ -17,12 +17,9 @@
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define NONAMELESSUNION
#define NONAMELESSSTRUCT #pragma once
//#include "windef.h"
//#include "winerror.h"
#include <objbase.h>
#include <oleauto.h>
#include <math.h> #include <math.h>
/* Get just the type from a variant pointer */ /* Get just the type from a variant pointer */

13
reactos/dll/win32/oleaut32/vartype.c
View file

@ -18,19 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#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 "resource.h" #include "resource.h"
WINE_DEFAULT_DEBUG_CHANNEL(variant); WINE_DEFAULT_DEBUG_CHANNEL(variant);