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

Timestamp:

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

Author:

sandervl

Message:

Resync with latest Wine

File:

• trunk/src/ole32/itemmoniker.c (modified) (23 diffs)

trunk/src/ole32/itemmoniker.c

@@ -39 +39 @@
     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.
      */
@@ -49 +49 @@
 
     LPOLESTR itemDelimiter; /* Delimiter string */
-    
+
 } ItemMonikerImpl;
 
@@ -155 +155 @@
     if ( (This==0) || (ppvObject==0) )
         return E_INVALIDARG;
-  
+
   /* Initialize the return parameter */
   *ppvObject = 0;
@@ -166 +166 @@
      )
       *ppvObject = iface;
-  
+
     else if (IsEqualIID(&IID_IROTData, riid))
         *ppvObject = (IROTData*)&(This->lpvtbl2);
@@ -173 +173 @@
     if ((*ppvObject)==0)
         return E_NOINTERFACE;
-  
+
    /* Query Interface always increases the reference count by one when it is successful */
   ItemMonikerImpl_AddRef(iface);
@@ -210 +210 @@
         return 0;
     }
-    return This->ref;;
+    return This->ref;
 }
 
@@ -222 +222 @@
     if (pClassID==NULL)
         return E_POINTER;
-            
+
     *pClassID = CLSID_ItemMoniker;
-        
+
     return S_OK;
 }
@@ -356 +356 @@
 
     /* for more details see ItemMonikerImpl_Save coments */
-    
+
     pcbSize->s.LowPart =  sizeof(DWORD) + /* DWORD which contains delimiter length */
                         delimiterLength + /* item delimiter string */
@@ -433 +433 @@
 {
     ICOM_THIS(ItemMonikerImpl,iface);
-    
+
     HRESULT   res;
     IID    refid=IID_IOleItemContainer;
@@ -480 +480 @@
     if(pmkToLeft==NULL)
         return E_INVALIDARG;
-        
+
     res=IMoniker_BindToObject(pmkToLeft,pbc,NULL,&IID_IOleItemContainer,(void**)&poic);
 
@@ -510 +510 @@
 
     *ppmkReduced=iface;
-    
+
     return MK_S_REDUCED_TO_SELF;
 }
@@ -533 +533 @@
 
     *ppmkComposite=0;
-    
+
     IMoniker_IsSystemMoniker(pmkRight,&mkSys);
 
@@ -543 +543 @@
         /* if pmkRight is a composite whose leftmost component is an anti-moniker,           */
         /* the returned moniker is the composite after the leftmost anti-moniker is removed. */
-        
+
          if(mkSys==MKSYS_GENERICCOMPOSITE){
 
@@ -561 +561 @@
                 tempMkComposite=iface;
                 IMoniker_AddRef(iface);
-                
+
                 while(IEnumMoniker_Next(penumMk,1,&pmostLeftMk,NULL)==S_OK){
 
@@ -618 +618 @@
     if (pmkOtherMoniker==NULL)
         return S_FALSE;
-    
+
     /* This method returns S_OK if both monikers are item monikers and their display names are */
     /* identical (using a case-insensitive comparison); otherwise, the method returns S_FALSE. */
@@ -633 +633 @@
     IMoniker_GetDisplayName(iface,bind,NULL,&dispName1);
     IMoniker_GetDisplayName(pmkOtherMoniker,bind,NULL,&dispName2);
-    
+
     if (lstrcmpW(dispName1,dispName2)!=0)
         return S_FALSE;
-    
+
     return S_OK;
 }
@@ -653 +653 @@
     if (pdwHash==NULL)
         return E_POINTER;
-    
+
     val =  This->itemName;
     len = lstrlenW(val);
@@ -712 +712 @@
         /* requesting an IOleItemContainer interface pointer. The method then calls IOleItemContainer::IsRunning,*/
         /* passing the string contained within this moniker. */
-        
+
         res=IMoniker_BindToObject(pmkToLeft,pbc,NULL,&IID_IOleItemContainer,(void**)&poic);
 
@@ -793 +793 @@
 
         *ppmkPrefix=iface;
-        
+
         IMoniker_AddRef(iface);
-        
+
         return MK_S_US;
     }
@@ -815 +815 @@
 
     *ppmkRelPath=0;
-    
+
     return MK_E_NOTBINDABLE;
 }
@@ -845 +845 @@
     strcpyW(*ppszDisplayName,This->itemDelimiter);
     strcatW(*ppszDisplayName,This->itemName);
-    
+
     return S_OK;
 }
@@ -900 +900 @@
     if (!pwdMksys)
         return E_POINTER;
-    
+
     (*pwdMksys)=MKSYS_ITEMMONIKER;
 
@@ -937 +937 @@
 {
     ICOM_THIS_From_IROTData(IMoniker, iface);
-    
+
     TRACE("(%p)\n",iface);