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

Timestamp:

Jun 9, 2002, 6:37:22 PM (23 years ago)

Author:

sandervl

Message:

Resync with latest Wine

File:

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

trunk/src/ole32/compositemoniker.c

@@ -40 +40 @@
     ICOM_VTABLE(IMoniker)*  lpvtbl1;  /* VTable relative to the IMoniker interface.*/
 
-    /* The ROT (RunningObjectTable implementation) uses the IROTData 
-     * interface to test whether two monikers are equal. That's why IROTData 
+    /* The ROT (RunningObjectTable implementation) uses the IROTData
+     * interface to test whether two monikers are equal. That's why IROTData
      * interface is implemented by monikers.
      */
@@ -201 +201 @@
 {
     ICOM_THIS(CompositeMonikerImpl,iface);
-  
+
     TRACE("(%p,%p,%p)\n",This,riid,ppvObject);
 
@@ -207 +207 @@
     if ( (This==0) || (ppvObject==0) )
         return E_INVALIDARG;
-  
+
     /* Initialize the return parameter */
     *ppvObject = 0;
@@ -250 +250 @@
     ICOM_THIS(CompositeMonikerImpl,iface);
     ULONG i;
-    
+
     TRACE("(%p)\n",This);
 
@@ -261 +261 @@
         for (i=0;i<This->tabLastIndex;i++)
             IMoniker_Release(This->tabMoniker[i]);
-        
+
         CompositeMonikerImpl_Destroy(This);
 
         return 0;
     }
-    return This->ref;;
+    return This->ref;
 }
 
@@ -278 +278 @@
     if (pClassID==NULL)
         return E_POINTER;
-            
+
     *pClassID = CLSID_CompositeMoniker;
-        
+
     return S_OK;
 }
@@ -307 +307 @@
     CLSID clsid;
     WCHAR string[1]={0};
-    
-    ICOM_THIS(CompositeMonikerImpl,iface);    
+
+    ICOM_THIS(CompositeMonikerImpl,iface);
 
     TRACE("(%p,%p)\n",iface,pStm);
@@ -366 +366 @@
         /* 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));
@@ -387 +387 @@
     IMoniker *pmk;
     DWORD constant=3;
-    
+
     TRACE("(%p,%p,%d)\n",iface,pStm,fClearDirty);
 
-    /* This function calls OleSaveToStream function for each moniker within 
+    /* This function calls OleSaveToStream function for each moniker within
      * this object.
-     * When I tested this function in windows, I usually found this constant 
-     * at the beginning of the stream. I don't known why (there's no 
+     * When I tested this function in windows, I usually found this constant
+     * at the beginning of the stream. I don't known why (there's no
      * indication in the specification) !
      */
@@ -427 +427 @@
     ULARGE_INTEGER ptmpSize;
 
-    /* The sizeMax of this object is calculated by calling  GetSizeMax on 
+    /* The sizeMax of this object is calculated by calling  GetSizeMax on
      * each moniker within this object then summing all returned values
      */
@@ -465 +465 @@
     IMoniker *tempMk;
     HRESULT res;
-    
+
     TRACE("(%p,%p,%p)\n",This,pmkFirst,pmkRest);
 
@@ -491 +491 @@
 
         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));
@@ -511 +511 @@
 
     IMoniker_IsSystemMoniker(pmkRest,&mkSys);
-    
+
     if (mkSys!=MKSYS_GENERICCOMPOSITE){
 
@@ -518 +518 @@
         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 */
@@ -527 +527 @@
             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 */
@@ -545 +545 @@
         /* resize tabMoniker if needed */
         if (This->tabLastIndex==This->tabSize){
-                
+
             This->tabSize+=BLOCK_TAB_SIZE;
 
@@ -556 +556 @@
     else{
 
-        /* add a composite moniker to the moniker table (do the same thing 
-         * for each moniker within the composite moniker as a simple moniker 
+        /* add a composite moniker to the moniker table (do the same thing
+         * for each moniker within the composite moniker as a simple moniker
          * (see above for how to add a simple moniker case) )
          */
@@ -584 +584 @@
 
             if (This->tabLastIndex==This->tabSize){
-                
+
                 This->tabSize+=BLOCK_TAB_SIZE;
 
@@ -627 +627 @@
     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 */
@@ -656 +656 @@
         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);
 
@@ -691 +691 @@
 
     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);
 
@@ -737 +737 @@
         IEnumMoniker_Next(enumMoniker,1,&mostRigthMk,NULL);
         IEnumMoniker_Release(enumMoniker);
-        
+
         res=CreateAntiMoniker(&antiMk);
         res=IMoniker_ComposeWith(iface,antiMk,0,&tempMk);
@@ -754 +754 @@
         IEnumMoniker_Next(enumMoniker,1,&mostRigthMk,NULL);
         IEnumMoniker_Release(enumMoniker);
-        
+
         res=CreateAntiMoniker(&antiMk);
         res=IMoniker_ComposeWith(iface,antiMk,0,&tempMk);
@@ -797 +797 @@
     /* 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);
 }
@@ -815 +815 @@
     if (ppenumMoniker == NULL)
         return E_POINTER;
-    
+
     return EnumMonikerImpl_CreateEnumMoniker(This->tabMoniker,This->tabLastIndex,0,fForward,ppenumMoniker);
 }
@@ -827 +827 @@
     IMoniker *tempMk1,*tempMk2;
     HRESULT res1,res2,res;
-    
+
     TRACE("(%p,%p)\n",iface,pmkOtherMoniker);
 
@@ -839 +839 @@
     if (enumMoniker1==NULL)
         return S_FALSE;
-    
+
     IMoniker_Enum(iface,TRUE,&enumMoniker2);
 
@@ -846 +846 @@
         res1=IEnumMoniker_Next(enumMoniker1,1,&tempMk1,NULL);
         res2=IEnumMoniker_Next(enumMoniker2,1,&tempMk2,NULL);
-        
+
         if((res1==S_OK)&&(res2==S_OK)){
 
@@ -916 +916 @@
         /* If pmkToLeft is NULL, this method returns S_OK if pmkNewlyRunning is non-NULL and is equal */
         /* to this moniker */
-        
+
         if (pmkNewlyRunning!=NULL)
 
@@ -934 +934 @@
             /* 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);
 
@@ -978 +978 @@
     IMoniker *tempMk,*antiMk,*mostRigthMk;
     IEnumMoniker *enumMoniker;
-    
+
     TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pCompositeTime);
 
@@ -1075 +1075 @@
     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 */
@@ -1082 +1082 @@
     if (ppmkPrefix==NULL)
         return E_POINTER;
-    
+
     *ppmkPrefix=0;
 
     if (pmkOther==NULL)
         return MK_E_NOPREFIX;
-    
+
     IMoniker_IsSystemMoniker(pmkOther,&mkSys);
 
@@ -1151 +1151 @@
             IMoniker_Release(tempMk1);
             IMoniker_Release(tempMk2);
-            
+
             /* compose all common monikers in a composite moniker */
             for(i=0;i<nbCommonMk;i++){
@@ -1162 +1162 @@
 
                 IMoniker_Release(tempMk1);
-                
+
                 *ppmkPrefix=tempMk2;
             }
@@ -1203 +1203 @@
     DWORD mkSys;
     HRESULT res1,res2;
-    
+
     *restMk=0;
 
@@ -1246 +1246 @@
     for(;IEnumMoniker_Next(enumMoniker3,1,&tempMk,NULL)==S_OK;nbRestMk++)
 
-        IMoniker_Release(tempMk);;
+        IMoniker_Release(tempMk);
 
     if (nbRestMk==0)
@@ -1301 +1301 @@
 
     /* 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 */
@@ -1358 +1358 @@
     if (ppszDisplayName==NULL)
         return E_POINTER;
-    
+
     *ppszDisplayName=CoTaskMemAlloc(sizeof(WCHAR));
 
@@ -1370 +1370 @@
 
     IMoniker_Enum(iface,TRUE,&enumMoniker);
-    
+
     while(IEnumMoniker_Next(enumMoniker,1,&tempMk,NULL)==S_OK){
 
@@ -1430 +1430 @@
     if (!pwdMksys)
         return E_POINTER;
-    
+
     (*pwdMksys)=MKSYS_GENERICCOMPOSITE;
 
@@ -1467 +1467 @@
 {
     ICOM_THIS_From_IROTData(IMoniker, iface);
-    
+
     TRACE("(%p)\n",iface);
 
@@ -1491 +1491 @@
 {
     ICOM_THIS(EnumMonikerImpl,iface);
-  
+
     TRACE("(%p,%p,%p)\n",This,riid,ppvObject);
 
@@ -1497 +1497 @@
     if ( (This==0) || (ppvObject==0) )
         return E_INVALIDARG;
-  
+
     /* Initialize the return parameter */
     *ppvObject = 0;
@@ -1542 +1542 @@
     /* 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]);
@@ -1551 +1551 @@
         return 0;
     }
-    return This->ref;;
+    return This->ref;
 }
 
@@ -1569 +1569 @@
     if (pceltFethed!=NULL)
         *pceltFethed= i;
-    
+
     if (i==celt)
         return S_OK;
@@ -1587 +1587 @@
 
     This->currentPos+=celt;
-    
+
     return S_OK;
 }
@@ -1633 +1633 @@
     if (currentPos > tabSize)
         return E_INVALIDARG;
-    
+
     /* Initialize the virtual function table. */
     ICOM_VTBL(newEnumMoniker)    = &VT_EnumMonikerImpl;
@@ -1676 +1676 @@
     if (ppmkComposite==NULL)
         return E_POINTER;
-    
+
     *ppmkComposite=0;