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

Timestamp:

Feb 15, 2002, 6:18:52 PM (24 years ago)

Author:

sandervl

Message:

Wine 20020215 resync

File:

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

trunk/src/ole32/compositemoniker.c

@@ -17 +17 @@
 #include "ole2.h"
 
-#ifdef __WIN32OS2__
-#undef FIXME
-#undef TRACE
-#ifdef DEBUG
-// PH 2001-11-30
-// this macro definition causes the control leave the scope of a
-// non-curly-braced preceeding if statement. Therefore,
-//   if (p!=NULL) 
-//      TRACE("p->a=%d", p->a)
-// crashes.
-//
-// !!! ENSURE TRACES AND FIXMES WITH PRECEEDING IF STATEMENT 
-// !!! ARE PUT INTO CURLY BRACES
-#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);
 
@@ -47 +26 @@
     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 whay IROTData interface is implemented by monikers.
+    /* The ROT (RunningObjectTable implementation) uses the IROTData 
+     * interface to test whether two monikers are equal. That's why IROTData 
+     * interface is implemented by monikers.
      */
     ICOM_VTABLE(IROTData)*  lpvtbl2;  /* VTable relative to the IROTData interface.*/
@@ -362 +342 @@
             return E_FAIL;
 
-        else{
-            FIXME("()");
+        else
+        {
+            FIXME("()\n");
+            /* FIXME: To whoever wrote this code: It's either return or break. it cannot be both! */
             break;
             return E_NOTIMPL;
@@ -394 +376 @@
     TRACE("(%p,%p,%d)\n",iface,pStm,fClearDirty);
 
-    /* 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) ! */
+    /* 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 
+     * indication in the specification) !
+     */
     res=IStream_Write(pStm,&constant,sizeof(constant),NULL);
 
@@ -429 +413 @@
     ULARGE_INTEGER ptmpSize;
 
-    /* the sizeMax of this object is calculated by calling  GetSizeMax on each moniker within this object then */
-    /* suming all returned sizemax */
+    /* The sizeMax of this object is calculated by calling  GetSizeMax on 
+     * each moniker within this object then summing all returned values
+     */
 
     TRACE("(%p,%p)\n",iface,pcbSize);
@@ -469 +454 @@
     TRACE("(%p,%p,%p)\n",This,pmkFirst,pmkRest);
 
-    /* Initialize the virtual fgunction table. */
+    /* Initialize the virtual function table. */
     This->lpvtbl1      = &VT_CompositeMonikerImpl;
     This->lpvtbl2      = &VT_ROTDataImpl;
@@ -483 +468 @@
     IMoniker_IsSystemMoniker(pmkFirst,&mkSys);
 
-    /* put the first moniker contents in the begining of the table */
+    /* put the first moniker contents in the beginning of the table */
     if (mkSys!=MKSYS_GENERICCOMPOSITE){
 
@@ -557 +542 @@
     else{
 
-        /* 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 how to add a simple moniker case) ) */
+        /* 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) )
+         */
         IMoniker_Enum(pmkRest,TRUE,&enumMoniker);
 
@@ -1664 +1651 @@
 
 /******************************************************************************
- *        CreateGenericComposite        [OLE.55]
+ *        CreateGenericComposite        [OLE32.56]
  ******************************************************************************/
 HRESULT WINAPI CreateGenericComposite(LPMONIKER pmkFirst, LPMONIKER pmkRest, LPMONIKER* ppmkComposite)
@@ -1713 +1700 @@
 
 /******************************************************************************
- *        MonikerCommonPrefixWith       [OLE.55]
+ *        MonikerCommonPrefixWith       [OLE32.82]
  ******************************************************************************/
 HRESULT WINAPI MonikerCommonPrefixWith(IMoniker* pmkThis,IMoniker* pmkOther,IMoniker** ppmkCommon)