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

Timestamp:

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

Author:

sandervl

Message:

restored old version + wine update

File:

• trunk/src/ole32/compositemoniker.c (modified) (49 diffs)

trunk/src/ole32/compositemoniker.c

@@ -1 @@
-/* $Id: compositemoniker.c,v 1.2 2001-09-05 13:17:08 bird Exp $ */
 /***************************************************************************************
- *                        CompositeMonikers implementation
+ *                            CompositeMonikers implementation
  *
  *               Copyright 1999  Noomen Hamza
@@ -18 +17 @@
 #include "ole2.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);
 
@@ -27 +38 @@
     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.
      */
@@ -187 +198 @@
 {
     ICOM_THIS(CompositeMonikerImpl,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;
@@ -236 +247 @@
     ICOM_THIS(CompositeMonikerImpl,iface);
     ULONG i;
-
+    
     TRACE("(%p)\n",This);
 
@@ -247 +258 @@
         for (i=0;i<This->tabLastIndex;i++)
             IMoniker_Release(This->tabMoniker[i]);
-
+        
         CompositeMonikerImpl_Destroy(This);
 
@@ -264 +275 @@
     if (pClassID==NULL)
         return E_POINTER;
-
+            
     *pClassID = CLSID_CompositeMoniker;
-
+        
     return S_OK;
 }
@@ -293 +304 @@
     CLSID clsid;
     WCHAR string[1]={0};
-
-    ICOM_THIS(CompositeMonikerImpl,iface);
+    
+    ICOM_THIS(CompositeMonikerImpl,iface);    
 
     TRACE("(%p,%p)\n",iface,pStm);
@@ -350 +361 @@
         /* resize the table if needed */
         if (++This->tabLastIndex==This->tabSize){
-
+                
             This->tabSize+=BLOCK_TAB_SIZE;
             This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(IMoniker));
@@ -371 +382 @@
     IMoniker *pmk;
     DWORD constant=3;
-
+    
     TRACE("(%p,%p,%d)\n",iface,pStm,fClearDirty);
 
@@ -446 +457 @@
     IMoniker *tempMk;
     HRESULT res;
-
+    
     TRACE("(%p,%p,%p)\n",This,pmkFirst,pmkRest);
 
@@ -472 +483 @@
 
         IMoniker_Enum(pmkFirst,TRUE,&enumMoniker);
-
+        
         while(IEnumMoniker_Next(enumMoniker,1,&This->tabMoniker[This->tabLastIndex],NULL)==S_OK){
 
 
             if (++This->tabLastIndex==This->tabSize){
-
+                
                 This->tabSize+=BLOCK_TAB_SIZE;
                 This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(IMoniker));
@@ -492 +503 @@
 
     IMoniker_IsSystemMoniker(pmkRest,&mkSys);
-
+    
     if (mkSys!=MKSYS_GENERICCOMPOSITE){
 
@@ -499 +510 @@
         res=IMoniker_ComposeWith(This->tabMoniker[This->tabLastIndex-1],pmkRest,TRUE,&tempMk);
 
-        if (res==MK_E_NEEDGENERIC){
+        if (res==MK_E_NEEDGENERIC){ 
 
             /* there's no simplification in this case */
@@ -508 +519 @@
             IMoniker_AddRef(pmkRest);
         }
-        else if (tempMk==NULL){
+        else if (tempMk==NULL){ 
 
             /* we have an antimoniker after a simple moniker so we can make a simplification in this case */
@@ -526 +537 @@
         /* resize tabMoniker if needed */
         if (This->tabLastIndex==This->tabSize){
-
+                
             This->tabSize+=BLOCK_TAB_SIZE;
 
@@ -563 +574 @@
 
             if (This->tabLastIndex==This->tabSize){
-
+                
                 This->tabSize+=BLOCK_TAB_SIZE;
 
@@ -606 +617 @@
     IMoniker *tempMk,*antiMk,*mostRigthMk;
     IEnumMoniker *enumMoniker;
-
+    
     TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult);
 
     if (ppvResult==NULL)
         return E_POINTER;
-
+    
     *ppvResult=0;
     /* If pmkToLeft is NULL, this method looks for the moniker in the ROT, and if found, queries the retrieved */
@@ -635 +646 @@
         IEnumMoniker_Next(enumMoniker,1,&mostRigthMk,NULL);
         IEnumMoniker_Release(enumMoniker);
-
+        
         res=CreateAntiMoniker(&antiMk);
         res=IMoniker_ComposeWith(iface,antiMk,0,&tempMk);
         IMoniker_Release(antiMk);
-
+        
         res=CompositeMonikerImpl_BindToObject(mostRigthMk,pbc,tempMk,riid,ppvResult);
 
@@ -670 +681 @@
 
     if (pmkToLeft!=NULL){
-
+        
         IMoniker_Enum(iface,FALSE,&enumMoniker);
         IEnumMoniker_Next(enumMoniker,1,&mostRigthMk,NULL);
         IEnumMoniker_Release(enumMoniker);
-
+        
         res=CreateAntiMoniker(&antiMk);
         res=IMoniker_ComposeWith(iface,antiMk,0,&tempMk);
         IMoniker_Release(antiMk);
-
+        
         res=CompositeMonikerImpl_BindToStorage(mostRigthMk,pbc,tempMk,riid,ppvResult);
 
@@ -716 +727 @@
         IEnumMoniker_Next(enumMoniker,1,&mostRigthMk,NULL);
         IEnumMoniker_Release(enumMoniker);
-
+        
         res=CreateAntiMoniker(&antiMk);
         res=IMoniker_ComposeWith(iface,antiMk,0,&tempMk);
@@ -733 +744 @@
         IEnumMoniker_Next(enumMoniker,1,&mostRigthMk,NULL);
         IEnumMoniker_Release(enumMoniker);
-
+        
         res=CreateAntiMoniker(&antiMk);
         res=IMoniker_ComposeWith(iface,antiMk,0,&tempMk);
@@ -769 +780 @@
 
     if ((ppmkComposite==NULL)||(pmkRight==NULL))
-    return E_POINTER;
+        return E_POINTER;
 
     *ppmkComposite=0;
@@ -776 +787 @@
     /* otherwise, the method returns the result of combining the two monikers by calling the */
     /* CreateGenericComposite function */
-
+    
     if (fOnlyIfNotGeneric)
         return MK_E_NEEDGENERIC;
-
+    
     return CreateGenericComposite(iface,pmkRight,ppmkComposite);
 }
@@ -794 +805 @@
     if (ppenumMoniker == NULL)
         return E_POINTER;
-
+    
     return EnumMonikerImpl_CreateEnumMoniker(This->tabMoniker,This->tabLastIndex,0,fForward,ppenumMoniker);
 }
@@ -806 +817 @@
     IMoniker *tempMk1,*tempMk2;
     HRESULT res1,res2,res;
-
+    
     TRACE("(%p,%p)\n",iface,pmkOtherMoniker);
 
@@ -818 +829 @@
     if (enumMoniker1==NULL)
         return S_FALSE;
-
+    
     IMoniker_Enum(iface,TRUE,&enumMoniker2);
 
@@ -825 +836 @@
         res1=IEnumMoniker_Next(enumMoniker1,1,&tempMk1,NULL);
         res2=IEnumMoniker_Next(enumMoniker2,1,&tempMk2,NULL);
-
+        
         if((res1==S_OK)&&(res2==S_OK)){
 
@@ -895 +906 @@
         /* If pmkToLeft is NULL, this method returns S_OK if pmkNewlyRunning is non-NULL and is equal */
         /* to this moniker */
-
+        
         if (pmkNewlyRunning!=NULL)
 
@@ -913 +924 @@
             /* IMoniker::IsRunning on the rightmost component of the composite, passing the remainder of */
             /* the composite as the pmkToLeft parameter for that call.                                   */
-
+            
              res=IBindCtx_GetRunningObjectTable(pbc,&rot);
 
@@ -957 +968 @@
     IMoniker *tempMk,*antiMk,*mostRigthMk;
     IEnumMoniker *enumMoniker;
-
+    
     TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pCompositeTime);
 
@@ -1054 +1065 @@
     IEnumMoniker *enumMoniker1,*enumMoniker2;
     ULONG i,nbCommonMk=0;
-
+    
     /* If the other moniker is a composite, this method compares the components of each composite from left  */
     /* to right. The returned common prefix moniker might also be a composite moniker, depending on how many */
@@ -1061 +1072 @@
     if (ppmkPrefix==NULL)
         return E_POINTER;
-
+    
     *ppmkPrefix=0;
 
     if (pmkOther==NULL)
         return MK_E_NOPREFIX;
-
+    
     IMoniker_IsSystemMoniker(pmkOther,&mkSys);
 
@@ -1130 +1141 @@
             IMoniker_Release(tempMk1);
             IMoniker_Release(tempMk2);
-
+            
             /* compose all common monikers in a composite moniker */
             for(i=0;i<nbCommonMk;i++){
@@ -1141 +1152 @@
 
                 IMoniker_Release(tempMk1);
-
+                
                 *ppmkPrefix=tempMk2;
             }
@@ -1182 +1193 @@
     DWORD mkSys;
     HRESULT res1,res2;
-
+    
     *restMk=0;
 
@@ -1280 +1291 @@
 
     /* finds the common prefix of the two monikers */
-    res=IMoniker_CommonPrefixWith(iface,pmkOther,&commonMk);
+    res=IMoniker_CommonPrefixWith(iface,pmkOther,&commonMk);    
 
     /* if there's no common prefix or the two moniker are equal the relative is the other moniker */
@@ -1337 +1348 @@
     if (ppszDisplayName==NULL)
         return E_POINTER;
-
+    
     *ppszDisplayName=CoTaskMemAlloc(sizeof(WCHAR));
 
@@ -1349 +1360 @@
 
     IMoniker_Enum(iface,TRUE,&enumMoniker);
-
+    
     while(IEnumMoniker_Next(enumMoniker,1,&tempMk,NULL)==S_OK){
 
@@ -1409 +1420 @@
     if (!pwdMksys)
         return E_POINTER;
-
+    
     (*pwdMksys)=MKSYS_GENERICCOMPOSITE;
 
@@ -1446 +1457 @@
 {
     ICOM_THIS_From_IROTData(IMoniker, iface);
-
+    
     TRACE("(%p)\n",iface);
 
@@ -1470 +1481 @@
 {
     ICOM_THIS(EnumMonikerImpl,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;
@@ -1521 +1532 @@
     /* destroy the object if there's no more reference on it */
     if (This->ref==0){
-
+        
         for(i=0;i<This->tabSize;i++)
             IMoniker_Release(This->tabMoniker[i]);
@@ -1548 +1559 @@
     if (pceltFethed!=NULL)
         *pceltFethed= i;
-
+    
     if (i==celt)
         return S_OK;
@@ -1566 +1577 @@
 
     This->currentPos+=celt;
-
+    
     return S_OK;
 }
@@ -1612 +1623 @@
     if (currentPos > tabSize)
         return E_INVALIDARG;
-
+    
     /* Initialize the virtual function table. */
     ICOM_VTBL(newEnumMoniker)    = &VT_EnumMonikerImpl;
@@ -1644 +1655 @@
 
 /******************************************************************************
- *        CreateGenericComposite    [OLE.55]
+ *        CreateGenericComposite        [OLE.55]
  ******************************************************************************/
 HRESULT WINAPI CreateGenericComposite(LPMONIKER pmkFirst, LPMONIKER pmkRest, LPMONIKER* ppmkComposite)
@@ -1655 +1666 @@
     if (ppmkComposite==NULL)
         return E_POINTER;
-
+    
     *ppmkComposite=0;
 
@@ -1693 +1704 @@
 
 /******************************************************************************
- *        MonikerCommonPrefixWith   [OLE.55]
+ *        MonikerCommonPrefixWith       [OLE.55]
  ******************************************************************************/
 HRESULT WINAPI MonikerCommonPrefixWith(IMoniker* pmkThis,IMoniker* pmkOther,IMoniker** ppmkCommon)