[ros-diffs] [gvg] 17081: Finish up Wine-20050628 merge

Finish up Wine-20050628 merge
Deleted: vendor/wine/dlls/cabinet/Wine-20050524/
Added: vendor/wine/dlls/cabinet/Wine-20050628/
Deleted: vendor/wine/dlls/comctl32/Wine-20050524/
Added: vendor/wine/dlls/comctl32/Wine-20050628/
Deleted: vendor/wine/dlls/commdlg/Wine-20050524/
Added: vendor/wine/dlls/commdlg/Wine-20050628/
Deleted: vendor/wine/dlls/dinput/Wine-20050524/
Added: vendor/wine/dlls/dinput/Wine-20050628/
Deleted: vendor/wine/dlls/dsound/Wine-20050524/
Added: vendor/wine/dlls/dsound/Wine-20050628/
Deleted: vendor/wine/dlls/icmp/Wine-20050524/
Added: vendor/wine/dlls/icmp/Wine-20050628/
Deleted: vendor/wine/dlls/mpr/Wine-20050524/
Added: vendor/wine/dlls/mpr/Wine-20050628/
Deleted: vendor/wine/dlls/msi/Wine-20050524/
Added: vendor/wine/dlls/msi/Wine-20050628/
Deleted: vendor/wine/dlls/msimg32/Wine-20050524/
Added: vendor/wine/dlls/msimg32/Wine-20050628/
Added: vendor/wine/dlls/ole32/Wine-20050628/
Modified: vendor/wine/dlls/ole32/Wine-20050628/Makefile.in
Modified: vendor/wine/dlls/ole32/Wine-20050628/antimoniker.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/bindctx.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/clipboard.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/compobj.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/compobj.spec
Modified: vendor/wine/dlls/ole32/Wine-20050628/compobj_private.h
Modified: vendor/wine/dlls/ole32/Wine-20050628/compositemoniker.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/datacache.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/dcom.idl
Modified: vendor/wine/dlls/ole32/Wine-20050628/defaulthandler.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/errorinfo.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/filemoniker.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/ftmarshal.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/git.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/hglobalstream.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/ifs.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/ifs.h
Modified: vendor/wine/dlls/ole32/Wine-20050628/itemmoniker.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/marshal.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/memlockbytes.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/memlockbytes16.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/moniker.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/moniker.h
Modified: vendor/wine/dlls/ole32/Wine-20050628/ole16.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/ole2.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/ole2.spec
Modified: vendor/wine/dlls/ole32/Wine-20050628/ole2_16.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/ole2conv.spec
Modified: vendor/wine/dlls/ole32/Wine-20050628/ole2impl.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/ole2nls.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/ole2nls.spec
Modified: vendor/wine/dlls/ole32/Wine-20050628/ole2prox.spec
Modified: vendor/wine/dlls/ole32/Wine-20050628/ole2stubs.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/ole2thk.spec
Modified: vendor/wine/dlls/ole32/Wine-20050628/ole32.spec
Modified: vendor/wine/dlls/ole32/Wine-20050628/ole32_main.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/ole32res.rc
Modified: vendor/wine/dlls/ole32/Wine-20050628/oleobj.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/oleproxy.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/olestd.h
Modified: vendor/wine/dlls/ole32/Wine-20050628/regsvr.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/rpc.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/stg_bigblockfile.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/stg_stream.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/storage.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/storage.spec
Modified: vendor/wine/dlls/ole32/Wine-20050628/storage32.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/storage32.h
Modified: vendor/wine/dlls/ole32/Wine-20050628/stubmanager.c
Modified: vendor/wine/dlls/ole32/Wine-20050628/version.rc
Modified: vendor/wine/dlls/ole32/current/Makefile.in
Modified: vendor/wine/dlls/ole32/current/antimoniker.c
Modified: vendor/wine/dlls/ole32/current/bindctx.c
Modified: vendor/wine/dlls/ole32/current/clipboard.c
Modified: vendor/wine/dlls/ole32/current/compobj.c
Modified: vendor/wine/dlls/ole32/current/compobj.spec
Modified: vendor/wine/dlls/ole32/current/compobj_private.h
Modified: vendor/wine/dlls/ole32/current/compositemoniker.c
Modified: vendor/wine/dlls/ole32/current/datacache.c
Modified: vendor/wine/dlls/ole32/current/dcom.idl
Modified: vendor/wine/dlls/ole32/current/defaulthandler.c
Modified: vendor/wine/dlls/ole32/current/errorinfo.c
Modified: vendor/wine/dlls/ole32/current/filemoniker.c
Modified: vendor/wine/dlls/ole32/current/ftmarshal.c
Modified: vendor/wine/dlls/ole32/current/git.c
Modified: vendor/wine/dlls/ole32/current/hglobalstream.c
Modified: vendor/wine/dlls/ole32/current/ifs.c
Modified: vendor/wine/dlls/ole32/current/ifs.h
Modified: vendor/wine/dlls/ole32/current/itemmoniker.c
Modified: vendor/wine/dlls/ole32/current/marshal.c
Modified: vendor/wine/dlls/ole32/current/memlockbytes.c
Modified: vendor/wine/dlls/ole32/current/memlockbytes16.c
Modified: vendor/wine/dlls/ole32/current/moniker.c
Modified: vendor/wine/dlls/ole32/current/moniker.h
Modified: vendor/wine/dlls/ole32/current/ole16.c
Modified: vendor/wine/dlls/ole32/current/ole2.c
Modified: vendor/wine/dlls/ole32/current/ole2.spec
Modified: vendor/wine/dlls/ole32/current/ole2_16.c
Modified: vendor/wine/dlls/ole32/current/ole2conv.spec
Modified: vendor/wine/dlls/ole32/current/ole2impl.c
[truncated at 100 lines; 57 more skipped] 
  _____  

Copied: vendor/wine/dlls/cabinet/Wine-20050628 (from rev 17041,
vendor/wine/dlls/cabinet/current)
  _____  

Copied: vendor/wine/dlls/comctl32/Wine-20050628 (from rev 17041,
vendor/wine/dlls/comctl32/current)
  _____  

Copied: vendor/wine/dlls/commdlg/Wine-20050628 (from rev 17041,
vendor/wine/dlls/commdlg/current)
  _____  

Copied: vendor/wine/dlls/dinput/Wine-20050628 (from rev 17041,
vendor/wine/dlls/dinput/current)
  _____  

Copied: vendor/wine/dlls/dsound/Wine-20050628 (from rev 17041,
vendor/wine/dlls/dsound/current)
  _____  

Copied: vendor/wine/dlls/icmp/Wine-20050628 (from rev 17041,
vendor/wine/dlls/icmp/current)
  _____  

Copied: vendor/wine/dlls/mpr/Wine-20050628 (from rev 17041,
vendor/wine/dlls/mpr/current)
  _____  

Copied: vendor/wine/dlls/msi/Wine-20050628 (from rev 17041,
vendor/wine/dlls/msi/current)
  _____  

Copied: vendor/wine/dlls/msimg32/Wine-20050628 (from rev 17041,
vendor/wine/dlls/msimg32/current)
  _____  

Copied: vendor/wine/dlls/ole32/Wine-20050628 (from rev 17041,
vendor/wine/dlls/ole32/current)
  _____  

Modified: vendor/wine/dlls/ole32/Wine-20050628/Makefile.in
--- vendor/wine/dlls/ole32/current/Makefile.in	2005-08-04 06:52:58 UTC
(rev 17041)
+++ vendor/wine/dlls/ole32/Wine-20050628/Makefile.in	2005-08-05
20:58:12 UTC (rev 17081)
@@ -1,78 +1,78 @@

-EXTRADEFS = -D_OLE32_ -DCOM_NO_WINDOWS_H
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ../..
-SRCDIR    = @srcdir@
-VPATH     = @srcdir@
-MODULE    = ole32.dll
-IMPORTLIB = libole32.$(IMPLIBEXT)
-IMPORTS   = advapi32 user32 gdi32 rpcrt4 kernel32 ntdll
-EXTRALIBS = -luuid $(LIBUNICODE)
-
-C_SRCS = \
-	antimoniker.c \
-	bindctx.c \
-	clipboard.c \
-	compobj.c \
-	compositemoniker.c \
-	datacache.c \
-	defaulthandler.c \
-	dictionary.c \
-	errorinfo.c \
-	filemoniker.c \
-	ftmarshal.c \
-	git.c \
-	hglobalstream.c \
-	ifs.c \
-	itemmoniker.c \
-	marshal.c \
-	memlockbytes.c \
-	moniker.c \
-	ole2.c \
-	ole2stubs.c \
-	ole2impl.c \
-	ole32_main.c \
-	oleobj.c \
-	oleproxy.c \
-	regsvr.c \
-	rpc.c \
-	stg_bigblockfile.c \
-	stg_prop.c \
-	stg_stream.c \
-	storage32.c \
-	stubmanager.c
-
-C_SRCS16 = \
-	memlockbytes16.c \
-	ole16.c \
-	ole2_16.c \
-	ole2nls.c \
-	storage.c
-
-SPEC_SRCS16 = \
-	compobj.spec \
-	ole2.spec \
-	ole2conv.spec \
-	ole2nls.spec \
-	ole2prox.spec \
-	ole2thk.spec \
-	storage.spec
-
-RC_SRCS = ole32res.rc
-RC_BINSRC = ole32res.rc
-RC_BINARIES = \
-	drag_copy.cur \
-	drag_link.cur \
-	drag_move.cur \
-	nodrop.cur 
-
-IDL_SRCS = \
-	dcom.idl
-
-SUBDIRS = tests
-
-@MAKE_DLL_RULES@
-
-### Dependencies:
-
-# note: this will get overwritten by make depend
-$(ALL_OBJS): $(IDL_SRCS:.idl=.h)
+EXTRADEFS = -D_OLE32_ -DCOM_NO_WINDOWS_H
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = ole32.dll
+IMPORTLIB = libole32.$(IMPLIBEXT)
+IMPORTS   = advapi32 user32 gdi32 rpcrt4 kernel32 ntdll
+EXTRALIBS = -luuid $(LIBUNICODE)
+
+C_SRCS = \
+	antimoniker.c \
+	bindctx.c \
+	clipboard.c \
+	compobj.c \
+	compositemoniker.c \
+	datacache.c \
+	defaulthandler.c \
+	dictionary.c \
+	errorinfo.c \
+	filemoniker.c \
+	ftmarshal.c \
+	git.c \
+	hglobalstream.c \
+	ifs.c \
+	itemmoniker.c \
+	marshal.c \
+	memlockbytes.c \
+	moniker.c \
+	ole2.c \
+	ole2stubs.c \
+	ole2impl.c \
+	ole32_main.c \
+	oleobj.c \
+	oleproxy.c \
+	regsvr.c \
+	rpc.c \
+	stg_bigblockfile.c \
+	stg_prop.c \
+	stg_stream.c \
+	storage32.c \
+	stubmanager.c
+
+C_SRCS16 = \
+	memlockbytes16.c \
+	ole16.c \
+	ole2_16.c \
+	ole2nls.c \
+	storage.c
+
+SPEC_SRCS16 = \
+	compobj.spec \
+	ole2.spec \
+	ole2conv.spec \
+	ole2nls.spec \
+	ole2prox.spec \
+	ole2thk.spec \
+	storage.spec
+
+RC_SRCS = ole32res.rc
+RC_BINSRC = ole32res.rc
+RC_BINARIES = \
+	drag_copy.cur \
+	drag_link.cur \
+	drag_move.cur \
+	nodrop.cur 
+
+IDL_SRCS = \
+	dcom.idl
+
+SUBDIRS = tests
+
+@MAKE_DLL_RULES@
+
+### Dependencies:
+
+# note: this will get overwritten by make depend
+$(ALL_OBJS): $(IDL_SRCS:.idl=.h)
Property changes on: vendor/wine/dlls/ole32/Wine-20050628/Makefile.in
___________________________________________________________________
Name: svn:eol-style
   + native
  _____  

Modified: vendor/wine/dlls/ole32/Wine-20050628/antimoniker.c
--- vendor/wine/dlls/ole32/current/antimoniker.c	2005-08-04
06:52:58 UTC (rev 17041)
+++ vendor/wine/dlls/ole32/Wine-20050628/antimoniker.c	2005-08-05
20:58:12 UTC (rev 17081)
@@ -1,612 +1,612 @@

-/**********************************************************************
*****************
- *	                      AntiMonikers implementation
- *
- *               Copyright 1999  Noomen Hamza
- *
- * 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 <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"
-
-WINE_DEFAULT_DEBUG_CHANNEL(ole);
-
-const CLSID CLSID_AntiMoniker = {
-  0x305, 0, 0, {0xC0, 0, 0, 0, 0, 0, 0, 0x46}
-};
-
-/* AntiMoniker data structure */
-typedef struct AntiMonikerImpl{
-
-    const IMonikerVtbl*  lpvtbl1;  /* VTable relative to the IMoniker
interface.*/
-
-    /* The ROT (RunningObjectTable implementation) uses the IROTData
interface to test whether
-     * two monikers are equal. That's whay IROTData interface is
implemented by monikers.
-     */
-    const IROTDataVtbl*  lpvtbl2;  /* VTable relative to the IROTData
interface.*/
-
-    ULONG ref; /* reference counter for this object */
-
-} AntiMonikerImpl;
-
-
-/**********************************************************************
*********
- *        AntiMoniker_QueryInterface
-
************************************************************************
*******/
-static HRESULT WINAPI
-AntiMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void**
ppvObject)
-{
-    AntiMonikerImpl *This = (AntiMonikerImpl *)iface;
-
-    TRACE("(%p,%p,%p)\n",This,riid,ppvObject);
-
-    /* Perform a sanity check on the parameters.*/
-    if ( (This==0) || (ppvObject==0) )
-	return E_INVALIDARG;
-
-    /* Initialize the return parameter */
-    *ppvObject = 0;
-
-    /* Compare the riid with the interface IDs implemented by this
object.*/
-    if (IsEqualIID(&IID_IUnknown, riid) ||
-        IsEqualIID(&IID_IPersist, riid) ||
-        IsEqualIID(&IID_IPersistStream, riid) ||
-        IsEqualIID(&IID_IMoniker, riid))
-        *ppvObject = iface;
-    else if (IsEqualIID(&IID_IROTData, riid))
-        *ppvObject = (IROTData*)&(This->lpvtbl2);
-
-    /* Check that we obtained an interface.*/
-    if ((*ppvObject)==0)
-        return E_NOINTERFACE;
-
-    /* always increase the reference count by one when it is successful
*/
-    IMoniker_AddRef(iface);
-
-    return S_OK;
-}
-
-/**********************************************************************
********
- *        AntiMoniker_AddRef
-
************************************************************************
******/
-static ULONG WINAPI
-AntiMonikerImpl_AddRef(IMoniker* iface)
-{
-    AntiMonikerImpl *This = (AntiMonikerImpl *)iface;
-
-    TRACE("(%p)\n",This);
-
-    return InterlockedIncrement(&This->ref);
-}
-
-/**********************************************************************
********
- *        AntiMoniker_Release
-
************************************************************************
******/
-static ULONG WINAPI
-AntiMonikerImpl_Release(IMoniker* iface)
-{
-    AntiMonikerImpl *This = (AntiMonikerImpl *)iface;
-    ULONG ref;
-
-    TRACE("(%p)\n",This);
-
-    ref = InterlockedDecrement(&This->ref);
-
-    /* destroy the object if there's no more reference on it */
-    if (ref == 0) HeapFree(GetProcessHeap(),0,This);
-
-    return ref;
-}
-
-/**********************************************************************
********
- *        AntiMoniker_GetClassID
-
************************************************************************
******/
-static HRESULT WINAPI
-AntiMonikerImpl_GetClassID(IMoniker* iface,CLSID *pClassID)
-{
-    TRACE("(%p,%p),stub!\n",iface,pClassID);
-
-    if (pClassID==NULL)
-        return E_POINTER;
-
-    *pClassID = CLSID_AntiMoniker;
-
-    return S_OK;
-}
-
-/**********************************************************************
********
- *        AntiMoniker_IsDirty
-
************************************************************************
******/
-static HRESULT WINAPI
-AntiMonikerImpl_IsDirty(IMoniker* iface)
-{
-    /* Note that the OLE-provided implementations of the
IPersistStream::IsDirty
-       method in the OLE-provided moniker interfaces always return
S_FALSE because
-       their internal state never changes. */
-
-    TRACE("(%p)\n",iface);
-
-    return S_FALSE;
-}
-
-/**********************************************************************
********
- *        AntiMoniker_Load
-
************************************************************************
******/
-static HRESULT WINAPI
-AntiMonikerImpl_Load(IMoniker* iface,IStream* pStm)
-{
-    DWORD constant=1,dwbuffer;
-    HRESULT res;
-
-    /* data read by this function is only a DWORD constant (must be 1)
! */
-    res=IStream_Read(pStm,&dwbuffer,sizeof(DWORD),NULL);
-
-    if (SUCCEEDED(res)&& dwbuffer!=constant)
-        return E_FAIL;
-
-    return res;
-}
-
-/**********************************************************************
********
- *        AntiMoniker_Save
-
************************************************************************
******/
-static HRESULT WINAPI
-AntiMonikerImpl_Save(IMoniker* iface,IStream* pStm,BOOL fClearDirty)
-{
-    DWORD constant=1;
-    HRESULT res;
-
-    /* data written by this function is only a DWORD constant set to 1
! */
-    res=IStream_Write(pStm,&constant,sizeof(constant),NULL);
-
-    return res;
-}
-
-/**********************************************************************
********
- *        AntiMoniker_GetSizeMax
- *
- * PARAMS
- * pcbSize [out] Pointer to size of stream needed to save object
-
************************************************************************
******/
-static HRESULT WINAPI
-AntiMonikerImpl_GetSizeMax(IMoniker* iface, ULARGE_INTEGER* pcbSize)
-{
-    TRACE("(%p,%p)\n",iface,pcbSize);
-
-    if (pcbSize!=NULL)
-        return E_POINTER;
-
-    /* for more details see AntiMonikerImpl_Save coments */
-
-    /*
-     * Normally the sizemax must be sizeof DWORD, but
-     * I tested this function it usually return 16 bytes
-     * more than the number of bytes used by AntiMoniker::Save function
-     */
-    pcbSize->u.LowPart =  sizeof(DWORD)+16;
-
-    pcbSize->u.HighPart=0;
-
-    return S_OK;
-}
-
-/**********************************************************************
********
- *                  AntiMoniker_BindToObject
-
************************************************************************
******/
-static HRESULT WINAPI
-AntiMonikerImpl_BindToObject(IMoniker* iface, IBindCtx* pbc, IMoniker*
pmkToLeft,
-                             REFIID riid, VOID** ppvResult)
-{
-    TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult);
-    return E_NOTIMPL;
-}
-
-/**********************************************************************
********
- *        AntiMoniker_BindToStorage
-
************************************************************************
******/
-static HRESULT WINAPI
-AntiMonikerImpl_BindToStorage(IMoniker* iface, IBindCtx* pbc, IMoniker*
pmkToLeft,
-                              REFIID riid, VOID** ppvResult)
-{
-    TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult);
-    return E_NOTIMPL;
-}
-
-/**********************************************************************
********
- *        AntiMoniker_Reduce
-
************************************************************************
******/
-static HRESULT WINAPI
-AntiMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD
dwReduceHowFar,
-                       IMoniker** ppmkToLeft, IMoniker** ppmkReduced)
-{
-
TRACE("(%p,%p,%ld,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkRedu
ced);
-
-    if (ppmkReduced==NULL)
-        return E_POINTER;
-
-    AntiMonikerImpl_AddRef(iface);
-
-    *ppmkReduced=iface;
-
-    return MK_S_REDUCED_TO_SELF;
-}
-/**********************************************************************
********
- *        AntiMoniker_ComposeWith
-
************************************************************************
******/
-static HRESULT WINAPI
-AntiMonikerImpl_ComposeWith(IMoniker* iface, IMoniker* pmkRight,
-                            BOOL fOnlyIfNotGeneric, IMoniker**
ppmkComposite)
-{
-
-
TRACE("(%p,%p,%d,%p)\n",iface,pmkRight,fOnlyIfNotGeneric,ppmkComposite);
-
-    if ((ppmkComposite==NULL)||(pmkRight==NULL))
-	return E_POINTER;
-
-    *ppmkComposite=0;
-
-    if (fOnlyIfNotGeneric)
-        return MK_E_NEEDGENERIC;
-    else
-        return CreateGenericComposite(iface,pmkRight,ppmkComposite);
-}
-
-/**********************************************************************
********
- *        AntiMoniker_Enum
-
************************************************************************
******/
-static HRESULT WINAPI
-AntiMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker**
ppenumMoniker)
-{
-    TRACE("(%p,%d,%p)\n",iface,fForward,ppenumMoniker);
-
-    if (ppenumMoniker == NULL)
-        return E_POINTER;
-
-    *ppenumMoniker = NULL;
-
-    return S_OK;
-}
-
-/**********************************************************************
********
- *        AntiMoniker_IsEqual
-
************************************************************************
******/
-static HRESULT WINAPI
-AntiMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker)
-{
-    DWORD mkSys;
-
-    TRACE("(%p,%p)\n",iface,pmkOtherMoniker);
-
-    if (pmkOtherMoniker==NULL)
-        return S_FALSE;
-
-    IMoniker_IsSystemMoniker(pmkOtherMoniker,&mkSys);
-
-    if (mkSys==MKSYS_ANTIMONIKER)
-        return S_OK;
-    else
-        return S_FALSE;
-}
-
-/**********************************************************************
********
- *        AntiMoniker_Hash
-
************************************************************************
******/
-static HRESULT WINAPI AntiMonikerImpl_Hash(IMoniker* iface,DWORD*
pdwHash)
-{
-    if (pdwHash==NULL)
-        return E_POINTER;
-
-    *pdwHash=0;
-
-    return S_OK;
-}
-
-/**********************************************************************
********
- *        AntiMoniker_IsRunning
-
************************************************************************
******/
-static HRESULT WINAPI
-AntiMonikerImpl_IsRunning(IMoniker* iface, IBindCtx* pbc, IMoniker*
pmkToLeft,
-                          IMoniker* pmkNewlyRunning)
-{
-    IRunningObjectTable* rot;
-    HRESULT res;
-
-    TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pmkNewlyRunning);
-
-    if (pbc==NULL)
-        return E_INVALIDARG;
-
-    res=IBindCtx_GetRunningObjectTable(pbc,&rot);
-
-    if (FAILED(res))
-        return res;
-
-    res = IRunningObjectTable_IsRunning(rot,iface);
-
-    IRunningObjectTable_Release(rot);
-
-    return res;
-}
-
-/**********************************************************************
********
- *        AntiMoniker_GetTimeOfLastChange
-
************************************************************************
******/
-static HRESULT WINAPI AntiMonikerImpl_GetTimeOfLastChange(IMoniker*
iface,
-                                                   IBindCtx* pbc,
-                                                   IMoniker* pmkToLeft,
-                                                   FILETIME* pAntiTime)
-{
-    TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pAntiTime);
-    return E_NOTIMPL;
-}
-
-/**********************************************************************
********
- *        AntiMoniker_Inverse
-
************************************************************************
******/
-static HRESULT WINAPI
-AntiMonikerImpl_Inverse(IMoniker* iface,IMoniker** ppmk)
-{
-    TRACE("(%p,%p)\n",iface,ppmk);
-
-    if (ppmk==NULL)
-        return E_POINTER;
-
-    *ppmk=0;
-
-    return MK_E_NOINVERSE;
-}
-
-/**********************************************************************
********
- *        AntiMoniker_CommonPrefixWith
-
************************************************************************
******/
-static HRESULT WINAPI
-AntiMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker*
pmkOther,IMoniker** ppmkPrefix)
-{
-    DWORD mkSys;
-
-    IMoniker_IsSystemMoniker(pmkOther,&mkSys);
-
-    if(mkSys==MKSYS_ITEMMONIKER){
-
-        IMoniker_AddRef(iface);
-
-        *ppmkPrefix=iface;
-
-        IMoniker_AddRef(iface);
-
-        return MK_S_US;
-    }
-    else
-        return MonikerCommonPrefixWith(iface,pmkOther,ppmkPrefix);
-}
-
-/**********************************************************************
********
- *        AntiMoniker_RelativePathTo
-
************************************************************************
******/
-static HRESULT WINAPI
-AntiMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther,
IMoniker** ppmkRelPath)
-{
-    TRACE("(%p,%p,%p)\n",iface,pmOther,ppmkRelPath);
-
-    if (ppmkRelPath==NULL)
-        return E_POINTER;
-
-    IMoniker_AddRef(pmOther);
-
-    *ppmkRelPath=pmOther;
-
-    return MK_S_HIM;
-}
-
-/**********************************************************************
********
- *        AntiMoniker_GetDisplayName
-
************************************************************************
******/
-static HRESULT WINAPI
-AntiMonikerImpl_GetDisplayName(IMoniker* iface, IBindCtx* pbc,
-                               IMoniker* pmkToLeft, LPOLESTR
*ppszDisplayName)
-{
-    static const WCHAR back[]={'\\','.','.',0};
-
-    TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,ppszDisplayName);
-
-    if (ppszDisplayName==NULL)
-        return E_POINTER;
-
-    if (pmkToLeft!=NULL){
-        FIXME("() pmkToLeft!=NULL not implemented \n");
-        return E_NOTIMPL;
-    }
-
-    *ppszDisplayName=CoTaskMemAlloc(sizeof(back));
-
-    if (*ppszDisplayName==NULL)
-        return E_OUTOFMEMORY;
-
-    lstrcpyW(*ppszDisplayName,back);
-
-    return S_OK;
-}
-
-/**********************************************************************
********
- *        AntiMoniker_ParseDisplayName
-
************************************************************************
******/
-static HRESULT WINAPI
-AntiMonikerImpl_ParseDisplayName(IMoniker* iface, IBindCtx* pbc,
-                                 IMoniker* pmkToLeft, LPOLESTR
pszDisplayName,
-                                 ULONG* pchEaten, IMoniker** ppmkOut)
-{
-
TRACE("(%p,%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pszDisplayName,pchEate
n,ppmkOut);
-    return E_NOTIMPL;
-}
-
-/**********************************************************************
********
- *        AntiMoniker_IsSystemMoniker
-
************************************************************************
******/
-static HRESULT WINAPI
-AntiMonikerImpl_IsSystemMoniker(IMoniker* iface,DWORD* pwdMksys)
-{
-    TRACE("(%p,%p)\n",iface,pwdMksys);
-
-    if (!pwdMksys)
-        return E_POINTER;
-
-    (*pwdMksys)=MKSYS_ANTIMONIKER;
-
-    return S_OK;
-}
-
-/**********************************************************************
*********
- *        AntiMonikerIROTData_QueryInterface
-
************************************************************************
*******/
-static HRESULT WINAPI
-AntiMonikerROTDataImpl_QueryInterface(IROTData *iface,REFIID
riid,VOID** ppvObject)
-{
-    ICOM_THIS_From_IROTData(IMoniker, iface);
-
-    TRACE("(%p,%p,%p)\n",iface,riid,ppvObject);
-
-    return AntiMonikerImpl_QueryInterface(This, riid, ppvObject);
-}
-
-/**********************************************************************
*
- *        AntiMonikerIROTData_AddRef
- */
-static ULONG WINAPI AntiMonikerROTDataImpl_AddRef(IROTData *iface)
-{
-    ICOM_THIS_From_IROTData(IMoniker, iface);
-
-    TRACE("(%p)\n",iface);
-
-    return AntiMonikerImpl_AddRef(This);
-}
-
-/**********************************************************************
*
- *        AntiMonikerIROTData_Release
- */
-static ULONG WINAPI AntiMonikerROTDataImpl_Release(IROTData* iface)
-{
-    ICOM_THIS_From_IROTData(IMoniker, iface);
-
-    TRACE("(%p)\n",iface);
-
-    return AntiMonikerImpl_Release(This);
-}
-
-/**********************************************************************
********
- *        AntiMonikerIROTData_GetComparaisonData
-
************************************************************************
******/
-static HRESULT WINAPI
-AntiMonikerROTDataImpl_GetComparaisonData(IROTData* iface, BYTE*
pbData,
-                                          ULONG cbMax, ULONG* pcbData)
-{
-    FIXME("(),stub!\n");
-    return E_NOTIMPL;
-}
-
-/**********************************************************************
**********/
-/* Virtual function table for the AntiMonikerImpl class which  include
IPersist,*/
-/* IPersistStream and IMoniker functions.
*/
-static const IMonikerVtbl VT_AntiMonikerImpl =
-{
-    AntiMonikerImpl_QueryInterface,
-    AntiMonikerImpl_AddRef,
-    AntiMonikerImpl_Release,
-    AntiMonikerImpl_GetClassID,
-    AntiMonikerImpl_IsDirty,
-    AntiMonikerImpl_Load,
-    AntiMonikerImpl_Save,
-    AntiMonikerImpl_GetSizeMax,
-    AntiMonikerImpl_BindToObject,
-    AntiMonikerImpl_BindToStorage,
-    AntiMonikerImpl_Reduce,
-    AntiMonikerImpl_ComposeWith,
-    AntiMonikerImpl_Enum,
-    AntiMonikerImpl_IsEqual,
-    AntiMonikerImpl_Hash,
-    AntiMonikerImpl_IsRunning,
-    AntiMonikerImpl_GetTimeOfLastChange,
-    AntiMonikerImpl_Inverse,
-    AntiMonikerImpl_CommonPrefixWith,
-    AntiMonikerImpl_RelativePathTo,
-    AntiMonikerImpl_GetDisplayName,
-    AntiMonikerImpl_ParseDisplayName,
-    AntiMonikerImpl_IsSystemMoniker
-};
-
-/**********************************************************************
**********/
-/* Virtual function table for the IROTData class.
*/
-static const IROTDataVtbl VT_ROTDataImpl =
-{
-    AntiMonikerROTDataImpl_QueryInterface,
-    AntiMonikerROTDataImpl_AddRef,
-    AntiMonikerROTDataImpl_Release,
-    AntiMonikerROTDataImpl_GetComparaisonData
-};
-
-/**********************************************************************
********
- *         AntiMoniker_Construct (local function)
-
************************************************************************
*******/
-static HRESULT AntiMonikerImpl_Construct(AntiMonikerImpl* This)
-{
-
-    TRACE("(%p)\n",This);
-
-    /* Initialize the virtual fgunction table. */
-    This->lpvtbl1      = &VT_AntiMonikerImpl;
-    This->lpvtbl2      = &VT_ROTDataImpl;
-    This->ref          = 0;
-
-    return S_OK;
-}
-
-/**********************************************************************
********
- *        CreateAntiMoniker	[OLE32.@]
-
************************************************************************
******/
-HRESULT WINAPI CreateAntiMoniker(LPMONIKER * ppmk)
-{
-    AntiMonikerImpl* newAntiMoniker = 0;
-    HRESULT        hr = S_OK;
-    IID riid=IID_IMoniker;
-
-    TRACE("(%p)\n",ppmk);
-
-    newAntiMoniker = HeapAlloc(GetProcessHeap(), 0,
sizeof(AntiMonikerImpl));
-
-    if (newAntiMoniker == 0)
-        return STG_E_INSUFFICIENTMEMORY;
-
-    hr = AntiMonikerImpl_Construct(newAntiMoniker);
-    if (FAILED(hr))
-    {
-        HeapFree(GetProcessHeap(),0,newAntiMoniker);
-        return hr;
-    }
-
-    hr =
AntiMonikerImpl_QueryInterface((IMoniker*)newAntiMoniker,&riid,(void**)p
pmk);
-
-    return hr;
-}
+/**********************************************************************
*****************
+ *	                      AntiMonikers implementation
+ *
+ *               Copyright 1999  Noomen Hamza
+ *
+ * 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 <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"
+
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
+
+const CLSID CLSID_AntiMoniker = {
+  0x305, 0, 0, {0xC0, 0, 0, 0, 0, 0, 0, 0x46}
+};
+
+/* AntiMoniker data structure */
+typedef struct AntiMonikerImpl{
+
+    const IMonikerVtbl*  lpvtbl1;  /* VTable relative to the IMoniker
interface.*/
+
+    /* The ROT (RunningObjectTable implementation) uses the IROTData
interface to test whether
+     * two monikers are equal. That's whay IROTData interface is
implemented by monikers.
+     */
+    const IROTDataVtbl*  lpvtbl2;  /* VTable relative to the IROTData
interface.*/
+
+    ULONG ref; /* reference counter for this object */
+
+} AntiMonikerImpl;
+
+
+/**********************************************************************
*********
+ *        AntiMoniker_QueryInterface
+
************************************************************************
*******/
+static HRESULT WINAPI
+AntiMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void**
ppvObject)
+{
+    AntiMonikerImpl *This = (AntiMonikerImpl *)iface;
+
+    TRACE("(%p,%p,%p)\n",This,riid,ppvObject);
+
+    /* Perform a sanity check on the parameters.*/
+    if ( (This==0) || (ppvObject==0) )
+	return E_INVALIDARG;
+
+    /* Initialize the return parameter */
+    *ppvObject = 0;
+
+    /* Compare the riid with the interface IDs implemented by this
object.*/
+    if (IsEqualIID(&IID_IUnknown, riid) ||
+        IsEqualIID(&IID_IPersist, riid) ||
+        IsEqualIID(&IID_IPersistStream, riid) ||
+        IsEqualIID(&IID_IMoniker, riid))
+        *ppvObject = iface;
+    else if (IsEqualIID(&IID_IROTData, riid))
+        *ppvObject = (IROTData*)&(This->lpvtbl2);
+
+    /* Check that we obtained an interface.*/
+    if ((*ppvObject)==0)
+        return E_NOINTERFACE;
+
+    /* always increase the reference count by one when it is successful
*/
+    IMoniker_AddRef(iface);
+
+    return S_OK;
+}
+
+/**********************************************************************
********
+ *        AntiMoniker_AddRef
+
************************************************************************
******/
+static ULONG WINAPI
+AntiMonikerImpl_AddRef(IMoniker* iface)
+{
+    AntiMonikerImpl *This = (AntiMonikerImpl *)iface;
+
+    TRACE("(%p)\n",This);
+
+    return InterlockedIncrement(&This->ref);
+}
+
+/**********************************************************************
********
+ *        AntiMoniker_Release
+
************************************************************************
******/
+static ULONG WINAPI
+AntiMonikerImpl_Release(IMoniker* iface)
+{
+    AntiMonikerImpl *This = (AntiMonikerImpl *)iface;
+    ULONG ref;
+
+    TRACE("(%p)\n",This);
+
+    ref = InterlockedDecrement(&This->ref);
+
+    /* destroy the object if there's no more reference on it */
+    if (ref == 0) HeapFree(GetProcessHeap(),0,This);
+
+    return ref;
+}
+
+/**********************************************************************
********
+ *        AntiMoniker_GetClassID
+
************************************************************************
******/
+static HRESULT WINAPI
+AntiMonikerImpl_GetClassID(IMoniker* iface,CLSID *pClassID)
+{
+    TRACE("(%p,%p),stub!\n",iface,pClassID);
+
+    if (pClassID==NULL)
+        return E_POINTER;
+
+    *pClassID = CLSID_AntiMoniker;
+
+    return S_OK;
+}
+
+/**********************************************************************
********
+ *        AntiMoniker_IsDirty
+
************************************************************************
******/
+static HRESULT WINAPI
+AntiMonikerImpl_IsDirty(IMoniker* iface)
+{
+    /* Note that the OLE-provided implementations of the
IPersistStream::IsDirty
+       method in the OLE-provided moniker interfaces always return
S_FALSE because
+       their internal state never changes. */
+
+    TRACE("(%p)\n",iface);
+
+    return S_FALSE;
+}
+
+/**********************************************************************
********
+ *        AntiMoniker_Load
+
************************************************************************
******/
+static HRESULT WINAPI
+AntiMonikerImpl_Load(IMoniker* iface,IStream* pStm)
+{
+    DWORD constant=1,dwbuffer;
+    HRESULT res;
+
+    /* data read by this function is only a DWORD constant (must be 1)
! */
+    res=IStream_Read(pStm,&dwbuffer,sizeof(DWORD),NULL);
+
+    if (SUCCEEDED(res)&& dwbuffer!=constant)
+        return E_FAIL;
+
+    return res;
+}
+
+/**********************************************************************
********
+ *        AntiMoniker_Save
+
************************************************************************
******/
+static HRESULT WINAPI
+AntiMonikerImpl_Save(IMoniker* iface,IStream* pStm,BOOL fClearDirty)
+{
+    DWORD constant=1;
+    HRESULT res;
+
+    /* data written by this function is only a DWORD constant set to 1
! */
+    res=IStream_Write(pStm,&constant,sizeof(constant),NULL);
+
+    return res;
+}
+
+/**********************************************************************
********
+ *        AntiMoniker_GetSizeMax
+ *
+ * PARAMS
+ * pcbSize [out] Pointer to size of stream needed to save object
+
************************************************************************
******/
+static HRESULT WINAPI
+AntiMonikerImpl_GetSizeMax(IMoniker* iface, ULARGE_INTEGER* pcbSize)
+{
+    TRACE("(%p,%p)\n",iface,pcbSize);
+
+    if (pcbSize!=NULL)
+        return E_POINTER;
+
+    /* for more details see AntiMonikerImpl_Save coments */
+
+    /*
+     * Normally the sizemax must be sizeof DWORD, but
+     * I tested this function it usually return 16 bytes
+     * more than the number of bytes used by AntiMoniker::Save function
[truncated at 1000 lines; 167790 more skipped]