Changeset 4258 for trunk/src/ole32/compositemoniker.cpp

Timestamp:

Sep 14, 2000, 4:57:01 PM (25 years ago)

Author:

davidr

Message:

BugFixes & Updates (CorelWine)

File:

• trunk/src/ole32/compositemoniker.cpp (modified) (12 diffs)

trunk/src/ole32/compositemoniker.cpp

@@ -1 @@
-/* $Id: compositemoniker.cpp,v 1.1 1999-09-24 21:49:42 davidr Exp $ */
+/* $Id: compositemoniker.cpp,v 1.2 2000-09-14 14:57:01 davidr Exp $ */
 /* 
  * CompositeMonikers functions.
@@ -14 +14 @@
 #include "debugtools.h"
 
-DEFAULT_DEBUG_CHANNEL(ole)
+DEFAULT_DEBUG_CHANNEL(moniker)
 
 #define  BLOCK_TAB_SIZE 5 /* represent the first size table and it's increment block size */
@@ -42 +42 @@
 typedef struct EnumMonikerImpl{
 
-    ICOM_VTABLE(IEnumMoniker)*  lpvtbl;  /* VTable relative to the IEnumMoniker interface.*/
+    ICOM_VFIELD(IEnumMoniker);  /* VTable relative to the IEnumMoniker interface.*/
 
     ULONG ref; /* reference counter for this object */
@@ -285 +285 @@
 HRESULT WINAPI CompositeMonikerImpl_Load(IMoniker* iface,IStream* pStm)
 {
-    HRESULT res;
-    DWORD constant;
-    CLSID clsid;
-    WCHAR string[1]={0};
+    HRESULT     res;
+    CLSID       clsid;
+    WCHAR       string[1]={0};
+    ULONG       countMoniker;
     
     ICOM_THIS(CompositeMonikerImpl,iface);    
@@ -296 +296 @@
     /* this function call OleLoadFromStream function for each moniker within this object */
 
-    /* read the a constant writen by CompositeMonikerImpl_Save (see CompositeMonikerImpl_Save for more details)*/
-    res=IStream_Read(pStm,&constant,sizeof(DWORD),NULL);
-
-    if (SUCCEEDED(res)&& constant!=3)
-        return E_FAIL;
-
-    while(1){
+    /* read the number of monikers within the composite moniker*/
+    res=IStream_Read(pStm,&countMoniker,sizeof(countMoniker),NULL);
+
+    for(This->tabLastIndex=0; This->tabLastIndex < countMoniker; This->tabLastIndex++)
+    {
 #if 0
         res=OleLoadFromStream(pStm,&IID_IMoniker,(void**)&This->tabMoniker[This->tabLastIndex]);
 #endif
         res=ReadClassStm(pStm,&clsid);
-        printf("res=%ld",res);
+
         if (FAILED(res))
-            break;
-
-        if (IsEqualIID(&clsid,&CLSID_FileMoniker)){
+            return res;
+
+        if (IsEqualIID(&clsid,&CLSID_FileMoniker))
+        {
             res=CreateFileMoniker(string,&This->tabMoniker[This->tabLastIndex]);
             if (FAILED(res))
-                break;
-            res=IMoniker_Load(This->tabMoniker[This->tabLastIndex],pStm);
+                return res;
+        }
+        else if (IsEqualIID(&clsid,&CLSID_ItemMoniker))
+        {
+            CreateItemMoniker(string,string,&This->tabMoniker[This->tabLastIndex]);
             if (FAILED(res))
-                break;
-        }
-        else if (IsEqualIID(&clsid,&CLSID_ItemMoniker)){
-            CreateItemMoniker(string,string,&This->tabMoniker[This->tabLastIndex]);
-            if (res!=S_OK)
-                break;
-            IMoniker_Load(This->tabMoniker[This->tabLastIndex],pStm);
-            if (FAILED(res))
-                break;
-        }
-        else if (IsEqualIID(&clsid,&CLSID_AntiMoniker)){
+                return res;
+        }
+        else if (IsEqualIID(&clsid,&CLSID_AntiMoniker))
+        {
             CreateAntiMoniker(&This->tabMoniker[This->tabLastIndex]);
             if (FAILED(res))
-                break;
-            IMoniker_Load(This->tabMoniker[This->tabLastIndex],pStm);
-            if (FAILED(res))
-                break;
-        }
-        else if (IsEqualIID(&clsid,&CLSID_CompositeMoniker))
+                return res;
+        }
+        else
             return E_FAIL;
 
-        else{
-            FIXME("()");
-            break;
-            return E_NOTIMPL;
-        }
+        res=IMoniker_Load(This->tabMoniker[This->tabLastIndex],pStm);
+        if (FAILED(res))
+            return res;
 
         /* resize the table if needed */
-        if (++This->tabLastIndex==This->tabSize){
+        if (This->tabLastIndex==This->tabSize){
                 
             This->tabSize+=BLOCK_TAB_SIZE;
-            This->tabMoniker=(IMoniker**)HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(IMoniker));
+            This->tabMoniker=(IMoniker**)HeapReAlloc(
+                GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(IMoniker));
 
             if (This->tabMoniker==NULL)
-            return E_OUTOFMEMORY;
+                return E_OUTOFMEMORY;
         }
     }
@@ -366 +357 @@
     IEnumMoniker *enumMk;
     IMoniker *pmk;
-    DWORD constant=3;
+
+    ICOM_THIS(CompositeMonikerImpl,iface);
     
     TRACE("(%p,%p,%d)\n",iface,pStm,fClearDirty);
@@ -372 +364 @@
     /* this function call OleSaveToStream function for each moniker within this object */
 
-    /* when I tested this function in windows system ! I usually found this constant in the begining of */
-    /* the stream  I dont known why (there's no indication in specification) ! */
-    res=IStream_Write(pStm,&constant,sizeof(constant),NULL);
+    /* write the number of monikers within the composite moniker*/
+    res=IStream_Write(pStm,&(This->tabLastIndex),sizeof(This->tabLastIndex),NULL);
 
     IMoniker_Enum(iface,TRUE,&enumMk);
@@ -410 +401 @@
     TRACE("(%p,%p)\n",iface,pcbSize);
 
-    if (pcbSize!=NULL)
+    if (pcbSize==NULL)
         return E_POINTER;
 
-    pcbSize->LowPart =0;
+    pcbSize->LowPart =sizeof(DWORD) + 48;
     pcbSize->HighPart=0;
 
@@ -424 +415 @@
         IMoniker_Release(pmk);
 
-        pcbSize->LowPart +=ptmpSize.LowPart;
+        pcbSize->LowPart +=ptmpSize.LowPart;    // FIXME - 64bit Math
         pcbSize->HighPart+=ptmpSize.HighPart;
     }
@@ -432 +423 @@
     return S_OK;
 }
+
+#if 0
+/******************************************************************************
+ *         CompositeMonikerImpl_GetSizeToSave (Local)
+ *******************************************************************************/
+HRESULT CompositeMonikerImpl_GetSizeToSave(IMoniker* iface,ULARGE_INTEGER* pcbSize)
+{
+    IEnumMoniker *enumMk;
+    IMoniker *pmk;
+    HRESULT hRes;
+    ULARGE_INTEGER ptmpSize;
+
+    if (pcbSize==NULL)
+        return E_POINTER;
+
+    pcbSize->LowPart = sizeof(DWORD);
+    pcbSize->HighPart=0;
+
+    IMoniker_Enum(iface,TRUE,&enumMk);
+
+    while((hRes = IEnumMoniker_Next(enumMk,1,&pmk,NULL))==S_OK){
+
+        GetSizeToSaveMoniker(pmk,&ptmpSize);
+        IMoniker_Release(pmk);
+
+        pcbSize->LowPart +=ptmpSize.LowPart;    // FIXME - 64bit math
+        pcbSize->HighPart+=ptmpSize.HighPart;
+    }
+    IEnumMoniker_Release(enumMk);
+
+    return S_OK;
+}
+#endif
+
 
 /******************************************************************************
@@ -1509 +1534 @@
 {
     ICOM_THIS(EnumMonikerImpl,iface);
-    ULONG i
-        ;
-    TRACE("(%p)\n",This);
+
+    ULONG i;
 
     This->ref--;
@@ -1610 +1634 @@
     
     /* Initialize the virtual function table. */
-    newEnumMoniker->lpvtbl      = &VT_EnumMonikerImpl;
-    newEnumMoniker->ref          = 0;
-
-    newEnumMoniker->tabSize=tabSize;
-    newEnumMoniker->currentPos=currentPos;
-
-    newEnumMoniker->tabMoniker=(IMoniker**)HeapAlloc(GetProcessHeap(),0,tabSize*sizeof(IMoniker));
+    ICOM_VTBL(newEnumMoniker)  = &VT_EnumMonikerImpl;
+    newEnumMoniker->ref        = 0;
+
+    newEnumMoniker->tabSize    = tabSize;
+    newEnumMoniker->currentPos = currentPos;
+
+    newEnumMoniker->tabMoniker =(IMoniker**)HeapAlloc(GetProcessHeap(),0,tabSize*sizeof(IMoniker));
 
     if (newEnumMoniker->tabMoniker==NULL)