- Moved 16 bit functions to a seperate file.
- First implementation for free threaded marshaller. - Fixed handling of REG_EXPAND_STRING registry values in CoCreateObject. - Fixed CoLoad/FreeLibrary functions. - Fixed use internal dll-list (used only for functions loading a dll internally without returning HMODULE).
This commit is contained in:
parent
c414344e2a
commit
d1c144148c
|
@ -21,12 +21,14 @@ C_SRCS = \
|
|||
defaulthandler.c \
|
||||
errorinfo.c \
|
||||
filemoniker.c \
|
||||
ftmarshal.c \
|
||||
hglobalstream.c \
|
||||
ifs.c \
|
||||
itemmoniker.c \
|
||||
marshal.c \
|
||||
memlockbytes.c \
|
||||
moniker.c \
|
||||
ole16.c \
|
||||
ole2.c \
|
||||
ole2stubs.c \
|
||||
ole2impl.c \
|
||||
|
@ -45,4 +47,3 @@ RC_SRCS = ole32res.rc
|
|||
@MAKE_DLL_RULES@
|
||||
|
||||
### Dependencies:
|
||||
|
||||
|
|
1210
dlls/ole32/compobj.c
1210
dlls/ole32/compobj.c
File diff suppressed because it is too large
Load Diff
|
@ -116,4 +116,6 @@ HRESULT WINAPI RunningObjectTableImpl_UnInitialize();
|
|||
/* This function decomposes a String path to a String Table containing all the elements ("\" or "subDirectory" or "Directory" or "FileName") of the path */
|
||||
int WINAPI FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable);
|
||||
|
||||
HRESULT WINAPI __CLSIDFromStringA(LPCSTR idstr, CLSID *id);
|
||||
|
||||
#endif /* __WINE_OLE_COMPOBJ_H */
|
||||
|
|
|
@ -0,0 +1,241 @@
|
|||
/*
|
||||
* free threaded marshaler
|
||||
*
|
||||
* Copyright 2002 Juergen Schmied
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <assert.h>
|
||||
|
||||
#include "winbase.h"
|
||||
|
||||
#include "wine/obj_base.h"
|
||||
#include "wine/obj_storage.h"
|
||||
#include "wine/obj_marshal.h"
|
||||
|
||||
#include "wine/debug.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||
|
||||
typedef struct _FTMarshalImpl {
|
||||
ICOM_VFIELD (IUnknown);
|
||||
DWORD ref;
|
||||
ICOM_VTABLE (IMarshal) * lpvtblFTM;
|
||||
|
||||
IUnknown *pUnkOuter;
|
||||
} FTMarshalImpl;
|
||||
|
||||
#define _IFTMUnknown_(This)(IUnknown*)&(This->lpVtbl)
|
||||
#define _IFTMarshal_(This) (IMarshal*)&(This->lpvtblFTM)
|
||||
|
||||
#define _IFTMarshall_Offset ((int)(&(((FTMarshalImpl*)0)->lpvtblFTM)))
|
||||
#define _ICOM_THIS_From_IFTMarshal(class, name) class* This = (class*)(((char*)name)-_IFTMarshall_Offset);
|
||||
|
||||
/* inner IUnknown to handle aggregation */
|
||||
HRESULT WINAPI IiFTMUnknown_fnQueryInterface (IUnknown * iface, REFIID riid, LPVOID * ppv)
|
||||
{
|
||||
|
||||
ICOM_THIS (FTMarshalImpl, iface);
|
||||
|
||||
TRACE ("\n");
|
||||
*ppv = NULL;
|
||||
|
||||
if (IsEqualIID (&IID_IUnknown, riid))
|
||||
*ppv = _IFTMUnknown_ (This);
|
||||
else if (IsEqualIID (&IID_IMarshal, riid))
|
||||
*ppv = _IFTMarshal_ (This);
|
||||
else {
|
||||
FIXME ("No interface for %s.\n", debugstr_guid (riid));
|
||||
return E_NOINTERFACE;
|
||||
}
|
||||
IUnknown_AddRef ((IUnknown *) * ppv);
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
ULONG WINAPI IiFTMUnknown_fnAddRef (IUnknown * iface)
|
||||
{
|
||||
|
||||
ICOM_THIS (FTMarshalImpl, iface);
|
||||
|
||||
TRACE ("\n");
|
||||
return InterlockedIncrement (&This->ref);
|
||||
}
|
||||
|
||||
ULONG WINAPI IiFTMUnknown_fnRelease (IUnknown * iface)
|
||||
{
|
||||
|
||||
ICOM_THIS (FTMarshalImpl, iface);
|
||||
|
||||
TRACE ("\n");
|
||||
if (InterlockedDecrement (&This->ref))
|
||||
return This->ref;
|
||||
HeapFree (GetProcessHeap (), 0, This);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static ICOM_VTABLE (IUnknown) iunkvt =
|
||||
{
|
||||
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
|
||||
IiFTMUnknown_fnQueryInterface,
|
||||
IiFTMUnknown_fnAddRef,
|
||||
IiFTMUnknown_fnRelease
|
||||
};
|
||||
|
||||
HRESULT WINAPI FTMarshalImpl_QueryInterface (LPMARSHAL iface, REFIID riid, LPVOID * ppv)
|
||||
{
|
||||
|
||||
_ICOM_THIS_From_IFTMarshal (FTMarshalImpl, iface);
|
||||
|
||||
TRACE ("(%p)->(\n\tIID:\t%s,%p)\n", This, debugstr_guid (riid), ppv);
|
||||
return IUnknown_QueryInterface (This->pUnkOuter, riid, ppv);
|
||||
}
|
||||
|
||||
ULONG WINAPI FTMarshalImpl_AddRef (LPMARSHAL iface)
|
||||
{
|
||||
|
||||
_ICOM_THIS_From_IFTMarshal (FTMarshalImpl, iface);
|
||||
|
||||
TRACE ("\n");
|
||||
return IUnknown_AddRef (This->pUnkOuter);
|
||||
}
|
||||
|
||||
ULONG WINAPI FTMarshalImpl_Release (LPMARSHAL iface)
|
||||
{
|
||||
|
||||
_ICOM_THIS_From_IFTMarshal (FTMarshalImpl, iface);
|
||||
|
||||
TRACE ("\n");
|
||||
return IUnknown_Release (This->pUnkOuter);
|
||||
}
|
||||
|
||||
HRESULT WINAPI FTMarshalImpl_GetUnmarshalClass (LPMARSHAL iface, REFIID riid, void *pv, DWORD dwDestContext,
|
||||
void *pvDestContext, DWORD mshlflags, CLSID * pCid)
|
||||
{
|
||||
FIXME ("(), stub!\n");
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
HRESULT WINAPI FTMarshalImpl_GetMarshalSizeMax (LPMARSHAL iface, REFIID riid, void *pv, DWORD dwDestContext,
|
||||
void *pvDestContext, DWORD mshlflags, DWORD * pSize)
|
||||
{
|
||||
|
||||
IMarshal *pMarshal = NULL;
|
||||
HRESULT hres;
|
||||
|
||||
_ICOM_THIS_From_IFTMarshal (FTMarshalImpl, iface);
|
||||
|
||||
FIXME ("(), stub!\n");
|
||||
|
||||
/* if the marshaling happends inside the same process the interface pointer is
|
||||
copied between the appartments */
|
||||
if (dwDestContext == MSHCTX_INPROC || dwDestContext == MSHCTX_CROSSCTX) {
|
||||
*pSize = sizeof (This);
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
/* use the standard marshaler to handle all other cases */
|
||||
CoGetStandardMarshal (riid, pv, dwDestContext, pvDestContext, mshlflags, &pMarshal);
|
||||
hres = IMarshal_GetMarshalSizeMax (pMarshal, riid, pv, dwDestContext, pvDestContext, mshlflags, pSize);
|
||||
IMarshal_Release (pMarshal);
|
||||
return hres;
|
||||
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
HRESULT WINAPI FTMarshalImpl_MarshalInterface (LPMARSHAL iface, IStream * pStm, REFIID riid, void *pv,
|
||||
DWORD dwDestContext, void *pvDestContext, DWORD mshlflags)
|
||||
{
|
||||
|
||||
IMarshal *pMarshal = NULL;
|
||||
HRESULT hres;
|
||||
|
||||
_ICOM_THIS_From_IFTMarshal (FTMarshalImpl, iface);
|
||||
|
||||
FIXME ("(), stub!\n");
|
||||
|
||||
/* if the marshaling happends inside the same process the interface pointer is
|
||||
copied between the appartments */
|
||||
if (dwDestContext == MSHCTX_INPROC || dwDestContext == MSHCTX_CROSSCTX) {
|
||||
return IStream_Write (pStm, This, sizeof (This), 0);
|
||||
}
|
||||
|
||||
/* use the standard marshaler to handle all other cases */
|
||||
CoGetStandardMarshal (riid, pv, dwDestContext, pvDestContext, mshlflags, &pMarshal);
|
||||
hres = IMarshal_MarshalInterface (pMarshal, pStm, riid, pv, dwDestContext, pvDestContext, mshlflags);
|
||||
IMarshal_Release (pMarshal);
|
||||
return hres;
|
||||
}
|
||||
|
||||
HRESULT WINAPI FTMarshalImpl_UnmarshalInterface (LPMARSHAL iface, IStream * pStm, REFIID riid, void **ppv)
|
||||
{
|
||||
FIXME ("(), stub!\n");
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
HRESULT WINAPI FTMarshalImpl_ReleaseMarshalData (LPMARSHAL iface, IStream * pStm)
|
||||
{
|
||||
FIXME ("(), stub!\n");
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
HRESULT WINAPI FTMarshalImpl_DisconnectObject (LPMARSHAL iface, DWORD dwReserved)
|
||||
{
|
||||
FIXME ("(), stub!\n");
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
ICOM_VTABLE (IMarshal) ftmvtbl =
|
||||
{
|
||||
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
|
||||
FTMarshalImpl_QueryInterface,
|
||||
FTMarshalImpl_AddRef,
|
||||
FTMarshalImpl_Release,
|
||||
FTMarshalImpl_GetUnmarshalClass,
|
||||
FTMarshalImpl_GetMarshalSizeMax,
|
||||
FTMarshalImpl_MarshalInterface,
|
||||
FTMarshalImpl_UnmarshalInterface,
|
||||
FTMarshalImpl_ReleaseMarshalData,
|
||||
FTMarshalImpl_DisconnectObject
|
||||
};
|
||||
|
||||
/***********************************************************************
|
||||
* CoCreateFreeThreadedMarshaler [OLE32.5]
|
||||
*
|
||||
*/
|
||||
HRESULT WINAPI CoCreateFreeThreadedMarshaler (LPUNKNOWN punkOuter, LPUNKNOWN * ppunkMarshal)
|
||||
{
|
||||
|
||||
FTMarshalImpl *ftm;
|
||||
|
||||
TRACE ("(%p %p)\n", punkOuter, ppunkMarshal);
|
||||
|
||||
ftm = (FTMarshalImpl *) HeapAlloc (GetProcessHeap (), 0, sizeof (FTMarshalImpl));
|
||||
if (!ftm)
|
||||
return E_OUTOFMEMORY;
|
||||
|
||||
ICOM_VTBL (ftm) = &iunkvt;
|
||||
ftm->lpvtblFTM = &ftmvtbl;
|
||||
ftm->ref = 1;
|
||||
ftm->pUnkOuter = punkOuter;
|
||||
|
||||
*ppunkMarshal = _IFTMUnknown_ (ftm);
|
||||
return S_OK;
|
||||
}
|
143
dlls/ole32/ifs.c
143
dlls/ole32/ifs.c
|
@ -27,156 +27,15 @@
|
|||
|
||||
#include "ole2.h"
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "winerror.h"
|
||||
|
||||
#include "wine/obj_base.h"
|
||||
#include "wine/winbase16.h"
|
||||
#include "ifs.h"
|
||||
|
||||
#include "wine/debug.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||
|
||||
/* --- IMalloc16 implementation */
|
||||
|
||||
|
||||
typedef struct
|
||||
{
|
||||
/* IUnknown fields */
|
||||
ICOM_VFIELD(IMalloc16);
|
||||
DWORD ref;
|
||||
/* IMalloc16 fields */
|
||||
} IMalloc16Impl;
|
||||
|
||||
/******************************************************************************
|
||||
* IMalloc16_QueryInterface [COMPOBJ.500]
|
||||
*/
|
||||
HRESULT WINAPI IMalloc16_fnQueryInterface(IMalloc16* iface,REFIID refiid,LPVOID *obj) {
|
||||
ICOM_THIS(IMalloc16Impl,iface);
|
||||
|
||||
TRACE("(%p)->QueryInterface(%s,%p)\n",This,debugstr_guid(refiid),obj);
|
||||
if ( !memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown)) ||
|
||||
!memcmp(&IID_IMalloc,refiid,sizeof(IID_IMalloc))
|
||||
) {
|
||||
*obj = This;
|
||||
return 0;
|
||||
}
|
||||
return OLE_E_ENUM_NOMORE;
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* IMalloc16_AddRef [COMPOBJ.501]
|
||||
*/
|
||||
ULONG WINAPI IMalloc16_fnAddRef(IMalloc16* iface) {
|
||||
ICOM_THIS(IMalloc16Impl,iface);
|
||||
TRACE("(%p)->AddRef()\n",This);
|
||||
return 1; /* cannot be freed */
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* IMalloc16_Release [COMPOBJ.502]
|
||||
*/
|
||||
ULONG WINAPI IMalloc16_fnRelease(IMalloc16* iface) {
|
||||
ICOM_THIS(IMalloc16Impl,iface);
|
||||
TRACE("(%p)->Release()\n",This);
|
||||
return 1; /* cannot be freed */
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* IMalloc16_Alloc [COMPOBJ.503]
|
||||
*/
|
||||
SEGPTR WINAPI IMalloc16_fnAlloc(IMalloc16* iface,DWORD cb) {
|
||||
ICOM_THIS(IMalloc16Impl,iface);
|
||||
TRACE("(%p)->Alloc(%ld)\n",This,cb);
|
||||
return MapLS( HeapAlloc( GetProcessHeap(), 0, cb ) );
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* IMalloc16_Realloc [COMPOBJ.504]
|
||||
*/
|
||||
SEGPTR WINAPI IMalloc16_fnRealloc(IMalloc16* iface,SEGPTR pv,DWORD cb)
|
||||
{
|
||||
SEGPTR ret;
|
||||
ICOM_THIS(IMalloc16Impl,iface);
|
||||
TRACE("(%p)->Realloc(%08lx,%ld)\n",This,pv,cb);
|
||||
ret = MapLS( HeapReAlloc( GetProcessHeap(), 0, MapSL(pv), cb ) );
|
||||
UnMapLS(pv);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* IMalloc16_Free [COMPOBJ.505]
|
||||
*/
|
||||
VOID WINAPI IMalloc16_fnFree(IMalloc16* iface,SEGPTR pv)
|
||||
{
|
||||
void *ptr = MapSL(pv);
|
||||
ICOM_THIS(IMalloc16Impl,iface);
|
||||
TRACE("(%p)->Free(%08lx)\n",This,pv);
|
||||
UnMapLS(pv);
|
||||
HeapFree( GetProcessHeap(), 0, ptr );
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* IMalloc16_GetSize [COMPOBJ.506]
|
||||
*/
|
||||
DWORD WINAPI IMalloc16_fnGetSize(const IMalloc16* iface,SEGPTR pv)
|
||||
{
|
||||
ICOM_CTHIS(IMalloc16Impl,iface);
|
||||
TRACE("(%p)->GetSize(%08lx)\n",This,pv);
|
||||
return HeapSize( GetProcessHeap(), 0, MapSL(pv) );
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* IMalloc16_DidAlloc [COMPOBJ.507]
|
||||
*/
|
||||
INT16 WINAPI IMalloc16_fnDidAlloc(const IMalloc16* iface,LPVOID pv) {
|
||||
ICOM_CTHIS(IMalloc16,iface);
|
||||
TRACE("(%p)->DidAlloc(%p)\n",This,pv);
|
||||
return (INT16)-1;
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* IMalloc16_HeapMinimize [COMPOBJ.508]
|
||||
*/
|
||||
LPVOID WINAPI IMalloc16_fnHeapMinimize(IMalloc16* iface) {
|
||||
ICOM_THIS(IMalloc16Impl,iface);
|
||||
TRACE("(%p)->HeapMinimize()\n",This);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* IMalloc16_Constructor [VTABLE]
|
||||
*/
|
||||
LPMALLOC16
|
||||
IMalloc16_Constructor()
|
||||
{
|
||||
static ICOM_VTABLE(IMalloc16) vt16;
|
||||
static SEGPTR msegvt16;
|
||||
IMalloc16Impl* This;
|
||||
HMODULE16 hcomp = GetModuleHandle16("COMPOBJ");
|
||||
|
||||
This = HeapAlloc( GetProcessHeap(), 0, sizeof(IMalloc16Impl) );
|
||||
if (!msegvt16)
|
||||
{
|
||||
#define VTENT(x) vt16.x = (void*)GetProcAddress16(hcomp,"IMalloc16_"#x);assert(vt16.x)
|
||||
VTENT(QueryInterface);
|
||||
VTENT(AddRef);
|
||||
VTENT(Release);
|
||||
VTENT(Alloc);
|
||||
VTENT(Realloc);
|
||||
VTENT(Free);
|
||||
VTENT(GetSize);
|
||||
VTENT(DidAlloc);
|
||||
VTENT(HeapMinimize);
|
||||
#undef VTENT
|
||||
msegvt16 = MapLS( &vt16 );
|
||||
}
|
||||
ICOM_VTBL(This) = (ICOM_VTABLE(IMalloc16)*)msegvt16;
|
||||
This->ref = 1;
|
||||
return (LPMALLOC16)MapLS( This );
|
||||
}
|
||||
|
||||
|
||||
/******************************************************************************
|
||||
* IMalloc32 implementation
|
||||
*
|
||||
|
|
|
@ -0,0 +1,557 @@
|
|||
/*
|
||||
* 16 bit ole functions
|
||||
*
|
||||
* Copyright 1995 Martin von Loewis
|
||||
* Copyright 1998 Justin Bradford
|
||||
* Copyright 1999 Francis Beaudet
|
||||
* Copyright 1999 Sylvain St-Germain
|
||||
* Copyright 2002 Marcus Meissner
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <assert.h>
|
||||
|
||||
#include "windef.h"
|
||||
#include "objbase.h"
|
||||
#include "ole2.h"
|
||||
#include "ole2ver.h"
|
||||
#include "rpc.h"
|
||||
#include "winerror.h"
|
||||
#include "winreg.h"
|
||||
#include "wownt32.h"
|
||||
#include "wtypes.h"
|
||||
#include "wine/unicode.h"
|
||||
#include "wine/obj_base.h"
|
||||
#include "wine/obj_clientserver.h"
|
||||
#include "wine/obj_misc.h"
|
||||
#include "wine/obj_marshal.h"
|
||||
#include "wine/obj_storage.h"
|
||||
#include "wine/obj_channel.h"
|
||||
#include "wine/winbase16.h"
|
||||
#include "compobj_private.h"
|
||||
#include "ifs.h"
|
||||
#include "wine/winbase16.h"
|
||||
|
||||
#include "wine/debug.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||
|
||||
HINSTANCE16 COMPOBJ_hInstance = 0;
|
||||
static int COMPOBJ_Attach = 0;
|
||||
|
||||
HTASK16 hETask = 0;
|
||||
WORD Table_ETask[62];
|
||||
|
||||
LPMALLOC16 currentMalloc16=NULL;
|
||||
|
||||
/* --- IMalloc16 implementation */
|
||||
|
||||
|
||||
typedef struct
|
||||
{
|
||||
/* IUnknown fields */
|
||||
ICOM_VFIELD(IMalloc16);
|
||||
DWORD ref;
|
||||
/* IMalloc16 fields */
|
||||
} IMalloc16Impl;
|
||||
|
||||
/******************************************************************************
|
||||
* IMalloc16_QueryInterface [COMPOBJ.500]
|
||||
*/
|
||||
HRESULT WINAPI IMalloc16_fnQueryInterface(IMalloc16* iface,REFIID refiid,LPVOID *obj) {
|
||||
ICOM_THIS(IMalloc16Impl,iface);
|
||||
|
||||
TRACE("(%p)->QueryInterface(%s,%p)\n",This,debugstr_guid(refiid),obj);
|
||||
if ( !memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown)) ||
|
||||
!memcmp(&IID_IMalloc,refiid,sizeof(IID_IMalloc))
|
||||
) {
|
||||
*obj = This;
|
||||
return 0;
|
||||
}
|
||||
return OLE_E_ENUM_NOMORE;
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* IMalloc16_AddRef [COMPOBJ.501]
|
||||
*/
|
||||
ULONG WINAPI IMalloc16_fnAddRef(IMalloc16* iface) {
|
||||
ICOM_THIS(IMalloc16Impl,iface);
|
||||
TRACE("(%p)->AddRef()\n",This);
|
||||
return 1; /* cannot be freed */
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* IMalloc16_Release [COMPOBJ.502]
|
||||
*/
|
||||
ULONG WINAPI IMalloc16_fnRelease(IMalloc16* iface) {
|
||||
ICOM_THIS(IMalloc16Impl,iface);
|
||||
TRACE("(%p)->Release()\n",This);
|
||||
return 1; /* cannot be freed */
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* IMalloc16_Alloc [COMPOBJ.503]
|
||||
*/
|
||||
SEGPTR WINAPI IMalloc16_fnAlloc(IMalloc16* iface,DWORD cb) {
|
||||
ICOM_THIS(IMalloc16Impl,iface);
|
||||
TRACE("(%p)->Alloc(%ld)\n",This,cb);
|
||||
return MapLS( HeapAlloc( GetProcessHeap(), 0, cb ) );
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* IMalloc16_Realloc [COMPOBJ.504]
|
||||
*/
|
||||
SEGPTR WINAPI IMalloc16_fnRealloc(IMalloc16* iface,SEGPTR pv,DWORD cb)
|
||||
{
|
||||
SEGPTR ret;
|
||||
ICOM_THIS(IMalloc16Impl,iface);
|
||||
TRACE("(%p)->Realloc(%08lx,%ld)\n",This,pv,cb);
|
||||
ret = MapLS( HeapReAlloc( GetProcessHeap(), 0, MapSL(pv), cb ) );
|
||||
UnMapLS(pv);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* IMalloc16_Free [COMPOBJ.505]
|
||||
*/
|
||||
VOID WINAPI IMalloc16_fnFree(IMalloc16* iface,SEGPTR pv)
|
||||
{
|
||||
void *ptr = MapSL(pv);
|
||||
ICOM_THIS(IMalloc16Impl,iface);
|
||||
TRACE("(%p)->Free(%08lx)\n",This,pv);
|
||||
UnMapLS(pv);
|
||||
HeapFree( GetProcessHeap(), 0, ptr );
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* IMalloc16_GetSize [COMPOBJ.506]
|
||||
*/
|
||||
DWORD WINAPI IMalloc16_fnGetSize(const IMalloc16* iface,SEGPTR pv)
|
||||
{
|
||||
ICOM_CTHIS(IMalloc16Impl,iface);
|
||||
TRACE("(%p)->GetSize(%08lx)\n",This,pv);
|
||||
return HeapSize( GetProcessHeap(), 0, MapSL(pv) );
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* IMalloc16_DidAlloc [COMPOBJ.507]
|
||||
*/
|
||||
INT16 WINAPI IMalloc16_fnDidAlloc(const IMalloc16* iface,LPVOID pv) {
|
||||
ICOM_CTHIS(IMalloc16,iface);
|
||||
TRACE("(%p)->DidAlloc(%p)\n",This,pv);
|
||||
return (INT16)-1;
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* IMalloc16_HeapMinimize [COMPOBJ.508]
|
||||
*/
|
||||
LPVOID WINAPI IMalloc16_fnHeapMinimize(IMalloc16* iface) {
|
||||
ICOM_THIS(IMalloc16Impl,iface);
|
||||
TRACE("(%p)->HeapMinimize()\n",This);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* IMalloc16_Constructor [VTABLE]
|
||||
*/
|
||||
LPMALLOC16
|
||||
IMalloc16_Constructor()
|
||||
{
|
||||
static ICOM_VTABLE(IMalloc16) vt16;
|
||||
static SEGPTR msegvt16;
|
||||
IMalloc16Impl* This;
|
||||
HMODULE16 hcomp = GetModuleHandle16("COMPOBJ");
|
||||
|
||||
This = HeapAlloc( GetProcessHeap(), 0, sizeof(IMalloc16Impl) );
|
||||
if (!msegvt16)
|
||||
{
|
||||
#define VTENT(x) vt16.x = (void*)GetProcAddress16(hcomp,"IMalloc16_"#x);assert(vt16.x)
|
||||
VTENT(QueryInterface);
|
||||
VTENT(AddRef);
|
||||
VTENT(Release);
|
||||
VTENT(Alloc);
|
||||
VTENT(Realloc);
|
||||
VTENT(Free);
|
||||
VTENT(GetSize);
|
||||
VTENT(DidAlloc);
|
||||
VTENT(HeapMinimize);
|
||||
#undef VTENT
|
||||
msegvt16 = MapLS( &vt16 );
|
||||
}
|
||||
ICOM_VTBL(This) = (ICOM_VTABLE(IMalloc16)*)msegvt16;
|
||||
This->ref = 1;
|
||||
return (LPMALLOC16)MapLS( This );
|
||||
}
|
||||
|
||||
|
||||
/***********************************************************************
|
||||
* CoGetMalloc [COMPOBJ.4]
|
||||
* RETURNS
|
||||
* The current win16 IMalloc
|
||||
*/
|
||||
HRESULT WINAPI CoGetMalloc16(
|
||||
DWORD dwMemContext, /* [in] unknown */
|
||||
LPMALLOC16 * lpMalloc /* [out] current win16 malloc interface */
|
||||
) {
|
||||
if(!currentMalloc16)
|
||||
currentMalloc16 = IMalloc16_Constructor();
|
||||
*lpMalloc = currentMalloc16;
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
* CoCreateStandardMalloc [COMPOBJ.71]
|
||||
*/
|
||||
HRESULT WINAPI CoCreateStandardMalloc16(DWORD dwMemContext,
|
||||
LPMALLOC16 *lpMalloc)
|
||||
{
|
||||
/* FIXME: docu says we shouldn't return the same allocator as in
|
||||
* CoGetMalloc16 */
|
||||
*lpMalloc = IMalloc16_Constructor();
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* CoInitialize [COMPOBJ.2]
|
||||
* Set the win16 IMalloc used for memory management
|
||||
*/
|
||||
HRESULT WINAPI CoInitialize16(
|
||||
LPVOID lpReserved /* [in] pointer to win16 malloc interface */
|
||||
) {
|
||||
currentMalloc16 = (LPMALLOC16)lpReserved;
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
* CoUninitialize [COMPOBJ.3]
|
||||
* Don't know what it does.
|
||||
* 3-Nov-98 -- this was originally misspelled, I changed it to what I
|
||||
* believe is the correct spelling
|
||||
*/
|
||||
void WINAPI CoUninitialize16(void)
|
||||
{
|
||||
TRACE("()\n");
|
||||
CoFreeAllLibraries();
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
* IsEqualGUID [COMPOBJ.18]
|
||||
*
|
||||
* Compares two Unique Identifiers.
|
||||
*
|
||||
* RETURNS
|
||||
* TRUE if equal
|
||||
*/
|
||||
BOOL16 WINAPI IsEqualGUID16(
|
||||
GUID* g1, /* [in] unique id 1 */
|
||||
GUID* g2) /* [in] unique id 2 */
|
||||
{
|
||||
return !memcmp( g1, g2, sizeof(GUID) );
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* CLSIDFromString [COMPOBJ.20]
|
||||
* Converts a unique identifier from its string representation into
|
||||
* the GUID struct.
|
||||
*
|
||||
* Class id: DWORD-WORD-WORD-BYTES[2]-BYTES[6]
|
||||
*
|
||||
* RETURNS
|
||||
* the converted GUID
|
||||
*/
|
||||
HRESULT WINAPI CLSIDFromString16(
|
||||
LPCOLESTR16 idstr, /* [in] string representation of guid */
|
||||
CLSID *id) /* [out] GUID converted from string */
|
||||
{
|
||||
|
||||
return __CLSIDFromStringA(idstr,id);
|
||||
}
|
||||
|
||||
extern BOOL WINAPI K32WOWCallback16Ex( DWORD vpfn16, DWORD dwFlags,
|
||||
DWORD cbArgs, LPVOID pArgs,
|
||||
LPDWORD pdwRetCode );
|
||||
|
||||
/******************************************************************************
|
||||
* _xmalloc16 [internal]
|
||||
* Allocates size bytes from the standard ole16 allocator.
|
||||
*
|
||||
* RETURNS
|
||||
* the allocated segmented pointer and a HRESULT
|
||||
*/
|
||||
HRESULT
|
||||
_xmalloc16(DWORD size, SEGPTR *ptr) {
|
||||
LPMALLOC16 mllc;
|
||||
DWORD args[2];
|
||||
|
||||
if (CoGetMalloc16(0,&mllc))
|
||||
return E_OUTOFMEMORY;
|
||||
|
||||
args[0] = (DWORD)mllc;
|
||||
args[1] = size;
|
||||
/* No need for a Callback entry, we have WOWCallback16Ex which does
|
||||
* everything we need.
|
||||
*/
|
||||
if (!K32WOWCallback16Ex(
|
||||
(DWORD)((ICOM_VTABLE(IMalloc16)*)MapSL(
|
||||
(SEGPTR)ICOM_VTBL(((LPMALLOC16)MapSL((SEGPTR)mllc))))
|
||||
)->Alloc,
|
||||
WCB16_CDECL,
|
||||
2*sizeof(DWORD),
|
||||
(LPVOID)args,
|
||||
(LPDWORD)ptr
|
||||
)) {
|
||||
ERR("CallTo16 IMalloc16 (%ld) failed\n",size);
|
||||
return E_FAIL;
|
||||
}
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* StringFromCLSID [COMPOBJ.19]
|
||||
* Converts a GUID into the respective string representation.
|
||||
* The target string is allocated using the OLE IMalloc.
|
||||
*
|
||||
* RETURNS
|
||||
* the string representation and HRESULT
|
||||
*/
|
||||
|
||||
HRESULT WINAPI StringFromCLSID16(
|
||||
REFCLSID id, /* [in] the GUID to be converted */
|
||||
LPOLESTR16 *idstr /* [out] a pointer to a to-be-allocated segmented pointer pointing to the resulting string */
|
||||
|
||||
) {
|
||||
HRESULT ret;
|
||||
|
||||
ret = _xmalloc16(40,(SEGPTR*)idstr);
|
||||
if (ret != S_OK)
|
||||
return ret;
|
||||
return WINE_StringFromCLSID(id,MapSL((SEGPTR)*idstr));
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* ProgIDFromCLSID [COMPOBJ.62]
|
||||
* Converts a class id into the respective Program ID. (By using a registry lookup)
|
||||
* RETURNS S_OK on success
|
||||
* riid associated with the progid
|
||||
*/
|
||||
HRESULT WINAPI ProgIDFromCLSID16(
|
||||
REFCLSID clsid, /* [in] class id as found in registry */
|
||||
LPOLESTR16 *lplpszProgID/* [out] associated Prog ID */
|
||||
) {
|
||||
char strCLSID[50], *buf, *buf2;
|
||||
DWORD buf2len;
|
||||
HKEY xhkey;
|
||||
HRESULT ret = S_OK;
|
||||
|
||||
WINE_StringFromCLSID(clsid, strCLSID);
|
||||
|
||||
buf = HeapAlloc(GetProcessHeap(), 0, strlen(strCLSID)+14);
|
||||
sprintf(buf,"CLSID\\%s\\ProgID", strCLSID);
|
||||
if (RegOpenKeyA(HKEY_CLASSES_ROOT, buf, &xhkey))
|
||||
ret = REGDB_E_CLASSNOTREG;
|
||||
|
||||
HeapFree(GetProcessHeap(), 0, buf);
|
||||
|
||||
if (ret == S_OK)
|
||||
{
|
||||
buf2 = HeapAlloc(GetProcessHeap(), 0, 255);
|
||||
buf2len = 255;
|
||||
if (RegQueryValueA(xhkey, NULL, buf2, &buf2len))
|
||||
ret = REGDB_E_CLASSNOTREG;
|
||||
|
||||
if (ret == S_OK)
|
||||
{
|
||||
ret = _xmalloc16(buf2len+1, (SEGPTR*)lplpszProgID);
|
||||
if (ret != S_OK)
|
||||
return ret;
|
||||
strcpy(MapSL((SEGPTR)*lplpszProgID),buf2);
|
||||
ret = S_OK;
|
||||
}
|
||||
HeapFree(GetProcessHeap(), 0, buf2);
|
||||
}
|
||||
RegCloseKey(xhkey);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* CLSIDFromProgID [COMPOBJ.61]
|
||||
* Converts a program id into the respective GUID. (By using a registry lookup)
|
||||
* RETURNS
|
||||
* riid associated with the progid
|
||||
*/
|
||||
HRESULT WINAPI CLSIDFromProgID16(
|
||||
LPCOLESTR16 progid, /* [in] program id as found in registry */
|
||||
LPCLSID riid /* [out] associated CLSID */
|
||||
) {
|
||||
char *buf,buf2[80];
|
||||
DWORD buf2len;
|
||||
HRESULT err;
|
||||
HKEY xhkey;
|
||||
|
||||
buf = HeapAlloc(GetProcessHeap(),0,strlen(progid)+8);
|
||||
sprintf(buf,"%s\\CLSID",progid);
|
||||
if ((err=RegOpenKeyA(HKEY_CLASSES_ROOT,buf,&xhkey))) {
|
||||
HeapFree(GetProcessHeap(),0,buf);
|
||||
return CO_E_CLASSSTRING;
|
||||
}
|
||||
HeapFree(GetProcessHeap(),0,buf);
|
||||
buf2len = sizeof(buf2);
|
||||
if ((err=RegQueryValueA(xhkey,NULL,buf2,&buf2len))) {
|
||||
RegCloseKey(xhkey);
|
||||
return CO_E_CLASSSTRING;
|
||||
}
|
||||
RegCloseKey(xhkey);
|
||||
return __CLSIDFromStringA(buf2,riid);
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
* LookupETask (COMPOBJ.94)
|
||||
*/
|
||||
HRESULT WINAPI LookupETask16(HTASK16 *hTask,LPVOID p) {
|
||||
FIXME("(%p,%p),stub!\n",hTask,p);
|
||||
if ((*hTask = GetCurrentTask()) == hETask) {
|
||||
memcpy(p, Table_ETask, sizeof(Table_ETask));
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
* SetETask (COMPOBJ.95)
|
||||
*/
|
||||
HRESULT WINAPI SetETask16(HTASK16 hTask, LPVOID p) {
|
||||
FIXME("(%04x,%p),stub!\n",hTask,p);
|
||||
hETask = hTask;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
* CALLOBJECTINWOW (COMPOBJ.201)
|
||||
*/
|
||||
HRESULT WINAPI CallObjectInWOW(LPVOID p1,LPVOID p2) {
|
||||
FIXME("(%p,%p),stub!\n",p1,p2);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* CoRegisterClassObject [COMPOBJ.5]
|
||||
*
|
||||
* Don't know where it registers it ...
|
||||
*/
|
||||
HRESULT WINAPI CoRegisterClassObject16(
|
||||
REFCLSID rclsid,
|
||||
LPUNKNOWN pUnk,
|
||||
DWORD dwClsContext, /* [in] CLSCTX flags indicating the context in which to run the executable */
|
||||
DWORD flags, /* [in] REGCLS flags indicating how connections are made */
|
||||
LPDWORD lpdwRegister
|
||||
) {
|
||||
char buf[80];
|
||||
|
||||
WINE_StringFromCLSID(rclsid,buf);
|
||||
|
||||
FIXME("(%s,%p,0x%08lx,0x%08lx,%p),stub\n",
|
||||
buf,pUnk,dwClsContext,flags,lpdwRegister
|
||||
);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* CoRevokeClassObject [COMPOBJ.6]
|
||||
*
|
||||
*/
|
||||
HRESULT WINAPI CoRevokeClassObject16(DWORD dwRegister) /* [in] token on class obj */
|
||||
{
|
||||
FIXME("(0x%08lx),stub!\n", dwRegister);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* CoFileTimeToDosDateTime [COMPOBJ.30]
|
||||
*/
|
||||
BOOL16 WINAPI CoFileTimeToDosDateTime16(const FILETIME *ft, LPWORD lpDosDate, LPWORD lpDosTime)
|
||||
{
|
||||
return FileTimeToDosDateTime(ft, lpDosDate, lpDosTime);
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* CoDosDateTimeToFileTime [COMPOBJ.31]
|
||||
*/
|
||||
BOOL16 WINAPI CoDosDateTimeToFileTime16(WORD wDosDate, WORD wDosTime, FILETIME *ft)
|
||||
{
|
||||
return DosDateTimeToFileTime(wDosDate, wDosTime, ft);
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* CoRegisterMessageFilter [COMPOBJ.27]
|
||||
*/
|
||||
HRESULT WINAPI CoRegisterMessageFilter16(
|
||||
LPMESSAGEFILTER lpMessageFilter,
|
||||
LPMESSAGEFILTER *lplpMessageFilter
|
||||
) {
|
||||
FIXME("(%p,%p),stub!\n",lpMessageFilter,lplpMessageFilter);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* CoLockObjectExternal [COMPOBJ.63]
|
||||
*/
|
||||
HRESULT WINAPI CoLockObjectExternal16(
|
||||
LPUNKNOWN pUnk, /* [in] object to be locked */
|
||||
BOOL16 fLock, /* [in] do lock */
|
||||
BOOL16 fLastUnlockReleases /* [in] ? */
|
||||
) {
|
||||
FIXME("(%p,%d,%d),stub!\n",pUnk,fLock,fLastUnlockReleases);
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
* CoGetState [COMPOBJ.115]
|
||||
*/
|
||||
HRESULT WINAPI CoGetState16(LPDWORD state)
|
||||
{
|
||||
FIXME("(%p),stub!\n", state);
|
||||
|
||||
*state = 0;
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
* DllEntryPoint [COMPOBJ.116]
|
||||
*
|
||||
* Initialization code for the COMPOBJ DLL
|
||||
*
|
||||
* RETURNS:
|
||||
*/
|
||||
BOOL WINAPI COMPOBJ_DllEntryPoint(DWORD Reason, HINSTANCE16 hInst, WORD ds, WORD HeapSize, DWORD res1, WORD res2)
|
||||
{
|
||||
TRACE("(%08lx, %04x, %04x, %04x, %08lx, %04x)\n", Reason, hInst, ds, HeapSize, res1, res2);
|
||||
switch(Reason)
|
||||
{
|
||||
case DLL_PROCESS_ATTACH:
|
||||
if (!COMPOBJ_Attach++) COMPOBJ_hInstance = hInst;
|
||||
break;
|
||||
|
||||
case DLL_PROCESS_DETACH:
|
||||
if(!--COMPOBJ_Attach)
|
||||
COMPOBJ_hInstance = 0;
|
||||
break;
|
||||
}
|
||||
return TRUE;
|
||||
}
|
|
@ -123,7 +123,14 @@ typedef enum tagCLSCTX
|
|||
CLSCTX_INPROC_HANDLER16 = 0x20,
|
||||
CLSCTX_INPROC_SERVERX86 = 0x40,
|
||||
CLSCTX_INPROC_HANDLERX86 = 0x80,
|
||||
CLSCTX_ESERVER_HANDLER = 0x100
|
||||
CLSCTX_ESERVER_HANDLER = 0x100,
|
||||
CLSCTX_NO_CODE_DOWNLOAD = 0x400,
|
||||
CLSCTX_NO_CUSTOM_MARSHAL = 0x1000,
|
||||
CLSCTX_ENABLE_CODE_DOWNLOAD = 0x2000,
|
||||
CLSCTX_NO_FAILURE_LOG = 0x4000,
|
||||
CLSCTX_DISABLE_AAA = 0x8000,
|
||||
CLSCTX_ENABLE_AAA = 0x10000,
|
||||
CLSCTX_FROM_DEFAULT_CONTEXT = 0x20000
|
||||
} CLSCTX;
|
||||
|
||||
#define CLSCTX_INPROC (CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER)
|
||||
|
@ -143,7 +150,8 @@ typedef enum tagMSHCTX
|
|||
MSHCTX_LOCAL = 0,
|
||||
MSHCTX_NOSHAREDMEM = 1,
|
||||
MSHCTX_DIFFERENTMACHINE = 2,
|
||||
MSHCTX_INPROC = 3
|
||||
MSHCTX_INPROC = 3,
|
||||
MSHCTX_CROSSCTX = 4
|
||||
} MSHCTX;
|
||||
|
||||
typedef unsigned short VARTYPE;
|
||||
|
|
Loading…
Reference in New Issue