Commit 4405f3c3 authored by Michael Veksler's avatar Michael Veksler Committed by Alexandre Julliard

Removed unnecessary includes from ole related files.

parent 708a1c03
......@@ -15,6 +15,7 @@
#include "wine/obj_base.h"
#include "wine/obj_shellfolder.h"
#include "wine/obj_shellview.h"
#include "wine/obj_oleview.h"
#include "wine/obj_commdlgbrowser.h"
#include "wine/obj_shellbrowser.h"
#include "wine/obj_dockingwindowframe.h"
......
......@@ -3,7 +3,7 @@
/* 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 */
HRESULT WINAPI RunningObjectTableImpl_Initialize();
......
......@@ -7,8 +7,17 @@
#include "windef.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 "oleauto.h"
#endif
struct tagMSG;
#ifdef __cplusplus
extern "C" {
......@@ -82,12 +91,12 @@ HRESULT WINAPI OleCreate(REFCLSID rclsid, REFIID riid, DWORD renderopt, LPFO
LPSTORAGE pStg, LPVOID* ppvObj);
HRESULT WINAPI OleFlushClipboard(void);
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,
LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj);
HRESULT WINAPI OleDuplicateData(HANDLE hSrc, CLIPFORMAT cfFormat, UINT uiFlags);
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,
LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj);
HRESULT WINAPI OleCreateDefaultHandler(REFCLSID clsid,
......
#ifndef __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
extern "C" {
#endif
/*#include <ole.h> */
#include "mapidefs.h"
#include "wine/obj_oleaut.h"
#include "oaidl.h"
BSTR16 WINAPI SysAllocString16(LPCOLESTR16);
BSTR WINAPI SysAllocString(const OLECHAR*);
......@@ -28,67 +34,67 @@ int WINAPI SysStringLen(BSTR);
*/
HRESULT WINAPI
SafeArrayAllocDescriptor(UINT cDims, SAFEARRAY **ppsaOut);
SafeArrayAllocDescriptor(UINT cDims, struct tagSAFEARRAY **ppsaOut);
HRESULT WINAPI
SafeArrayAllocData(SAFEARRAY *psa);
SafeArrayAllocData(struct tagSAFEARRAY *psa);
SAFEARRAY* WINAPI
SafeArrayCreate(VARTYPE vt, UINT cDims, SAFEARRAYBOUND *rgsabound);
struct tagSAFEARRAY* WINAPI
SafeArrayCreate(VARTYPE vt, UINT cDims, struct tagSAFEARRAYBOUND *rgsabound);
HRESULT WINAPI
SafeArrayDestroyDescriptor(SAFEARRAY *psa);
SafeArrayDestroyDescriptor(struct tagSAFEARRAY *psa);
HRESULT WINAPI
SafeArrayPutElement(SAFEARRAY *psa, LONG *rgIndices, void *pv);
SafeArrayPutElement(struct tagSAFEARRAY *psa, LONG *rgIndices, void *pv);
HRESULT WINAPI
SafeArrayGetElement(SAFEARRAY *psa, LONG *rgIndices, void *pv);
SafeArrayGetElement(struct tagSAFEARRAY *psa, LONG *rgIndices, void *pv);
HRESULT WINAPI
SafeArrayLock(SAFEARRAY *psa);
SafeArrayLock(struct tagSAFEARRAY *psa);
HRESULT WINAPI
SafeArrayUnlock(SAFEARRAY *psa);
SafeArrayUnlock(struct tagSAFEARRAY *psa);
HRESULT WINAPI
SafeArrayGetUBound(SAFEARRAY *psa, UINT nDim, LONG *plUbound);
SafeArrayGetUBound(struct tagSAFEARRAY *psa, UINT nDim, LONG *plUbound);
HRESULT WINAPI
SafeArrayGetLBound(SAFEARRAY *psa, UINT nDim, LONG *plLbound);
SafeArrayGetLBound(struct tagSAFEARRAY *psa, UINT nDim, LONG *plLbound);
UINT WINAPI
SafeArrayGetDim(SAFEARRAY *psa);
SafeArrayGetDim(struct tagSAFEARRAY *psa);
UINT WINAPI
SafeArrayGetElemsize(SAFEARRAY *psa);
SafeArrayGetElemsize(struct tagSAFEARRAY *psa);
HRESULT WINAPI
SafeArrayAccessData(SAFEARRAY *psa, void **ppvData);
SafeArrayAccessData(struct tagSAFEARRAY *psa, void **ppvData);
HRESULT WINAPI
SafeArrayUnaccessData(SAFEARRAY *psa);
SafeArrayUnaccessData(struct tagSAFEARRAY *psa);
HRESULT WINAPI
SafeArrayPtrOfIndex(SAFEARRAY *psa, LONG *rgIndices, void **ppvData);
SafeArrayPtrOfIndex(struct tagSAFEARRAY *psa, LONG *rgIndices, void **ppvData);
HRESULT WINAPI
SafeArrayCopyData(SAFEARRAY *psaSource, SAFEARRAY **psaTarget);
SafeArrayCopyData(struct tagSAFEARRAY *psaSource, struct tagSAFEARRAY **psaTarget);
HRESULT WINAPI
SafeArrayDestroyData(SAFEARRAY *psa);
SafeArrayDestroyData(struct tagSAFEARRAY *psa);
HRESULT WINAPI
SafeArrayDestroy(SAFEARRAY *psa);
SafeArrayDestroy(struct tagSAFEARRAY *psa);
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);
HRESULT WINAPI
SafeArrayRedim(SAFEARRAY *psa, SAFEARRAYBOUND *psaboundNew);
SafeArrayRedim(struct tagSAFEARRAY *psa, struct tagSAFEARRAYBOUND *psaboundNew);
/* These are macros that help accessing the VARIANT date type.
......@@ -151,13 +157,13 @@ SafeArrayRedim(SAFEARRAY *psa, SAFEARRAYBOUND *psaboundNew);
* VARIANT API
*/
void WINAPI VariantInit(VARIANTARG* pvarg);
HRESULT WINAPI VariantClear(VARIANTARG* pvarg);
HRESULT WINAPI VariantCopy(VARIANTARG* pvargDest, VARIANTARG* pvargSrc);
HRESULT WINAPI VariantCopyInd(VARIANT* pvargDest, VARIANTARG* pvargSrc);
HRESULT WINAPI VariantChangeType(VARIANTARG* pvargDest, VARIANTARG* pvargSrc,
void WINAPI VariantInit(struct tagVARIANT* pvarg);
HRESULT WINAPI VariantClear(struct tagVARIANT* pvarg);
HRESULT WINAPI VariantCopy(struct tagVARIANT* pvargDest, struct tagVARIANT* pvargSrc);
HRESULT WINAPI VariantCopyInd(struct tagVARIANT* pvargDest, struct tagVARIANT* pvargSrc);
HRESULT WINAPI VariantChangeType(struct tagVARIANT* pvargDest, struct tagVARIANT* pvargSrc,
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);
/*
......
......@@ -8,7 +8,9 @@
#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
extern "C" {
......
......@@ -10,6 +10,11 @@
#include "winbase.h"
#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
extern "C" {
......@@ -167,7 +172,7 @@ typedef struct IProvideClassInfo2 IProvideClassInfo2, *LPPROVIDECLASSINFO2;
#define ICOM_INTERFACE IOleControl
#define IOleControl_METHODS \
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,FreezeEvents, BOOL,bFreeze)
#define IOleControl_IMETHODS \
......@@ -198,7 +203,7 @@ ICOM_DEFINE(IOleControl,IUnknown)
ICOM_METHOD1(HRESULT,LockInPlaceActive, BOOL,fLock) \
ICOM_METHOD1(HRESULT,GetExtendedControl, IDispatch**,ppDisp) \
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_METHOD (HRESULT,ShowPropertyFrame)
#define IOleControlSite_IMETHODS \
......
/*
* 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
#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)
#define DUMMYUNIONNAME
#else /* defined(__cplusplus) && !defined(NONAMELESSUNION) */
......
......@@ -8,8 +8,7 @@
#define __WINE_WINE_OBJ_INPLACE_H
#include "winbase.h"
#include "winuser.h"
struct tagMSG;
#include "wine/obj_moniker.h"
#ifdef __cplusplus
......@@ -206,7 +205,7 @@ ICOM_DEFINE(IOleInPlaceObject,IOleWindow)
*/
#define ICOM_INTERFACE IOleInPlaceActiveObject
#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,OnDocWindowActivate, BOOL,fActivate) \
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,SetStatusText, LPCOLESTR,pszStatusText) \
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 \
IOleInPlaceUIWindow_IMETHODS \
IOleInPlaceFrame_METHODS
......
......@@ -7,6 +7,7 @@
#ifndef __WINE_WINE_OBJ_OLEFONT_H
#define __WINE_WINE_OBJ_OLEFONT_H
#include "wine/obj_oleaut.h"
#include "wine/obj_base.h"
#include "wingdi.h" /* TEXTMETRIC*/
......
......@@ -8,9 +8,12 @@
#define __WINE_WINE_OBJ_OLEOBJ_H
#include "winbase.h"
#include "winuser.h"
#include "wine/obj_base.h"
#include "wine/obj_moniker.h"
#include "wine/obj_inplace.h"
#include "wine/obj_dataobject.h"
struct tagMSG;
struct tagLOGPALETTE;
#ifdef __cplusplus
extern "C" {
......@@ -88,7 +91,7 @@ typedef struct IEnumOLEVERB IEnumOLEVERB, *LPENUMOLEVERB;
ICOM_METHOD3(HRESULT,GetMoniker, DWORD,dwAssign, DWORD,dwWhichMoniker, IMoniker**,ppmk) \
ICOM_METHOD3(HRESULT,InitFromData, IDataObject*,pDataObject, BOOL,fCreation, DWORD,dwReserved) \
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_METHOD (HRESULT,Update) \
ICOM_METHOD (HRESULT,IsUpToDate) \
......@@ -100,7 +103,7 @@ typedef struct IEnumOLEVERB IEnumOLEVERB, *LPENUMOLEVERB;
ICOM_METHOD1(HRESULT,Unadvise, DWORD,dwConnection) \
ICOM_METHOD1(HRESULT,EnumAdvise, IEnumSTATDATA**,ppenumAdvise) \
ICOM_METHOD2(HRESULT,GetMiscStatus, DWORD,dwAspect, DWORD*,pdwStatus) \
ICOM_METHOD1(HRESULT,SetColorScheme, LOGPALETTE*,pLogpal)
ICOM_METHOD1(HRESULT,SetColorScheme, struct tagLOGPALETTE*,pLogpal)
#define IOleObject_IMETHODS \
IUnknown_IMETHODS \
IOleObject_METHODS
......
/*
* Defines the COM interfaces and APIs related to ViewObject
*
* Depends on 'obj_base.h'.
*/
#ifndef __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
extern "C" {
......@@ -37,7 +39,7 @@ typedef BOOL (CALLBACK* IVO_ContCallback)(DWORD);
#define ICOM_INTERFACE IViewObject
#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_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_METHOD1(HRESULT,Unfreeze, DWORD,dwFreeze) \
ICOM_METHOD3(HRESULT,SetAdvise, DWORD,aspects, DWORD,advf, IAdviseSink*,pAdvSink) \
......
......@@ -1338,7 +1338,7 @@ typedef struct tagPALETTEENTRY
#define PC_EXPLICIT 0x02
#define PC_NOCOLLAPSE 0x04
typedef struct
typedef struct tagLOGPALETTE
{
WORD palVersion;
WORD palNumEntries;
......
......@@ -1247,7 +1247,7 @@ typedef struct
DECL_WINELIB_TYPE_AW(WNDCLASSEX)
DECL_WINELIB_TYPE_AW(LPWNDCLASSEX)
typedef struct
typedef struct tagMSG
{
HWND hwnd;
UINT message;
......
......@@ -5,14 +5,10 @@
***************************************************************************************/
#include <assert.h>
#include "winbase.h"
#include "winerror.h"
#include "wine/obj_moniker.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)
......
......@@ -45,6 +45,7 @@
#include <assert.h>
#include "winuser.h"
#include "winbase.h"
#include "winerror.h"
#include "ole2.h"
#include "class.h"
......
......@@ -3,15 +3,10 @@
*
* Copyright 1999 Noomen Hamza
***************************************************************************************/
#include <assert.h>
#include "winbase.h"
#include "winerror.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 "ole2.h"
......
......@@ -31,10 +31,11 @@
* was stored but that's about it.
*/
#include <assert.h>
#include "winuser.h"
#include "wingdi.h"
#include "winbase.h"
#include "winerror.h"
#include "ole2.h"
#include "wine/obj_oleview.h"
#include "wine/obj_cache.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole)
......
......@@ -32,9 +32,11 @@
*/
#include <assert.h>
#include "winuser.h"
#include "winbase.h"
#include "oleauto.h" /* for SysFreeString(BSTR) */
#include "winerror.h"
#include "ole2.h"
#include "wine/obj_oleview.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole)
......@@ -177,7 +179,7 @@ static HRESULT WINAPI DefaultHandler_GetClipboardData(
static HRESULT WINAPI DefaultHandler_DoVerb(
IOleObject* iface,
LONG iVerb,
LPMSG lpmsg,
struct tagMSG* lpmsg,
IOleClientSite* pActiveSite,
LONG lindex,
HWND hwndParent,
......@@ -219,8 +221,8 @@ static HRESULT WINAPI DefaultHandler_GetMiscStatus(
DWORD dwAspect,
DWORD* pdwStatus);
static HRESULT WINAPI DefaultHandler_SetColorScheme(
IOleObject* iface,
LOGPALETTE* pLogpal);
IOleObject* iface,
struct tagLOGPALETTE* pLogpal);
/*
* Prototypes for the methods of the DefaultHandler class
......@@ -952,7 +954,7 @@ static HRESULT WINAPI DefaultHandler_GetClipboardData(
static HRESULT WINAPI DefaultHandler_DoVerb(
IOleObject* iface,
LONG iVerb,
LPMSG lpmsg,
struct tagMSG* lpmsg,
IOleClientSite* pActiveSite,
LONG lindex,
HWND hwndParent,
......@@ -1246,8 +1248,8 @@ static HRESULT WINAPI DefaultHandler_GetMiscStatus(
* See Windows documentation for more details on IOleObject methods.
*/
static HRESULT WINAPI DefaultHandler_SetColorScheme(
IOleObject* iface,
LOGPALETTE* pLogpal)
IOleObject* iface,
struct tagLOGPALETTE* pLogpal)
{
TRACE("(%p, %p))\n", iface, pLogpal);
return OLE_E_NOTRUNNING;
......
......@@ -5,14 +5,12 @@
***************************************************************************************/
#include <assert.h>
#include "winbase.h"
#include "winerror.h"
#include "debugtools.h"
#include "heap.h"
#include "winuser.h"
#include "file.h"
#include "winreg.h"
#include "objbase.h"
#include "wine/obj_storage.h"
#include "wine/obj_moniker.h"
#include "wine/obj_base.h"
DEFAULT_DEBUG_CHANNEL(ole)
......
......@@ -4,14 +4,13 @@
* Copyright 1999 Noomen Hamza
***************************************************************************************/
#include "wine/obj_base.h"
#include "wine/obj_moniker.h"
#include "winbase.h"
#include <assert.h>
#include "winerror.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)
......
......@@ -14,7 +14,6 @@
#include "winerror.h"
#include "ole2.h"
#include "process.h"
#include "hook.h"
#include "commctrl.h"
#include "wine/obj_clientserver.h"
#include "wine/wingdi16.h"
......
......@@ -3,10 +3,9 @@
*
* Copyright 1995 Martin von Loewis
*/
#include <string.h>
#include "winuser.h"
#include "winerror.h"
#include "ole2.h"
#include "oleauto.h"
#include "wine/obj_base.h"
#include "heap.h"
......
......@@ -59,7 +59,7 @@ HRESULT WINAPI WriteFmtUserTypeStg(
* OleTranslateAccelerator [OLE32.130]
*/
HRESULT WINAPI OleTranslateAccelerator (LPOLEINPLACEFRAME lpFrame,
LPOLEINPLACEFRAMEINFO lpFrameInfo, LPMSG lpmsg)
LPOLEINPLACEFRAMEINFO lpFrameInfo, struct tagMSG* lpmsg)
{
FIXME("(%p,%p,%p),stub!\n", lpFrame, lpFrameInfo, lpmsg);
return S_OK;
......@@ -78,7 +78,7 @@ HRESULT WINAPI CoTreatAsClass(REFCLSID clsidOld, REFCLSID clsidNew)
/******************************************************************************
* 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);
return TRUE;
......
......@@ -6,11 +6,8 @@
/* At the moment, these are only empty stubs.
*/
#include "winerror.h"
#include "ole.h"
#include "gdi.h"
#include "objidl.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole)
......
......@@ -9,8 +9,9 @@
#include <assert.h>
#include <string.h>
#include "winerror.h"
#include "oleauto.h"
#include "ocidl.h"
#include "oleauto.h" /* for SysAllocString(....) */
#include "wine/obj_olefont.h"
#include "wine/obj_storage.h"
#include "olectl.h"
#include "debugtools.h"
#include "heap.h"
......
......@@ -15,17 +15,11 @@
#include <stdio.h>
#include <string.h>
#include "winbase.h"
#include "winerror.h"
#include "wine/obj_storage.h"
#include "wine/winestring.h"
#include "crtdll.h"
#include "tchar.h"
#include "winbase.h" /* for lstrlenW() and the likes */
#include "debugtools.h"
#include "windef.h"
#include "storage32.h"
#include "ole2.h"
#include "ole2.h" /* For Write/ReadClassStm */
DEFAULT_DEBUG_CHANNEL(storage)
......
......@@ -15,6 +15,10 @@
#ifndef __STORAGE32_H__
#define __STORAGE32_H__
#include "wtypes.h"
#include "winnt.h"
#include "wine/obj_storage.h"
/*
* Definitions for the file format offsets.
*/
......
......@@ -27,12 +27,10 @@
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include "windef.h"
#include "winerror.h"
#include "winreg.h"
#include "oleauto.h"
#include "winnls.h"
#include "wine/winbase16.h"
#include "winreg.h" /* for HKEY_LOCAL_MACHINE */
#include "winnls.h" /* for PRIMARYLANGID */
#include "wine/winbase16.h" /* for RegQueryValue16(HKEY,LPSTR,LPSTR,LPDWORD) */
#include "heap.h"
#include "wine/obj_base.h"
#include "debugtools.h"
......
......@@ -9,9 +9,7 @@
#define _WINE_TYPELIB_H
#include "ole2.h"
#include "oleauto.h"
#include "oaidl.h"
#define TLBMAGIC2 "MSFT"
......
......@@ -10,7 +10,7 @@
* initialization, copying, destroying and changing the type of VARIANTs.
*
* 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.
* - 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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment