reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-02-22 13:53:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed unnecessary includes from ole related files.

Browse Source
This commit is contained in:
Michael Veksler 1999-08-18 18:35:57 +00:00 committed by Alexandre Julliard
parent 708a1c03f9
commit 4405f3c369
30 changed files with 123 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/shell32/shlview.c
View File

@ -15,6 +15,7 @@
#include "wine/obj_base.h" #include "wine/obj_base.h"
#include "wine/obj_shellfolder.h" #include "wine/obj_shellfolder.h"
#include "wine/obj_shellview.h" #include "wine/obj_shellview.h"
#include "wine/obj_oleview.h"
#include "wine/obj_commdlgbrowser.h" #include "wine/obj_commdlgbrowser.h"
#include "wine/obj_shellbrowser.h" #include "wine/obj_shellbrowser.h"
#include "wine/obj_dockingwindowframe.h" #include "wine/obj_dockingwindowframe.h"

2
include/compobj.h
View File

@ -3,7 +3,7 @@
/* All private prototye functions used by OLE will be added to this header file */ /* All private prototye functions used by OLE will be added to this header file */
#include "objbase.h" #include "wtypes.h"
/* This function initialize the Running Object Table */ /* This function initialize the Running Object Table */
HRESULT WINAPI RunningObjectTableImpl_Initialize(); HRESULT WINAPI RunningObjectTableImpl_Initialize();

13
include/ole2.h
View File

@ -7,8 +7,17 @@
#include "windef.h" #include "windef.h"
#include "winerror.h" #include "winerror.h"
#include "wine/obj_storage.h"
#include "wine/obj_moniker.h"
#include "wine/obj_base.h"
#include "wine/obj_dragdrop.h"
#include "wine/obj_inplace.h"
#include "wine/obj_oleobj.h"
#ifndef __WINE__
#include "oleidl.h" #include "oleidl.h"
#include "oleauto.h" #include "oleauto.h"
#endif
struct tagMSG;
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -82,12 +91,12 @@ HRESULT WINAPI OleCreate(REFCLSID rclsid, REFIID riid, DWORD renderopt, LPFO
LPSTORAGE pStg, LPVOID* ppvObj); LPSTORAGE pStg, LPVOID* ppvObj);
HRESULT WINAPI OleFlushClipboard(void); HRESULT WINAPI OleFlushClipboard(void);
HRESULT WINAPI SetConvertStg(LPSTORAGE pStg, BOOL fConvert); HRESULT WINAPI SetConvertStg(LPSTORAGE pStg, BOOL fConvert);
BOOL WINAPI IsAccelerator(HACCEL hAccel, int cAccelEntries, LPMSG lpMsg, WORD* lpwCmd); BOOL WINAPI IsAccelerator(HACCEL hAccel, int cAccelEntries, struct tagMSG* lpMsg, WORD* lpwCmd);
HRESULT WINAPI OleCreateLinkToFile(LPCOLESTR lpszFileName, REFIID riid, DWORD renderopt, LPFORMATETC lpFormatEtc, HRESULT WINAPI OleCreateLinkToFile(LPCOLESTR lpszFileName, REFIID riid, DWORD renderopt, LPFORMATETC lpFormatEtc,
LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj); LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj);
HRESULT WINAPI OleDuplicateData(HANDLE hSrc, CLIPFORMAT cfFormat, UINT uiFlags); HRESULT WINAPI OleDuplicateData(HANDLE hSrc, CLIPFORMAT cfFormat, UINT uiFlags);
HRESULT WINAPI WriteFmtUserTypeStg(LPSTORAGE pstg, CLIPFORMAT cf, LPOLESTR lpszUserType); HRESULT WINAPI WriteFmtUserTypeStg(LPSTORAGE pstg, CLIPFORMAT cf, LPOLESTR lpszUserType);
HRESULT WINAPI OleTranslateAccelerator (LPOLEINPLACEFRAME lpFrame, LPOLEINPLACEFRAMEINFO lpFrameInfo, LPMSG lpmsg); HRESULT WINAPI OleTranslateAccelerator (LPOLEINPLACEFRAME lpFrame, LPOLEINPLACEFRAMEINFO lpFrameInfo, struct tagMSG* lpmsg);
HRESULT WINAPI OleCreateFromData(LPDATAOBJECT pSrcDataObj, REFIID riid, DWORD renderopt, LPFORMATETC pFormatEtc, HRESULT WINAPI OleCreateFromData(LPDATAOBJECT pSrcDataObj, REFIID riid, DWORD renderopt, LPFORMATETC pFormatEtc,
LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj); LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj);
HRESULT WINAPI OleCreateDefaultHandler(REFCLSID clsid, HRESULT WINAPI OleCreateDefaultHandler(REFCLSID clsid,

70
include/oleauto.h
View File

@ -1,14 +1,20 @@
#ifndef __WINE_OLEAUTO_H #ifndef __WINE_OLEAUTO_H
#define __WINE_OLEAUTO_H #define __WINE_OLEAUTO_H
#include "wtypes.h"
#include "wine/obj_oleaut.h"
#ifndef __WINE__
#include "oaidl.h"
#endif
struct tagSAFEARRAY;
struct tagSAFEARRAYBOUND;
struct tagVARIANT;
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/*#include <ole.h> */
#include "mapidefs.h"
#include "wine/obj_oleaut.h"
#include "oaidl.h"
BSTR16 WINAPI SysAllocString16(LPCOLESTR16); BSTR16 WINAPI SysAllocString16(LPCOLESTR16);
BSTR WINAPI SysAllocString(const OLECHAR*); BSTR WINAPI SysAllocString(const OLECHAR*);
@ -28,67 +34,67 @@ int WINAPI SysStringLen(BSTR);
*/ */
HRESULT WINAPI HRESULT WINAPI
SafeArrayAllocDescriptor(UINT cDims, SAFEARRAY **ppsaOut); SafeArrayAllocDescriptor(UINT cDims, struct tagSAFEARRAY **ppsaOut);
HRESULT WINAPI HRESULT WINAPI
SafeArrayAllocData(SAFEARRAY *psa); SafeArrayAllocData(struct tagSAFEARRAY *psa);
SAFEARRAY* WINAPI struct tagSAFEARRAY* WINAPI
SafeArrayCreate(VARTYPE vt, UINT cDims, SAFEARRAYBOUND *rgsabound); SafeArrayCreate(VARTYPE vt, UINT cDims, struct tagSAFEARRAYBOUND *rgsabound);
HRESULT WINAPI HRESULT WINAPI
SafeArrayDestroyDescriptor(SAFEARRAY *psa); SafeArrayDestroyDescriptor(struct tagSAFEARRAY *psa);
HRESULT WINAPI HRESULT WINAPI
SafeArrayPutElement(SAFEARRAY *psa, LONG *rgIndices, void *pv); SafeArrayPutElement(struct tagSAFEARRAY *psa, LONG *rgIndices, void *pv);
HRESULT WINAPI HRESULT WINAPI
SafeArrayGetElement(SAFEARRAY *psa, LONG *rgIndices, void *pv); SafeArrayGetElement(struct tagSAFEARRAY *psa, LONG *rgIndices, void *pv);
HRESULT WINAPI HRESULT WINAPI
SafeArrayLock(SAFEARRAY *psa); SafeArrayLock(struct tagSAFEARRAY *psa);
HRESULT WINAPI HRESULT WINAPI
SafeArrayUnlock(SAFEARRAY *psa); SafeArrayUnlock(struct tagSAFEARRAY *psa);
HRESULT WINAPI HRESULT WINAPI
SafeArrayGetUBound(SAFEARRAY *psa, UINT nDim, LONG *plUbound); SafeArrayGetUBound(struct tagSAFEARRAY *psa, UINT nDim, LONG *plUbound);
HRESULT WINAPI HRESULT WINAPI
SafeArrayGetLBound(SAFEARRAY *psa, UINT nDim, LONG *plLbound); SafeArrayGetLBound(struct tagSAFEARRAY *psa, UINT nDim, LONG *plLbound);
UINT WINAPI UINT WINAPI
SafeArrayGetDim(SAFEARRAY *psa); SafeArrayGetDim(struct tagSAFEARRAY *psa);
UINT WINAPI UINT WINAPI
SafeArrayGetElemsize(SAFEARRAY *psa); SafeArrayGetElemsize(struct tagSAFEARRAY *psa);
HRESULT WINAPI HRESULT WINAPI
SafeArrayAccessData(SAFEARRAY *psa, void **ppvData); SafeArrayAccessData(struct tagSAFEARRAY *psa, void **ppvData);
HRESULT WINAPI HRESULT WINAPI
SafeArrayUnaccessData(SAFEARRAY *psa); SafeArrayUnaccessData(struct tagSAFEARRAY *psa);
HRESULT WINAPI HRESULT WINAPI
SafeArrayPtrOfIndex(SAFEARRAY *psa, LONG *rgIndices, void **ppvData); SafeArrayPtrOfIndex(struct tagSAFEARRAY *psa, LONG *rgIndices, void **ppvData);
HRESULT WINAPI HRESULT WINAPI
SafeArrayCopyData(SAFEARRAY *psaSource, SAFEARRAY **psaTarget); SafeArrayCopyData(struct tagSAFEARRAY *psaSource, struct tagSAFEARRAY **psaTarget);
HRESULT WINAPI HRESULT WINAPI
SafeArrayDestroyData(SAFEARRAY *psa); SafeArrayDestroyData(struct tagSAFEARRAY *psa);
HRESULT WINAPI HRESULT WINAPI
SafeArrayDestroy(SAFEARRAY *psa); SafeArrayDestroy(struct tagSAFEARRAY *psa);
HRESULT WINAPI HRESULT WINAPI
SafeArrayCopy(SAFEARRAY *psa, SAFEARRAY **ppsaOut); SafeArrayCopy(struct tagSAFEARRAY *psa, struct tagSAFEARRAY **ppsaOut);
SAFEARRAY* WINAPI struct tagSAFEARRAY* WINAPI
SafeArrayCreateVector(VARTYPE vt, LONG lLbound, ULONG cElements); SafeArrayCreateVector(VARTYPE vt, LONG lLbound, ULONG cElements);
HRESULT WINAPI HRESULT WINAPI
SafeArrayRedim(SAFEARRAY *psa, SAFEARRAYBOUND *psaboundNew); SafeArrayRedim(struct tagSAFEARRAY *psa, struct tagSAFEARRAYBOUND *psaboundNew);
/* These are macros that help accessing the VARIANT date type. /* These are macros that help accessing the VARIANT date type.
@ -151,13 +157,13 @@ SafeArrayRedim(SAFEARRAY *psa, SAFEARRAYBOUND *psaboundNew);
* VARIANT API * VARIANT API
*/ */
void WINAPI VariantInit(VARIANTARG* pvarg); void WINAPI VariantInit(struct tagVARIANT* pvarg);
HRESULT WINAPI VariantClear(VARIANTARG* pvarg); HRESULT WINAPI VariantClear(struct tagVARIANT* pvarg);
HRESULT WINAPI VariantCopy(VARIANTARG* pvargDest, VARIANTARG* pvargSrc); HRESULT WINAPI VariantCopy(struct tagVARIANT* pvargDest, struct tagVARIANT* pvargSrc);
HRESULT WINAPI VariantCopyInd(VARIANT* pvargDest, VARIANTARG* pvargSrc); HRESULT WINAPI VariantCopyInd(struct tagVARIANT* pvargDest, struct tagVARIANT* pvargSrc);
HRESULT WINAPI VariantChangeType(VARIANTARG* pvargDest, VARIANTARG* pvargSrc, HRESULT WINAPI VariantChangeType(struct tagVARIANT* pvargDest, struct tagVARIANT* pvargSrc,
USHORT wFlags, VARTYPE vt); USHORT wFlags, VARTYPE vt);
HRESULT WINAPI VariantChangeTypeEx(VARIANTARG* pvargDest, VARIANTARG* pvargSrc, HRESULT WINAPI VariantChangeTypeEx(struct tagVARIANT* pvargDest, struct tagVARIANT* pvargSrc,
LCID lcid, USHORT wFlags, VARTYPE vt); LCID lcid, USHORT wFlags, VARTYPE vt);
/* /*

4
include/wine/obj_cache.h
View File

@ -8,7 +8,9 @@
#define __WINE_WINE_OBJ_CACHE_H #define __WINE_WINE_OBJ_CACHE_H
#include "winbase.h" #include "wine/obj_storage.h"
#include "wine/obj_moniker.h"
#include "wine/obj_dataobject.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

9
include/wine/obj_control.h
View File

@ -10,6 +10,11 @@
#include "winbase.h" #include "winbase.h"
#include "wine/obj_oleaut.h" /* for DISPID */ #include "wine/obj_oleaut.h" /* for DISPID */
#include "wine/obj_oleview.h"
#include "wine/obj_inplace.h"
#include "wine/obj_dragdrop.h"
struct tagMSG;
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -167,7 +172,7 @@ typedef struct IProvideClassInfo2 IProvideClassInfo2, *LPPROVIDECLASSINFO2;
#define ICOM_INTERFACE IOleControl #define ICOM_INTERFACE IOleControl
#define IOleControl_METHODS \ #define IOleControl_METHODS \
ICOM_METHOD1(HRESULT,GetControlInfo, CONTROLINFO*,pCI) \ ICOM_METHOD1(HRESULT,GetControlInfo, CONTROLINFO*,pCI) \
ICOM_METHOD1(HRESULT,OnMnemonic, MSG*,pMsg) \ ICOM_METHOD1(HRESULT,OnMnemonic, struct tagMSG*,pMsg) \
ICOM_METHOD1(HRESULT,OnAmbientPropertyChange, DISPID,dispID) \ ICOM_METHOD1(HRESULT,OnAmbientPropertyChange, DISPID,dispID) \
ICOM_METHOD1(HRESULT,FreezeEvents, BOOL,bFreeze) ICOM_METHOD1(HRESULT,FreezeEvents, BOOL,bFreeze)
#define IOleControl_IMETHODS \ #define IOleControl_IMETHODS \
@ -198,7 +203,7 @@ ICOM_DEFINE(IOleControl,IUnknown)
ICOM_METHOD1(HRESULT,LockInPlaceActive, BOOL,fLock) \ ICOM_METHOD1(HRESULT,LockInPlaceActive, BOOL,fLock) \
ICOM_METHOD1(HRESULT,GetExtendedControl, IDispatch**,ppDisp) \ ICOM_METHOD1(HRESULT,GetExtendedControl, IDispatch**,ppDisp) \
ICOM_METHOD3(HRESULT,TransformCoords, POINTL*,pPtlHimetric, POINTF*,pPtfContainer, DWORD,dwFlags) \ ICOM_METHOD3(HRESULT,TransformCoords, POINTL*,pPtlHimetric, POINTF*,pPtfContainer, DWORD,dwFlags) \
ICOM_METHOD2(HRESULT,TranslateAccelerator, MSG*,pMsg, DWORD,grfModifiers) \ ICOM_METHOD2(HRESULT,TranslateAccelerator, struct tagMSG*,pMsg, DWORD,grfModifiers) \
ICOM_METHOD1(HRESULT,OnFocus, BOOL,fGotFocus) \ ICOM_METHOD1(HRESULT,OnFocus, BOOL,fGotFocus) \
ICOM_METHOD (HRESULT,ShowPropertyFrame) ICOM_METHOD (HRESULT,ShowPropertyFrame)
#define IOleControlSite_IMETHODS \ #define IOleControlSite_IMETHODS \

5
include/wine/obj_dataobject.h
View File

@ -1,12 +1,15 @@
/* /*
* Defines the COM interfaces and APIs related to IDataObject. * Defines the COM interfaces and APIs related to IDataObject.
* *
* Depends on 'obj_moniker.h', 'obj_storage.h' and 'obj_base.h'.
*/ */
#ifndef __WINE_WINE_OBJ_DATAOBJECT_H #ifndef __WINE_WINE_OBJ_DATAOBJECT_H
#define __WINE_WINE_OBJ_DATAOBJECT_H #define __WINE_WINE_OBJ_DATAOBJECT_H
#include "wine/obj_base.h"
#include "wine/obj_moniker.h"
#include "wine/obj_storage.h"
#if defined(__cplusplus) && !defined(NONAMELESSUNION) #if defined(__cplusplus) && !defined(NONAMELESSUNION)
#define DUMMYUNIONNAME #define DUMMYUNIONNAME
#else /* defined(__cplusplus) && !defined(NONAMELESSUNION) */ #else /* defined(__cplusplus) && !defined(NONAMELESSUNION) */

7
include/wine/obj_inplace.h
View File

@ -8,8 +8,7 @@
#define __WINE_WINE_OBJ_INPLACE_H #define __WINE_WINE_OBJ_INPLACE_H
#include "winbase.h" struct tagMSG;
#include "winuser.h"
#include "wine/obj_moniker.h" #include "wine/obj_moniker.h"
#ifdef __cplusplus #ifdef __cplusplus
@ -206,7 +205,7 @@ ICOM_DEFINE(IOleInPlaceObject,IOleWindow)
*/ */
#define ICOM_INTERFACE IOleInPlaceActiveObject #define ICOM_INTERFACE IOleInPlaceActiveObject
#define IOleInPlaceActiveObject_METHODS \ #define IOleInPlaceActiveObject_METHODS \
ICOM_METHOD1(HRESULT,TranslateAccelerator, LPMSG,lpmsg) \ ICOM_METHOD1(HRESULT,TranslateAccelerator, struct tagMSG*,lpmsg) \
ICOM_METHOD1(HRESULT,OnFrameWindowActivate, BOOL,fActivate) \ ICOM_METHOD1(HRESULT,OnFrameWindowActivate, BOOL,fActivate) \
ICOM_METHOD1(HRESULT,OnDocWindowActivate, BOOL,fActivate) \ ICOM_METHOD1(HRESULT,OnDocWindowActivate, BOOL,fActivate) \
ICOM_METHOD3(HRESULT,ResizeBorder, LPCRECT,prcBorder, IOleInPlaceUIWindow*,pUIWindow, BOOL,fWindowFrame) \ ICOM_METHOD3(HRESULT,ResizeBorder, LPCRECT,prcBorder, IOleInPlaceUIWindow*,pUIWindow, BOOL,fWindowFrame) \
@ -274,7 +273,7 @@ ICOM_DEFINE(IOleInPlaceUIWindow,IOleWindow)
ICOM_METHOD1 (HRESULT,RemoveMenus, HMENU,hemnuShared) \ ICOM_METHOD1 (HRESULT,RemoveMenus, HMENU,hemnuShared) \
ICOM_METHOD1 (HRESULT,SetStatusText, LPCOLESTR,pszStatusText) \ ICOM_METHOD1 (HRESULT,SetStatusText, LPCOLESTR,pszStatusText) \
ICOM_METHOD1 (HRESULT,EnableModeless, BOOL,fEnable) \ ICOM_METHOD1 (HRESULT,EnableModeless, BOOL,fEnable) \
ICOM_METHOD2 (HRESULT,TranslateAccelerator, LPMSG,lpmsg, WORD,wID) ICOM_METHOD2 (HRESULT,TranslateAccelerator, struct tagMSG*,lpmsg, WORD,wID)
#define IOleInPlaceFrame_IMETHODS \ #define IOleInPlaceFrame_IMETHODS \
IOleInPlaceUIWindow_IMETHODS \ IOleInPlaceUIWindow_IMETHODS \
IOleInPlaceFrame_METHODS IOleInPlaceFrame_METHODS

1
include/wine/obj_olefont.h
View File

@ -7,6 +7,7 @@
#ifndef __WINE_WINE_OBJ_OLEFONT_H #ifndef __WINE_WINE_OBJ_OLEFONT_H
#define __WINE_WINE_OBJ_OLEFONT_H #define __WINE_WINE_OBJ_OLEFONT_H
#include "wine/obj_oleaut.h"
#include "wine/obj_base.h" #include "wine/obj_base.h"
#include "wingdi.h" /* TEXTMETRIC*/ #include "wingdi.h" /* TEXTMETRIC*/

13
include/wine/obj_oleobj.h
View File

@ -8,9 +8,12 @@
#define __WINE_WINE_OBJ_OLEOBJ_H #define __WINE_WINE_OBJ_OLEOBJ_H
#include "winbase.h" #include "wine/obj_moniker.h"
#include "winuser.h" #include "wine/obj_inplace.h"
#include "wine/obj_base.h" #include "wine/obj_dataobject.h"
struct tagMSG;
struct tagLOGPALETTE;
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -88,7 +91,7 @@ typedef struct IEnumOLEVERB IEnumOLEVERB, *LPENUMOLEVERB;
ICOM_METHOD3(HRESULT,GetMoniker, DWORD,dwAssign, DWORD,dwWhichMoniker, IMoniker**,ppmk) \ ICOM_METHOD3(HRESULT,GetMoniker, DWORD,dwAssign, DWORD,dwWhichMoniker, IMoniker**,ppmk) \
ICOM_METHOD3(HRESULT,InitFromData, IDataObject*,pDataObject, BOOL,fCreation, DWORD,dwReserved) \ ICOM_METHOD3(HRESULT,InitFromData, IDataObject*,pDataObject, BOOL,fCreation, DWORD,dwReserved) \
ICOM_METHOD2(HRESULT,GetClipboardData, DWORD,dwReserved, IDataObject**,ppDataObject) \ ICOM_METHOD2(HRESULT,GetClipboardData, DWORD,dwReserved, IDataObject**,ppDataObject) \
ICOM_METHOD6(HRESULT,DoVerb, LONG,iVerb, LPMSG,lpmsg, IOleClientSite*,pActiveSite, LONG,lindex, HWND,hwndParent, LPCRECT,lprcPosRect) \ ICOM_METHOD6(HRESULT,DoVerb, LONG,iVerb, struct tagMSG*,lpmsg, IOleClientSite*,pActiveSite, LONG,lindex, HWND,hwndParent, LPCRECT,lprcPosRect) \
ICOM_METHOD1(HRESULT,EnumVerbs, IEnumOLEVERB**,ppEnumOleVerb) \ ICOM_METHOD1(HRESULT,EnumVerbs, IEnumOLEVERB**,ppEnumOleVerb) \
ICOM_METHOD (HRESULT,Update) \ ICOM_METHOD (HRESULT,Update) \
ICOM_METHOD (HRESULT,IsUpToDate) \ ICOM_METHOD (HRESULT,IsUpToDate) \
@ -100,7 +103,7 @@ typedef struct IEnumOLEVERB IEnumOLEVERB, *LPENUMOLEVERB;
ICOM_METHOD1(HRESULT,Unadvise, DWORD,dwConnection) \ ICOM_METHOD1(HRESULT,Unadvise, DWORD,dwConnection) \
ICOM_METHOD1(HRESULT,EnumAdvise, IEnumSTATDATA**,ppenumAdvise) \ ICOM_METHOD1(HRESULT,EnumAdvise, IEnumSTATDATA**,ppenumAdvise) \
ICOM_METHOD2(HRESULT,GetMiscStatus, DWORD,dwAspect, DWORD*,pdwStatus) \ ICOM_METHOD2(HRESULT,GetMiscStatus, DWORD,dwAspect, DWORD*,pdwStatus) \
ICOM_METHOD1(HRESULT,SetColorScheme, LOGPALETTE*,pLogpal) ICOM_METHOD1(HRESULT,SetColorScheme, struct tagLOGPALETTE*,pLogpal)
#define IOleObject_IMETHODS \ #define IOleObject_IMETHODS \
IUnknown_IMETHODS \ IUnknown_IMETHODS \
IOleObject_METHODS IOleObject_METHODS

8
include/wine/obj_oleview.h
View File

@ -1,14 +1,16 @@
/* /*
* Defines the COM interfaces and APIs related to ViewObject * Defines the COM interfaces and APIs related to ViewObject
* *
* Depends on 'obj_base.h'.
*/ */
#ifndef __WINE_WINE_OBJ_OLEVIEW_H #ifndef __WINE_WINE_OBJ_OLEVIEW_H
#define __WINE_WINE_OBJ_OLEVIEW_H #define __WINE_WINE_OBJ_OLEVIEW_H
#include "winbase.h" #include "wine/obj_base.h"
#include "wine/obj_dataobject.h"
struct tagLOGPALETTE;
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -37,7 +39,7 @@ typedef BOOL (CALLBACK* IVO_ContCallback)(DWORD);
#define ICOM_INTERFACE IViewObject #define ICOM_INTERFACE IViewObject
#define IViewObject_METHODS \ #define IViewObject_METHODS \
ICOM_METHOD10(HRESULT,Draw, DWORD,dwDrawAspect, LONG,lindex, void*,pvAspect, DVTARGETDEVICE*,ptd, HDC,hdcTargetDev, HDC,hdcDraw, LPCRECTL,lprcBounds, LPCRECTL,lprcWBounds, IVO_ContCallback, pfnContinue, DWORD,dwContinue) \ ICOM_METHOD10(HRESULT,Draw, DWORD,dwDrawAspect, LONG,lindex, void*,pvAspect, DVTARGETDEVICE*,ptd, HDC,hdcTargetDev, HDC,hdcDraw, LPCRECTL,lprcBounds, LPCRECTL,lprcWBounds, IVO_ContCallback, pfnContinue, DWORD,dwContinue) \
ICOM_METHOD6(HRESULT,GetColorSet, DWORD,dwDrawAspect, LONG,lindex, void*,pvAspect, DVTARGETDEVICE*,ptd, HDC,hicTargetDevice, LOGPALETTE**,ppColorSet) \ ICOM_METHOD6(HRESULT,GetColorSet, DWORD,dwDrawAspect, LONG,lindex, void*,pvAspect, DVTARGETDEVICE*,ptd, HDC,hicTargetDevice, struct tagLOGPALETTE**,ppColorSet) \
ICOM_METHOD4(HRESULT,Freeze, DWORD,dwDrawAspect, LONG,lindex, void*,pvAspect, DWORD*,pdwFreeze) \ ICOM_METHOD4(HRESULT,Freeze, DWORD,dwDrawAspect, LONG,lindex, void*,pvAspect, DWORD*,pdwFreeze) \
ICOM_METHOD1(HRESULT,Unfreeze, DWORD,dwFreeze) \ ICOM_METHOD1(HRESULT,Unfreeze, DWORD,dwFreeze) \
ICOM_METHOD3(HRESULT,SetAdvise, DWORD,aspects, DWORD,advf, IAdviseSink*,pAdvSink) \ ICOM_METHOD3(HRESULT,SetAdvise, DWORD,aspects, DWORD,advf, IAdviseSink*,pAdvSink) \

2
include/wingdi.h
View File

@ -1338,7 +1338,7 @@ typedef struct tagPALETTEENTRY
#define PC_EXPLICIT 0x02 #define PC_EXPLICIT 0x02
#define PC_NOCOLLAPSE 0x04 #define PC_NOCOLLAPSE 0x04
typedef struct typedef struct tagLOGPALETTE
{ {
WORD palVersion; WORD palVersion;
WORD palNumEntries; WORD palNumEntries;

2
include/winuser.h
View File

@ -1247,7 +1247,7 @@ typedef struct
DECL_WINELIB_TYPE_AW(WNDCLASSEX) DECL_WINELIB_TYPE_AW(WNDCLASSEX)
DECL_WINELIB_TYPE_AW(LPWNDCLASSEX) DECL_WINELIB_TYPE_AW(LPWNDCLASSEX)
typedef struct typedef struct tagMSG
{ {
HWND hwnd; HWND hwnd;
UINT message; UINT message;

8
ole/antimoniker.c
View File

@ -5,14 +5,10 @@
***************************************************************************************/ ***************************************************************************************/
#include <assert.h> #include <assert.h>
#include "winbase.h"
#include "winerror.h" #include "winerror.h"
#include "wine/obj_moniker.h"
#include "debugtools.h" #include "debugtools.h"
#include "heap.h"
#include "winuser.h"
#include "file.h"
#include "winreg.h"
#include "objbase.h"
#include "wine/obj_inplace.h"
DEFAULT_DEBUG_CHANNEL(ole) DEFAULT_DEBUG_CHANNEL(ole)

1
ole/clipboard.c
View File

@ -45,6 +45,7 @@
#include <assert.h> #include <assert.h>
#include "winuser.h" #include "winuser.h"
#include "winbase.h"
#include "winerror.h" #include "winerror.h"
#include "ole2.h" #include "ole2.h"
#include "class.h" #include "class.h"

7
ole/compositemoniker.c
View File

@ -3,15 +3,10 @@
* *
* Copyright 1999 Noomen Hamza * Copyright 1999 Noomen Hamza
***************************************************************************************/ ***************************************************************************************/
#include <assert.h> #include <assert.h>
#include "winbase.h"
#include "winerror.h" #include "winerror.h"
#include "debugtools.h" #include "debugtools.h"
#include "heap.h"
#include "winuser.h"
#include "file.h"
#include "winreg.h"
#include "objbase.h"
#include "wine/obj_inplace.h" #include "wine/obj_inplace.h"
#include "ole2.h" #include "ole2.h"

7
ole/datacache.c
View File

@ -31,10 +31,11 @@
* was stored but that's about it. * was stored but that's about it.
*/ */
#include <assert.h> #include <assert.h>
#include "wingdi.h"
#include "winuser.h" #include "winbase.h"
#include "winerror.h" #include "winerror.h"
#include "ole2.h" #include "wine/obj_oleview.h"
#include "wine/obj_cache.h"
#include "debugtools.h" #include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole) DEFAULT_DEBUG_CHANNEL(ole)

16
ole/defaulthandler.c
View File

@ -32,9 +32,11 @@
*/ */
#include <assert.h> #include <assert.h>
#include "winuser.h" #include "winbase.h"
#include "oleauto.h" /* for SysFreeString(BSTR) */
#include "winerror.h" #include "winerror.h"
#include "ole2.h" #include "ole2.h"
#include "wine/obj_oleview.h"
#include "debugtools.h" #include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole) DEFAULT_DEBUG_CHANNEL(ole)
@ -177,7 +179,7 @@ static HRESULT WINAPI DefaultHandler_GetClipboardData(
static HRESULT WINAPI DefaultHandler_DoVerb( static HRESULT WINAPI DefaultHandler_DoVerb(
IOleObject* iface, IOleObject* iface,
LONG iVerb, LONG iVerb,
LPMSG lpmsg, struct tagMSG* lpmsg,
IOleClientSite* pActiveSite, IOleClientSite* pActiveSite,
LONG lindex, LONG lindex,
HWND hwndParent, HWND hwndParent,
@ -219,8 +221,8 @@ static HRESULT WINAPI DefaultHandler_GetMiscStatus(
DWORD dwAspect, DWORD dwAspect,
DWORD* pdwStatus); DWORD* pdwStatus);
static HRESULT WINAPI DefaultHandler_SetColorScheme( static HRESULT WINAPI DefaultHandler_SetColorScheme(
IOleObject* iface, IOleObject* iface,
LOGPALETTE* pLogpal); struct tagLOGPALETTE* pLogpal);
/* /*
* Prototypes for the methods of the DefaultHandler class * Prototypes for the methods of the DefaultHandler class
@ -952,7 +954,7 @@ static HRESULT WINAPI DefaultHandler_GetClipboardData(
static HRESULT WINAPI DefaultHandler_DoVerb( static HRESULT WINAPI DefaultHandler_DoVerb(
IOleObject* iface, IOleObject* iface,
LONG iVerb, LONG iVerb,
LPMSG lpmsg, struct tagMSG* lpmsg,
IOleClientSite* pActiveSite, IOleClientSite* pActiveSite,
LONG lindex, LONG lindex,
HWND hwndParent, HWND hwndParent,
@ -1246,8 +1248,8 @@ static HRESULT WINAPI DefaultHandler_GetMiscStatus(
* See Windows documentation for more details on IOleObject methods. * See Windows documentation for more details on IOleObject methods.
*/ */
static HRESULT WINAPI DefaultHandler_SetColorScheme( static HRESULT WINAPI DefaultHandler_SetColorScheme(
IOleObject* iface, IOleObject* iface,
LOGPALETTE* pLogpal) struct tagLOGPALETTE* pLogpal)
{ {
TRACE("(%p, %p))\n", iface, pLogpal); TRACE("(%p, %p))\n", iface, pLogpal);
return OLE_E_NOTRUNNING; return OLE_E_NOTRUNNING;

6
ole/filemoniker.c
View File

@ -5,14 +5,12 @@
***************************************************************************************/ ***************************************************************************************/
#include <assert.h> #include <assert.h>
#include "winbase.h"
#include "winerror.h" #include "winerror.h"
#include "debugtools.h" #include "debugtools.h"
#include "heap.h"
#include "winuser.h"
#include "file.h"
#include "winreg.h"
#include "objbase.h" #include "objbase.h"
#include "wine/obj_storage.h" #include "wine/obj_storage.h"
#include "wine/obj_moniker.h"
#include "wine/obj_base.h" #include "wine/obj_base.h"
DEFAULT_DEBUG_CHANNEL(ole) DEFAULT_DEBUG_CHANNEL(ole)

9
ole/itemmoniker.c
View File

@ -4,14 +4,13 @@
* Copyright 1999 Noomen Hamza * Copyright 1999 Noomen Hamza
***************************************************************************************/ ***************************************************************************************/
#include "wine/obj_base.h"
#include "wine/obj_moniker.h"
#include "winbase.h"
#include <assert.h> #include <assert.h>
#include "winerror.h" #include "winerror.h"
#include "debugtools.h" #include "debugtools.h"
#include "heap.h"
#include "winuser.h"
#include "file.h"
#include "winreg.h"
#include "objbase.h"
#include "wine/obj_inplace.h" #include "wine/obj_inplace.h"
DEFAULT_DEBUG_CHANNEL(ole) DEFAULT_DEBUG_CHANNEL(ole)

1
ole/ole2.c
View File

@ -14,7 +14,6 @@
#include "winerror.h" #include "winerror.h"
#include "ole2.h" #include "ole2.h"
#include "process.h" #include "process.h"
#include "hook.h"
#include "commctrl.h" #include "commctrl.h"
#include "wine/obj_clientserver.h" #include "wine/obj_clientserver.h"
#include "wine/wingdi16.h" #include "wine/wingdi16.h"

3
ole/ole2disp.c
View File

@ -3,10 +3,9 @@
* *
* Copyright 1995 Martin von Loewis * Copyright 1995 Martin von Loewis
*/ */
#include <string.h> #include <string.h>
#include "winuser.h"
#include "winerror.h" #include "winerror.h"
#include "ole2.h"
#include "oleauto.h" #include "oleauto.h"
#include "wine/obj_base.h" #include "wine/obj_base.h"
#include "heap.h" #include "heap.h"

4
ole/ole2stubs.c
View File

@ -59,7 +59,7 @@ HRESULT WINAPI WriteFmtUserTypeStg(
* OleTranslateAccelerator [OLE32.130] * OleTranslateAccelerator [OLE32.130]
*/ */
HRESULT WINAPI OleTranslateAccelerator (LPOLEINPLACEFRAME lpFrame, HRESULT WINAPI OleTranslateAccelerator (LPOLEINPLACEFRAME lpFrame,
LPOLEINPLACEFRAMEINFO lpFrameInfo, LPMSG lpmsg) LPOLEINPLACEFRAMEINFO lpFrameInfo, struct tagMSG* lpmsg)
{ {
FIXME("(%p,%p,%p),stub!\n", lpFrame, lpFrameInfo, lpmsg); FIXME("(%p,%p,%p),stub!\n", lpFrame, lpFrameInfo, lpmsg);
return S_OK; return S_OK;
@ -78,7 +78,7 @@ HRESULT WINAPI CoTreatAsClass(REFCLSID clsidOld, REFCLSID clsidNew)
/****************************************************************************** /******************************************************************************
* IsAccelerator [OLE32.75] * IsAccelerator [OLE32.75]
*/ */
BOOL WINAPI IsAccelerator(HACCEL hAccel, int cAccelEntries, LPMSG lpMsg, WORD* lpwCmd) BOOL WINAPI IsAccelerator(HACCEL hAccel, int cAccelEntries, struct tagMSG* lpMsg, WORD* lpwCmd)
{ {
FIXME("(%x,%i,%p,%p), stub!\n", hAccel, cAccelEntries, lpMsg, lpwCmd); FIXME("(%x,%i,%p,%p), stub!\n", hAccel, cAccelEntries, lpMsg, lpwCmd);
return TRUE; return TRUE;

3
ole/olecli.c
View File

@ -6,11 +6,8 @@
/* At the moment, these are only empty stubs. /* At the moment, these are only empty stubs.
*/ */
#include "winerror.h"
#include "ole.h" #include "ole.h"
#include "gdi.h" #include "gdi.h"
#include "objidl.h"
#include "debugtools.h" #include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole) DEFAULT_DEBUG_CHANNEL(ole)

5
ole/olefont.c
View File

@ -9,8 +9,9 @@
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "winerror.h" #include "winerror.h"
#include "oleauto.h" #include "oleauto.h" /* for SysAllocString(....) */
#include "ocidl.h" #include "wine/obj_olefont.h"
#include "wine/obj_storage.h"
#include "olectl.h" #include "olectl.h"
#include "debugtools.h" #include "debugtools.h"
#include "heap.h" #include "heap.h"

10
ole/storage32.c
View File

@ -15,17 +15,11 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "winbase.h" #include "winbase.h" /* for lstrlenW() and the likes */
#include "winerror.h"
#include "wine/obj_storage.h"
#include "wine/winestring.h"
#include "crtdll.h"
#include "tchar.h"
#include "debugtools.h" #include "debugtools.h"
#include "windef.h"
#include "storage32.h" #include "storage32.h"
#include "ole2.h" #include "ole2.h" /* For Write/ReadClassStm */
DEFAULT_DEBUG_CHANNEL(storage) DEFAULT_DEBUG_CHANNEL(storage)

4
ole/storage32.h
View File

@ -15,6 +15,10 @@
#ifndef __STORAGE32_H__ #ifndef __STORAGE32_H__
#define __STORAGE32_H__ #define __STORAGE32_H__
#include "wtypes.h"
#include "winnt.h"
#include "wine/obj_storage.h"
/* /*
* Definitions for the file format offsets. * Definitions for the file format offsets.
*/ */

8
ole/typelib.c
View File

@ -27,12 +27,10 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include "windef.h"
#include "winerror.h" #include "winerror.h"
#include "winreg.h" #include "winreg.h" /* for HKEY_LOCAL_MACHINE */
#include "oleauto.h" #include "winnls.h" /* for PRIMARYLANGID */
#include "winnls.h" #include "wine/winbase16.h" /* for RegQueryValue16(HKEY,LPSTR,LPSTR,LPDWORD) */
#include "wine/winbase16.h"
#include "heap.h" #include "heap.h"
#include "wine/obj_base.h" #include "wine/obj_base.h"
#include "debugtools.h" #include "debugtools.h"

2
ole/typelib.h
View File

@ -9,9 +9,7 @@
#define _WINE_TYPELIB_H #define _WINE_TYPELIB_H
#include "ole2.h"
#include "oleauto.h" #include "oleauto.h"
#include "oaidl.h"
#define TLBMAGIC2 "MSFT" #define TLBMAGIC2 "MSFT"

2
ole/variant.c
View File

@ -10,7 +10,7 @@
* initialization, copying, destroying and changing the type of VARIANTs. * initialization, copying, destroying and changing the type of VARIANTs.
* *
* TODO: * TODO:
* - The Variant APIs are do not support international languages, currency * - The Variant APIs do not support international languages, currency
* types, number formating and calendar. They only support U.S. English format. * types, number formating and calendar. They only support U.S. English format.
* - The Variant APIs do not the following types: IUknown, IDispatch, DECIMAL and SafeArray. * - The Variant APIs do not the following types: IUknown, IDispatch, DECIMAL and SafeArray.
* The prototypes for these are commented out in the oleauto.h file. They need * The prototypes for these are commented out in the oleauto.h file. They need