Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-28 17:01:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

[OLE32]

Browse source 
* Create a main header and move some inclusions to it.
* Remove inclusions and definitions that already exist in the main header.
* Improve the GUIDs situation.
CORE-7716

svn path=/trunk/; revision=61427
This commit is contained in:
Amine Khaldi 2013-12-26 16:07:35 +00:00
parent 665b30366a
commit 56f0833252
42 changed files with 95 additions and 729 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reactos/dll/win32/ole32/CMakeLists.txt
View file

@ -59,6 +59,7 @@ list(APPEND SOURCE
storage32.c
stubmanager.c
usrmarshal.c
guid.c
${CMAKE_CURRENT_BINARY_DIR}/dcom_i.c
${CMAKE_CURRENT_BINARY_DIR}/dcom_p.c
${CMAKE_CURRENT_BINARY_DIR}/irot_c.c
@ -69,11 +70,8 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c
${CMAKE_CURRENT_BINARY_DIR}/ole32.def)
if(MSVC)
if(ARCH STREQUAL "i386")
list(APPEND SOURCE msvc-thiscall.c)
endif()
set_source_files_properties(stg_prop.c PROPERTIES COMPILE_FLAGS "/FImsvc.h")
if(MSVC AND (ARCH STREQUAL "i386"))
list(APPEND SOURCE msvc-thiscall.c)
endif()
add_library(ole32 SHARED ${SOURCE} ole32res.rc)

18
reactos/dll/win32/ole32/antimoniker.c
View file

@ -18,23 +18,7 @@
* 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 <windef.h>
#include <winbase.h>
//#include "winerror.h"
#include <objbase.h>
#include <wine/debug.h>
#include "moniker.h"
#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);

16
reactos/dll/win32/ole32/bindctx.c
View file

@ -18,21 +18,7 @@
* 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
//#include "winerror.h"
#include <windef.h>
#include <winbase.h>
#include <winnls.h>
#include <objbase.h>
#include <wine/debug.h>
#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);

20
reactos/dll/win32/ole32/classmoniker.c
View file

@ -19,25 +19,7 @@
* 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 "winuser.h"
#include <wine/debug.h>
#include <ole2.h>
#include <wine/unicode.h>
#include "moniker.h"
#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);

25
reactos/dll/win32/ole32/clipboard.c
View file

@ -58,32 +58,9 @@
*
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
//#include <assert.h>
//#include <stdarg.h>
//#include <string.h>
#include <stdio.h>
#define COBJMACROS
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include <windef.h>
#include <winbase.h>
#include <wingdi.h>
//#include "winuser.h"
//#include "winerror.h"
#include <winnls.h>
#include <ole2.h>
#include <wine/debug.h>
//#include "olestd.h"
#include "precomp.h"
#include "storage32.h"
#include "compobj_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);
#define HANDLE_ERROR(err) do { hr = err; TRACE("(HRESULT=%x)\n", (HRESULT)err); goto CLEANUP; } while (0)

21
reactos/dll/win32/ole32/comcat.c
View file

@ -18,26 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
//#include <string.h>
#include <stdarg.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
//#include "winreg.h"
//#include "winerror.h"
#include <ole2.h>
#include <comcat.h>
#include "compobj_private.h"
#include <wine/unicode.h>
#include <wine/debug.h>
#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);

31
reactos/dll/win32/ole32/compobj.c
View file

@ -36,39 +36,10 @@
*
*/
#include <config.h>
#include "precomp.h"
#include <stdarg.h>
//#include <stdio.h>
//#include <string.h>
#include <assert.h>
#define COBJMACROS
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include <ntstatus.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <windef.h>
#include <winbase.h>
//#include "winerror.h"
//#include "winreg.h"
//#include "winuser.h"
#define USE_COM_CONTEXT_DEF
//#include "objbase.h"
#include <ole2.h>
#include <ole2ver.h>
#include <ctxtcall.h>
#include <dde.h>
#include <servprov.h>
#include <initguid.h>
#include "compobj_private.h"
#include "moniker.h"
#include <wine/unicode.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(ole);

11
reactos/dll/win32/ole32/compobj_private.h
View file

@ -27,17 +27,6 @@
/* All private prototype functions used by OLE will be added to this header file */
#include <stdarg.h>
#include <wine/list.h>
#include "windef.h"
#include "winbase.h"
#include "wtypes.h"
#include <dcom.h>
#include "winreg.h"
#include <winternl.h>
struct apartment;
typedef struct apartment APARTMENT;
typedef struct LocalServer LocalServer;

20
reactos/dll/win32/ole32/compositemoniker.c
View file

@ -18,25 +18,7 @@
* 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 <windef.h>
#include <winbase.h>
//#include "winuser.h"
//#include "winerror.h"
#include <wine/debug.h>
#include <wine/unicode.h>
#include <ole2.h>
#include "moniker.h"
#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);

19
reactos/dll/win32/ole32/datacache.c
View file

@ -43,25 +43,8 @@
* header. I was able to figure-out where the extent of the object
* was stored and the aspect, but that's about it.
*/
#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 <wine/unicode.h>
#include <ole2.h>
#include <wine/list.h>
#include <wine/debug.h>
#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);

19
reactos/dll/win32/ole32/defaulthandler.c
View file

@ -45,27 +45,10 @@
* - All the methods related to notification and advise sinks are
* in place but no notifications are sent to the sinks yet.
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
//#include <assert.h>
#include <stdarg.h>
//#include <string.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
//#include "winerror.h"
#include <ole2.h>
#include "compobj_private.h"
#include "precomp.h"
#include "storage32.h"
#include <wine/unicode.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(ole);
enum storage_state

8
reactos/dll/win32/ole32/dictionary.c
View file

@ -17,14 +17,8 @@
* 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
#include <assert.h>
//#include <stdarg.h>
//#include "windef.h"
//#include "winbase.h"
#include "dictionary.h"
#include <wine/debug.h>
#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(storage);

4
reactos/dll/win32/ole32/dictionary.h
View file

@ -22,10 +22,6 @@
#ifndef __DICTIONARY_H__
#define __DICTIONARY_H__
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
struct dictionary;
/* Returns whether key a is less than, equal to, or greater than key b, in

16
reactos/dll/win32/ole32/enumx.c
View file

@ -18,21 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COBJMACROS
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
#include <objbase.h>
#include "enumx.h"
#include <wine/list.h>
#include <wine/debug.h>
#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);

19
reactos/dll/win32/ole32/errorinfo.c
View file

@ -23,24 +23,7 @@
* TEB at offset 0xf80.
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
//#include <string.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
#include <objbase.h>
#include <oleauto.h>
//#include "winerror.h"
#include <wine/unicode.h>
#include "compobj_private.h"
#include <wine/debug.h>
#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);

22
reactos/dll/win32/ole32/filelockbytes.c
View file

@ -20,29 +20,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
//#include <assert.h>
//#include <stdlib.h>
//#include <stdarg.h>
//#include <stdio.h>
//#include <string.h>
//#include <limits.h>
#define COBJMACROS
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
//#include "windef.h"
//#include "winbase.h"
//#include "winuser.h"
//#include "winerror.h"
//#include "objbase.h"
//#include "ole2.h"
#include "precomp.h"
#include "storage32.h"
#include <wine/debug.h>
#include <wine/unicode.h>
WINE_DEFAULT_DEBUG_CHANNEL(storage);
typedef struct FileLockBytesImpl

22
reactos/dll/win32/ole32/filemoniker.c
View file

@ -19,27 +19,7 @@
* 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 <windef.h>
#include <winbase.h>
//#include "winerror.h"
//#include "winnls.h"
#include <wine/unicode.h>
#include <wine/debug.h>
#include <objbase.h>
#include "moniker.h"
//#include "compobj_private.h"
#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);

21
reactos/dll/win32/ole32/ftmarshal.c
View file

@ -18,26 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <config.h>
//#include <stdlib.h>
#include <stdarg.h>
//#include <stdio.h>
//#include <string.h>
//#include <assert.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
#include <objbase.h>
#include <wine/debug.h>
#include "compobj_private.h"
#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);

21
reactos/dll/win32/ole32/git.c
View file

@ -24,26 +24,7 @@
* 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 "winuser.h"
//#include "objbase.h"
#include <ole2.h>
//#include "winerror.h"
#include "compobj_private.h"
//#include "wine/list.h"
#include <wine/debug.h>
#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);

14
reactos/dll/win32/ole32/guid.c Normal file
View file

@ -0,0 +1,14 @@
/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
#include <initguid.h>
DEFINE_OLEGUID( CLSID_DfMarshal, 0x0000030b, 0, 0 );
DEFINE_OLEGUID( CLSID_FileMoniker, 0x303, 0, 0 );
DEFINE_OLEGUID( CLSID_ItemMoniker, 0x304, 0, 0 );
DEFINE_OLEGUID( CLSID_AntiMoniker, 0x305, 0, 0 );
DEFINE_OLEGUID( CLSID_CompositeMoniker, 0x309, 0, 0 );
DEFINE_OLEGUID( CLSID_ClassMoniker, 0x31a, 0, 0 );
DEFINE_OLEGUID( CLSID_PointerMoniker, 0x306, 0, 0 );
/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */

25
reactos/dll/win32/ole32/hglobalstream.c
View file

@ -21,30 +21,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <config.h>
//#include <assert.h>
//#include <stdlib.h>
#include <stdarg.h>
//#include <stdio.h>
//#include <string.h>
#define COBJMACROS
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
//#include "objbase.h"
#include <ole2.h>
//#include "winerror.h"
//#include "winternl.h"
#include <wine/debug.h>
#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(storage);

21
reactos/dll/win32/ole32/ifs.c
View file

@ -18,26 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <config.h>
//#include <ctype.h>
#include <stdarg.h>
//#include <stdlib.h>
//#include <string.h>
//#include <assert.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
//#include "winerror.h"
#include <wine/debug.h>
#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(olemalloc);

21
reactos/dll/win32/ole32/itemmoniker.c
View file

@ -18,26 +18,7 @@
* 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 "winuser.h"
//#include "winnls.h"
#include <wine/debug.h>
#include <ole2.h>
#include <wine/unicode.h>
#include "moniker.h"
#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);

21
reactos/dll/win32/ole32/marshal.c
View file

@ -20,26 +20,7 @@
* 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>
#include <assert.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
//#include "objbase.h"
#include <ole2.h>
//#include "winerror.h"
//#include "wine/unicode.h"
#include "compobj_private.h"
#include <wine/debug.h>
#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);

22
reactos/dll/win32/ole32/memlockbytes.c
View file

@ -19,27 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <config.h>
//#include <assert.h>
#include <stdarg.h>
//#include <string.h>
#define COBJMACROS
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <objbase.h>
//#include "ole2.h"
//#include "winerror.h"
#include <wine/debug.h>
#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);

23
reactos/dll/win32/ole32/moniker.c
View file

@ -21,31 +21,10 @@
* 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 "wine/port.h"
#include <stdarg.h>
//#include <string.h>
#define COBJMACROS
//#include "winerror.h"
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
//#include "wtypes.h"
#include <ole2.h>
//#include "wine/list.h"
#include <wine/debug.h>
#include <wine/unicode.h>
#include <wine/exception.h>
#include "compobj_private.h"
#include "moniker.h"
#include <irot.h>
WINE_DEFAULT_DEBUG_CHANNEL(ole);

2
reactos/dll/win32/ole32/msvc.h
View file

@ -1,2 +0,0 @@
#define __ASM_STDCALL_FUNC(name,args,code)

31
reactos/dll/win32/ole32/ole2.c
View file

@ -23,36 +23,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <config.h>
//#include <assert.h>
//#include <stdlib.h>
#include <stdarg.h>
//#include <stdio.h>
//#include <string.h>
#define COBJMACROS
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include <windef.h>
#include <winbase.h>
//#include "winerror.h"
#include <wingdi.h>
//#include "winuser.h"
//#include "winnls.h"
//#include "winreg.h"
#include <ole2.h>
#include <ole2ver.h>
#include <wine/unicode.h>
#include "compobj_private.h"
//#include "wine/list.h"
#include <wine/debug.h>
#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);
WINE_DECLARE_DEBUG_CHANNEL(accel);

19
reactos/dll/win32/ole32/ole2impl.c
View file

@ -18,24 +18,7 @@
* 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 <wine/debug.h>
#include <ole2.h>
//#include "olestd.h"
#include "compobj_private.h"
#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);

14
reactos/dll/win32/ole32/ole2stubs.c
View file

@ -19,19 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <ole2.h>
//#include "objidl.h"
#include <wine/debug.h>
#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);

18
reactos/dll/win32/ole32/ole32_main.c
View file

@ -18,23 +18,7 @@
* 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 <stdarg.h>
#include <stdio.h>
#include <windef.h>
#include <winbase.h>
#include <wingdi.h>
#include <winuser.h>
#include <winnls.h>
#include <objbase.h>
//#include "ole2.h"
#include <wine/debug.h>
#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);

19
reactos/dll/win32/ole32/oleobj.c
View file

@ -19,24 +19,7 @@
* 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 "winuser.h"
//#include "winerror.h"
#include <wine/debug.h>
#include <ole2.h>
//#include "compobj_private.h"
#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);

25
reactos/dll/win32/ole32/oleproxy.c
View file

@ -19,30 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <config.h>
//#include <stdlib.h>
#include <stdarg.h>
//#include <stdio.h>
//#include <string.h>
#define COBJMACROS
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <objbase.h>
//#include "ole2.h"
//#include "rpc.h"
#include "compobj_private.h"
#include "moniker.h"
#include <comcat.h>
#include "precomp.h"
/***********************************************************************
* DllGetClassObject [OLE32.@]

19
reactos/dll/win32/ole32/pointermoniker.c
View file

@ -19,24 +19,7 @@
* 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 "winerror.h"
//#include "winuser.h"
#include <objbase.h>
#include <oleidl.h>
#include <wine/debug.h>
#include "moniker.h"
#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);

39
reactos/dll/win32/ole32/precomp.h Normal file
View file

@ -0,0 +1,39 @@
#ifndef _OLE32_PCH_
#define _OLE32_PCH_
#include <config.h>
#include <assert.h>
#include <stdarg.h>
#include <stdio.h>
#define _INC_WINDOWS
#define COBJMACROS
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include <ntstatus.h>
#define WIN32_NO_STATUS
#include <windef.h>
#include <winbase.h>
#include <winreg.h>
#include <wingdi.h>
#define USE_COM_CONTEXT_DEF
#include <ole2.h>
#include <ole2ver.h>
#include <dcom.h>
#include <comcat.h>
#include <servprov.h>
#include <winternl.h>
#include <wine/debug.h>
#include <wine/list.h>
#include <wine/unicode.h>
#include "compobj_private.h"
#include "dictionary.h"
#include "enumx.h"
#include "moniker.h"
#endif /* _OLE32_PCH_ */

27
reactos/dll/win32/ole32/rpc.c
View file

@ -20,34 +20,9 @@
* 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 "wine/port.h"
#include <stdarg.h>
//#include <string.h>
#define COBJMACROS
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <winsvc.h>
//#include "objbase.h"
#include <ole2.h>
//#include "rpc.h"
//#include "winerror.h"
//#include "winreg.h"
#include <servprov.h>
#include <wine/unicode.h>
#include "compobj_private.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(ole);

27
reactos/dll/win32/ole32/stg_prop.c
View file

@ -36,32 +36,15 @@
* PropertyStorage_ReadFromStream
*/
#include <config.h>
//#include "wine/port.h"
#include <assert.h>
//#include <stdarg.h>
//#include <stdio.h>
//#include <stdlib.h>
//#include <string.h>
#define COBJMACROS
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
//#include "windef.h"
//#include "winbase.h"
//#include "winnls.h"
//#include "winuser.h"
#include <wine/unicode.h>
#include <wine/debug.h>
#include "dictionary.h"
#include "precomp.h"
#include "storage32.h"
#include "enumx.h"
#include <oleauto.h>
WINE_DEFAULT_DEBUG_CHANNEL(storage);
#ifdef _MSC_VER
#define __ASM_STDCALL_FUNC(name,args,code)
#endif
static inline StorageImpl *impl_from_IPropertySetStorage( IPropertySetStorage *iface )
{
return CONTAINING_RECORD(iface, StorageImpl, base.IPropertySetStorage_iface);

17
reactos/dll/win32/ole32/stg_stream.c
View file

@ -23,22 +23,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <assert.h>
//#include <stdlib.h>
//#include <stdarg.h>
//#include <stdio.h>
//#include <string.h>
#define COBJMACROS
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
//#include "windef.h"
//#include "winbase.h"
//#include "winerror.h"
//#include "winternl.h"
#include <wine/debug.h>
#include "precomp.h"
#include "storage32.h"
WINE_DEFAULT_DEBUG_CHANNEL(storage);

21
reactos/dll/win32/ole32/storage32.c
View file

@ -30,29 +30,10 @@
* residing in a compound file object.
*/
#include <assert.h>
//#include <stdarg.h>
//#include <stdio.h>
//#include <stdlib.h>
//#include <string.h>
#define COBJMACROS
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
//#include "windef.h"
//#include "winbase.h"
//#include "winnls.h"
//#include "winuser.h"
#include <wine/unicode.h>
#include <wine/debug.h>
#include "precomp.h"
#include "storage32.h"
#include <ole2.h> /* For Write/ReadClassStm */
//#include "winreg.h"
#include <wine/wingdi16.h>
#include "compobj_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(storage);

13
reactos/dll/win32/ole32/storage32.h
View file

@ -30,19 +30,6 @@
#ifndef __STORAGE32_H__
#define __STORAGE32_H__
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
//#include "winnt.h"
#include <objbase.h>
#include <winreg.h>
#include "winternl.h"
#include <wine/list.h>
/*
* Definitions for the file format offsets.
*/

21
reactos/dll/win32/ole32/stubmanager.c
View file

@ -23,29 +23,10 @@
* 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 <assert.h>
#include <stdarg.h>
//#include <limits.h>
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <objbase.h>
//#include "rpc.h"
#include <wine/debug.h>
#include "compobj_private.h"
#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);
/* generates an ipid in the following format (similar to native version):
* Data1 = apartment-local ipid counter
* Data2 = apartment creator thread ID

24
reactos/dll/win32/ole32/usrmarshal.c
View file

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