Changeset 6711 for trunk/src/ole32/antimoniker.c

Timestamp:

Sep 15, 2001, 11:32:00 AM (24 years ago)

Author:

sandervl

Message:

restored old version + wine update

File:

• trunk/src/ole32/antimoniker.c (modified) (20 diffs)

trunk/src/ole32/antimoniker.c

@@ -1 @@
-/* $Id: antimoniker.c,v 1.2 2001-09-05 13:17:07 bird Exp $ */
 /***************************************************************************************
- *                        AntiMonikers implementation
+ *                            AntiMonikers implementation
  *
  *               Copyright 1999  Noomen Hamza
@@ -16 +15 @@
 #include "debugtools.h"
 
+#ifdef __WIN32OS2__
+#undef FIXME
+#undef TRACE
+#ifdef DEBUG
+#define TRACE WriteLog("OLE32: %s", __FUNCTION__); WriteLog
+#define FIXME WriteLog("FIXME OLE32: %s", __FUNCTION__); WriteLog
+#else
+#define TRACE 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
+#define FIXME 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
+#endif
+#endif
+
 DEFAULT_DEBUG_CHANNEL(ole);
 
@@ -23 +34 @@
     ICOM_VTABLE(IMoniker)*  lpvtbl1;  /* VTable relative to the IMoniker interface.*/
 
-    /* The ROT (RunningObjectTable implementation) uses the IROTData interface to test whether
+    /* The ROT (RunningObjectTable implementation) uses the IROTData interface to test whether 
      * two monikers are equal. That's whay IROTData interface is implemented by monikers.
      */
@@ -129 +140 @@
 {
     ICOM_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;
-
+        return E_INVALIDARG;
+  
   /* Initialize the return parameter */
   *ppvObject = 0;
@@ -152 +163 @@
     if ((*ppvObject)==0)
         return E_NOINTERFACE;
-
+  
    /* Query Interface always increases the reference count by one when it is successful */
   AntiMonikerImpl_AddRef(iface);
@@ -201 +212 @@
     if (pClassID==NULL)
         return E_POINTER;
-
+            
     *pClassID = CLSID_AntiMoniker;
-
+        
     return S_OK;
 }
@@ -245 +256 @@
     DWORD constant=1;
     HRESULT res;
-
+    
     /* data writen by this function is only a DWORD constant seted to 1 ! */
     res=IStream_Write(pStm,&constant,sizeof(constant),NULL);
@@ -264 +275 @@
 
     /* for more details see AntiMonikerImpl_Save coments */
-
+    
     /* Normaly the sizemax must be the  size of DWORD ! but I tested this function it ususlly return 16 bytes */
     /* more than the number of bytes used by AntiMoniker::Save function */
@@ -343 +354 @@
 
     *ppmkReduced=iface;
-
+    
     return MK_S_REDUCED_TO_SELF;
 }
@@ -358 +369 @@
 
     if ((ppmkComposite==NULL)||(pmkRight==NULL))
-    return E_POINTER;
+        return E_POINTER;
 
     *ppmkComposite=0;
-
+    
     if (fOnlyIfNotGeneric)
         return MK_E_NEEDGENERIC;
@@ -377 +388 @@
     if (ppenumMoniker == NULL)
         return E_POINTER;
-
+    
     *ppenumMoniker = NULL;
 
@@ -389 +400 @@
 {
     DWORD mkSys;
-
+    
     TRACE("(%p,%p)\n",iface,pmkOtherMoniker);
 
     if (pmkOtherMoniker==NULL)
         return S_FALSE;
-
+    
     IMoniker_IsSystemMoniker(pmkOtherMoniker,&mkSys);
 
@@ -477 +488 @@
 {
     DWORD mkSys;
-
+    
     IMoniker_IsSystemMoniker(pmkOther,&mkSys);
 
@@ -487 +498 @@
 
         IMoniker_AddRef(iface);
-
+        
         return MK_S_US;
     }
@@ -520 +531 @@
 {
     WCHAR back[]={'\\','.','.',0};
-
+    
     TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,ppszDisplayName);
 
@@ -537 +548 @@
 
     strcpyW(*ppszDisplayName,back);
-
+    
     return S_OK;
 }
@@ -564 +575 @@
     if (!pwdMksys)
         return E_POINTER;
-
+    
     (*pwdMksys)=MKSYS_ANTIMONIKER;
 
@@ -601 +612 @@
 {
     ICOM_THIS_From_IROTData(IMoniker, iface);
-
+    
     TRACE("(%p)\n",iface);
 
@@ -620 +631 @@
 
 /******************************************************************************
- *        CreateAntiMoniker [OLE.55]
+ *        CreateAntiMoniker     [OLE.55]
  ******************************************************************************/
 HRESULT WINAPI CreateAntiMoniker(LPMONIKER * ppmk)
@@ -627 +638 @@
     HRESULT        hr = S_OK;
     IID riid=IID_IMoniker;
-
+    
     TRACE("(%p)\n",ppmk);