Changeset 6711 for trunk/src

Timestamp:

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

Author:

sandervl

Message:

restored old version + wine update

Location:

trunk/src

Files:

• ole32/antimoniker.c (modified) (20 diffs)
• ole32/bindctx.c (modified) (14 diffs)
• ole32/clipboard.c (modified) (88 diffs)
• ole32/compobj.c (modified) (99 diffs)
• ole32/compositemoniker.c (modified) (49 diffs)
• ole32/datacache.c (modified) (96 diffs)
• ole32/defaulthandler.c (modified) (92 diffs)
• ole32/errorinfo.c (modified) (9 diffs)
• ole32/filemoniker.c (modified) (47 diffs)
• ole32/hglobalstream.c (modified) (47 diffs)
• ole32/ifs.c (modified) (22 diffs)
• ole32/initole32.cpp (modified) (4 diffs)
• ole32/initterm.cpp (modified) (1 diff)
• ole32/itemmoniker.c (modified) (29 diffs)
• ole32/memlockbytes.c (modified) (7 diffs)
• ole32/moniker.c (modified) (18 diffs)
• ole32/ole2.c (modified) (95 diffs)
• ole32/ole2impl.c (modified) (1 diff)
• ole32/ole2stubs.c (modified) (8 diffs)
• ole32/ole32_main.c (modified) (4 diffs)
• ole32/oleobj.c (modified) (35 diffs)
• ole32/stg_bigblockfile.c (modified) (33 diffs)
• ole32/stg_stream.c (modified) (51 diffs)
• ole32/storage32.c (modified) (289 diffs)
• oleaut32/connpt.c (modified) (29 diffs)
• oleaut32/dispatch.c (modified) (3 diffs)
• oleaut32/initterm.cpp (modified) (4 diffs)
• oleaut32/ole2disp.c (modified) (18 diffs)
• oleaut32/oleaut.c (modified) (7 diffs)
• oleaut32/olefont.c (modified) (57 diffs)
• oleaut32/olepicture.c (modified) (50 diffs)
• oleaut32/parsedt.c (modified) (18 diffs)
• oleaut32/safearray.c (modified) (67 diffs)
• oleaut32/typelib.c (modified) (11 diffs)
• oleaut32/typelib.h (modified) (2 diffs)
• oleaut32/variant.c (modified) (67 diffs)

trunk/src/ole32/antimoniker.c

@@ -1 @@
-/* $Id: antimoniker.c,v 1.2 2001-09-05 13:17:07 bird Exp $ */
 /***************************************************************************************
- *                        AntiMonikers implementation
+ *                            AntiMonikers implementation
  *
  *               Copyright 1999  Noomen Hamza
@@ -16 +15 @@
 #include "debugtools.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);
 
@@ -23 +34 @@
     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.
      */
@@ -129 +140 @@
 {
     ICOM_THIS(AntiMonikerImpl,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;
@@ -152 +163 @@
     if ((*ppvObject)==0)
         return E_NOINTERFACE;
-
+  
    /* Query Interface always increases the reference count by one when it is successful */
   AntiMonikerImpl_AddRef(iface);
@@ -201 +212 @@
     if (pClassID==NULL)
         return E_POINTER;
-
+            
     *pClassID = CLSID_AntiMoniker;
-
+        
     return S_OK;
 }
@@ -245 +256 @@
     DWORD constant=1;
     HRESULT res;
-
+    
     /* data writen by this function is only a DWORD constant seted to 1 ! */
     res=IStream_Write(pStm,&constant,sizeof(constant),NULL);
@@ -264 +275 @@
 
     /* for more details see AntiMonikerImpl_Save coments */
-
+    
     /* Normaly the sizemax must be the  size of DWORD ! but I tested this function it ususlly return 16 bytes */
     /* more than the number of bytes used by AntiMoniker::Save function */
@@ -343 +354 @@
 
     *ppmkReduced=iface;
-
+    
     return MK_S_REDUCED_TO_SELF;
 }
@@ -358 +369 @@
 
     if ((ppmkComposite==NULL)||(pmkRight==NULL))
-    return E_POINTER;
+        return E_POINTER;
 
     *ppmkComposite=0;
-
+    
     if (fOnlyIfNotGeneric)
         return MK_E_NEEDGENERIC;
@@ -377 +388 @@
     if (ppenumMoniker == NULL)
         return E_POINTER;
-
+    
     *ppenumMoniker = NULL;
 
@@ -389 +400 @@
 {
     DWORD mkSys;
-
+    
     TRACE("(%p,%p)\n",iface,pmkOtherMoniker);
 
     if (pmkOtherMoniker==NULL)
         return S_FALSE;
-
+    
     IMoniker_IsSystemMoniker(pmkOtherMoniker,&mkSys);
 
@@ -477 +488 @@
 {
     DWORD mkSys;
-
+    
     IMoniker_IsSystemMoniker(pmkOther,&mkSys);
 
@@ -487 +498 @@
 
         IMoniker_AddRef(iface);
-
+        
         return MK_S_US;
     }
@@ -520 +531 @@
 {
     WCHAR back[]={'\\','.','.',0};
-
+    
     TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,ppszDisplayName);
 
@@ -537 +548 @@
 
     strcpyW(*ppszDisplayName,back);
-
+    
     return S_OK;
 }
@@ -564 +575 @@
     if (!pwdMksys)
         return E_POINTER;
-
+    
     (*pwdMksys)=MKSYS_ANTIMONIKER;
 
@@ -601 +612 @@
 {
     ICOM_THIS_From_IROTData(IMoniker, iface);
-
+    
     TRACE("(%p)\n",iface);
 
@@ -620 +631 @@
 
 /******************************************************************************
- *        CreateAntiMoniker [OLE.55]
+ *        CreateAntiMoniker     [OLE.55]
  ******************************************************************************/
 HRESULT WINAPI CreateAntiMoniker(LPMONIKER * ppmk)
@@ -627 +638 @@
     HRESULT        hr = S_OK;
     IID riid=IID_IMoniker;
-
+    
     TRACE("(%p)\n",ppmk);
 

trunk/src/ole32/bindctx.c

@@ -1 @@
-/* $Id: bindctx.c,v 1.2 2001-09-05 13:17:07 bird Exp $ */
 /***************************************************************************************
- *                        BindCtx implementation
+ *                            BindCtx implementation
  *
  *  Copyright 1999  Noomen Hamza
@@ -18 +17 @@
 #include "heap.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);
 
 /* represent the first size table and it's increment block size */
-#define  BLOCK_TAB_SIZE 10
+#define  BLOCK_TAB_SIZE 10 
 #define  MAX_TAB_SIZE   0xFFFFFFFF
 
@@ -39 +50 @@
 
     ICOM_VFIELD(IBindCtx); /* VTable relative to the IBindCtx interface.*/
-
+                                     
     ULONG ref; /* reference counter for this object */
 
@@ -103 +114 @@
   if ( (This==0) || (ppvObject==0) )
       return E_INVALIDARG;
-
+  
   /* Initialize the return parameter.*/
   *ppvObject = 0;
@@ -117 +128 @@
   if ((*ppvObject)==0)
       return E_NOINTERFACE;
-
+  
    /* Query Interface always increases the reference count by one when it is successful */
   BindCtxImpl_AddRef(iface);
@@ -224 +235 @@
     if (punk==NULL)
         return E_POINTER;
-
+    
     IUnknown_AddRef(punk);
-
+    
     /* put the object in the first free element in the table */
     This->bindCtxTable[lastIndex].pObj = punk;
@@ -264 +275 @@
     /* check if the object was registred or not */
     if (BindCtxImpl_GetObjectIndex(This,punk,NULL,&index)==S_FALSE)
-
+        
         return MK_E_NOTBOUND;
 
     IUnknown_Release(This->bindCtxTable[index].pObj);
-
+    
     /* left-shift all elements in the right side of the current revoked object */
     for(j=index; j<This->bindCtxTableLastIndex-1; j++)
         This->bindCtxTable[j]= This->bindCtxTable[j+1];
-
+    
     This->bindCtxTableLastIndex--;
 
@@ -308 +319 @@
     if (pbindopts==NULL)
         return E_POINTER;
-
+    
     if (pbindopts->cbStruct > sizeof(BIND_OPTS2))
     {
@@ -352 +363 @@
     if (pprot==NULL)
         return E_POINTER;
-
+    
     res=GetRunningObjectTable(0, pprot);
 
@@ -369 +380 @@
     if (punk==NULL)
         return E_INVALIDARG;
-
+    
     IUnknown_AddRef(punk);
 
@@ -390 +401 @@
 
     This->bindCtxTableLastIndex++;
-
+    
     if (This->bindCtxTableLastIndex == This->bindCtxTableSize){ /* table is full ! must be resized */
 
@@ -420 +431 @@
 
     *punk=0;
-
+    
     if (BindCtxImpl_GetObjectIndex(This,NULL,pszkey,&index)==S_FALSE)
         return E_FAIL;
 
     IUnknown_AddRef(This->bindCtxTable[index].pObj);
-
+    
     *punk = This->bindCtxTable[index].pObj;
 
@@ -447 +458 @@
     /* release the object if it's found */
     IUnknown_Release(This->bindCtxTable[index].pObj);
-
+    
     /* remove the object from the table with a left-shifting of all objects in the right side */
     for(j=index; j<This->bindCtxTableLastIndex-1; j++)
         This->bindCtxTable[j]= This->bindCtxTable[j+1];
-
+    
     This->bindCtxTableLastIndex--;
 
@@ -477 +488 @@
     DWORD i;
     BYTE found=0;
-
+    
     TRACE("(%p,%p,%p,%p)\n",This,punk,pszkey,index);
 

trunk/src/ole32/clipboard.c

@@ -1 @@
-/* $Id: clipboard.c,v 1.2 2001-09-05 13:17:07 bird Exp $ */
 /*
  *  OLE 2 clipboard support
@@ -82 +81 @@
 
   /*
-   * The hidden OLE clipboard window. This window is used as the bridge between the
+   * The hidden OLE clipboard window. This window is used as the bridge between the 
    * the OLE and windows clipboard API. (Windows creates one such window per process)
    */
@@ -115 +114 @@
 *   DO NOT add any members before the VTables declaration!
 */
-typedef struct
+typedef struct 
 {
   /* IEnumFORMATETC VTable */
   ICOM_VFIELD(IEnumFORMATETC);
-
+  
   /* IEnumFORMATETC fields */
   UINT                         posFmt;    /* current enumerator position */
@@ -134 +133 @@
    */
   IUnknown*                    pUnkDataObj;
-
+  
 } IEnumFORMATETCImpl;
 
@@ -173 +172 @@
             REFIID           riid,
             void**           ppvObject);
-static ULONG WINAPI OLEClipbrd_IDataObject_AddRef(
+static ULONG WINAPI OLEClipbrd_IDataObject_AddRef( 
             IDataObject*     iface);
-static ULONG WINAPI OLEClipbrd_IDataObject_Release(
+static ULONG WINAPI OLEClipbrd_IDataObject_Release( 
             IDataObject*     iface);
 static HRESULT WINAPI OLEClipbrd_IDataObject_GetData(
-        IDataObject*     iface,
-        LPFORMATETC      pformatetcIn,
-        STGMEDIUM*       pmedium);
+            IDataObject*     iface,
+            LPFORMATETC      pformatetcIn, 
+            STGMEDIUM*       pmedium);
 static HRESULT WINAPI OLEClipbrd_IDataObject_GetDataHere(
-        IDataObject*     iface,
-        LPFORMATETC      pformatetc,
-        STGMEDIUM*       pmedium);
+            IDataObject*     iface, 
+            LPFORMATETC      pformatetc,
+            STGMEDIUM*       pmedium);
 static HRESULT WINAPI OLEClipbrd_IDataObject_QueryGetData(
-        IDataObject*     iface,
-        LPFORMATETC      pformatetc);
+            IDataObject*     iface,
+            LPFORMATETC      pformatetc);
 static HRESULT WINAPI OLEClipbrd_IDataObject_GetCanonicalFormatEtc(
-        IDataObject*     iface,
-        LPFORMATETC      pformatectIn,
-        LPFORMATETC      pformatetcOut);
+            IDataObject*     iface, 
+            LPFORMATETC      pformatectIn, 
+            LPFORMATETC      pformatetcOut);
 static HRESULT WINAPI OLEClipbrd_IDataObject_SetData(
-        IDataObject*     iface,
-        LPFORMATETC      pformatetc,
-        STGMEDIUM*       pmedium,
-        BOOL             fRelease);
+            IDataObject*     iface,
+            LPFORMATETC      pformatetc, 
+            STGMEDIUM*       pmedium, 
+            BOOL             fRelease);
 static HRESULT WINAPI OLEClipbrd_IDataObject_EnumFormatEtc(
-        IDataObject*     iface,
-        DWORD            dwDirection,
-        IEnumFORMATETC** ppenumFormatEtc);
+            IDataObject*     iface,       
+            DWORD            dwDirection,
+            IEnumFORMATETC** ppenumFormatEtc);
 static HRESULT WINAPI OLEClipbrd_IDataObject_DAdvise(
-        IDataObject*     iface,
-        FORMATETC*       pformatetc,
-        DWORD            advf,
-        IAdviseSink*     pAdvSink,
-        DWORD*           pdwConnection);
+            IDataObject*     iface, 
+            FORMATETC*       pformatetc, 
+            DWORD            advf, 
+            IAdviseSink*     pAdvSink, 
+            DWORD*           pdwConnection);
 static HRESULT WINAPI OLEClipbrd_IDataObject_DUnadvise(
-        IDataObject*     iface,
-        DWORD            dwConnection);
+            IDataObject*     iface,
+            DWORD            dwConnection);
 static HRESULT WINAPI OLEClipbrd_IDataObject_EnumDAdvise(
-        IDataObject*     iface,
-        IEnumSTATDATA**  ppenumAdvise);
+            IDataObject*     iface,
+            IEnumSTATDATA**  ppenumAdvise);
 
 /*
@@ -266 +265 @@
 
 /*
- * Name of our registered OLE clipboard window class
+ * Name of our registered OLE clipboard window class 
  */
 CHAR OLEClipbrd_WNDCLASS[] = "CLIPBRDWNDCLASS";
@@ -280 +279 @@
 
 /*---------------------------------------------------------------------*
- *           Win32 OLE clipboard API
+ *           Win32 OLE clipboard API 
  *---------------------------------------------------------------------*/
 
@@ -291 +290 @@
  *
  *    S_OK                  IDataObject pointer placed on the clipboard
- *    CLIPBRD_E_CANT_OPEN   OpenClipboard failed
- *    CLIPBRD_E_CANT_EMPTY  EmptyClipboard failed
+ *    CLIPBRD_E_CANT_OPEN   OpenClipboard failed 
+ *    CLIPBRD_E_CANT_EMPTY  EmptyClipboard failed 
  *    CLIPBRD_E_CANT_CLOSE  CloseClipboard failed
  *    CLIPBRD_E_CANT_SET    SetClipboard failed
@@ -307 +306 @@
   OLEClipbrd **ppDataObject;
 */
-
+  
   TRACE("(%p)\n", pDataObj);
-
+  
   /*
    * Make sure we have a clipboard object
@@ -332 +331 @@
   /*
    * Empty the current clipboard and make our window the clipboard owner
-   * NOTE: This will trigger a WM_DESTROYCLIPBOARD message
+   * NOTE: This will trigger a WM_DESTROYCLIPBOARD message 
    */
   if ( !EmptyClipboard() )
@@ -357 +356 @@
 
   /*
-   * Enumerate all HGLOBAL formats supported by the source and make
+   * Enumerate all HGLOBAL formats supported by the source and make 
    * those formats available using delayed rendering using SetClipboardData.
-   * Only global memory based data items may be made available to non-OLE
-   * applications via the standard Windows clipboard API. Data based on other
+   * Only global memory based data items may be made available to non-OLE 
+   * applications via the standard Windows clipboard API. Data based on other 
    * mediums(non TYMED_HGLOBAL) can only be accessed via the Ole Clipboard API.
    *
@@ -374 +373 @@
       HANDLE_ERROR( hr );
     }
-
+      
     while ( S_OK == IEnumFORMATETC_Next(penumFormatetc, 1, &rgelt, NULL) )
     {
@@ -383 +382 @@
               GetClipboardFormatNameA(rgelt.cfFormat, szFmtName, sizeof(szFmtName)-1)
                 ? szFmtName : "");
-
+  
         SetClipboardData( rgelt.cfFormat, (HANDLE)NULL);
       }
@@ -392 +391 @@
   /*
    * Windows additionally creates a new "DataObject" clipboard format
-   * and stores in on the clipboard. We could possibly store a pointer
+   * and stores in on the clipboard. We could possibly store a pointer 
    * to our internal IDataObject interface on the clipboard. I'm not
    * sure what the use of this is though.
@@ -403 +402 @@
    if (hDataObject==0)
      HANDLE_ERROR( E_OUTOFMEMORY );
-
+   
    ppDataObject = (OLEClipbrd**)GlobalLock(hDataObject);
    *ppDataObject = theOleClipboard;
@@ -411 +410 @@
      HANDLE_ERROR( CLIPBRD_E_CANT_SET );
 */
-
+  
   hr = S_OK;
 
@@ -440 +439 @@
 /***********************************************************************
  * OleGetClipboard [OLE32.105]
- * Returns a pointer to our internal IDataObject which represents the conceptual
- * state of the Windows clipboard. If the current clipboard already contains
+ * Returns a pointer to our internal IDataObject which represents the conceptual 
+ * state of the Windows clipboard. If the current clipboard already contains 
  * an IDataObject, our internal IDataObject will delegate to this object.
  */
@@ -448 +447 @@
   HRESULT hr = S_OK;
   TRACE("()\n");
-
+    
   /*
    * Make sure we have a clipboard object
@@ -489 +488 @@
   BOOL bClipboardOpen = FALSE;
   IDataObject* pIDataObjectSrc = NULL;
-
+  
   TRACE("()\n");
 
@@ -509 +508 @@
   pIDataObjectSrc = theOleClipboard->pIDataObjectSrc;
   IDataObject_AddRef(pIDataObjectSrc);
-
+  
   /*
    * Open the Windows clipboard
@@ -549 +548 @@
     }
   }
-
+  
   IEnumFORMATETC_Release(penumFormatetc);
-
+  
   /*
    * Release the source data object we are holding on to
@@ -572 +571 @@
  *           OleIsCurrentClipboard [OLE32.110]
  */
-HRESULT WINAPI OleIsCurrentClipboard (  IDataObject *pDataObject)
+HRESULT WINAPI OleIsCurrentClipboard (  IDataObject *pDataObject) 
 {
   TRACE("()\n");
@@ -588 +587 @@
 
 /*---------------------------------------------------------------------*
- *           Internal implementation methods for the OLE clipboard
+ *           Internal implementation methods for the OLE clipboard 
  *---------------------------------------------------------------------*/
 
 /***********************************************************************
  * OLEClipbrd_Initialize()
- * Initializes the OLE clipboard.
+ * Initializes the OLE clipboard. 
  */
 void OLEClipbrd_Initialize()
 {
   /*
-   * Create the clipboard if necessary
+   * Create the clipboard if necessary 
    */
   if ( !theOleClipboard )
@@ -610 +609 @@
 /***********************************************************************
  * OLEClipbrd_UnInitialize()
- * Un-Initializes the OLE clipboard
+ * Un-Initializes the OLE clipboard 
  */
 void OLEClipbrd_UnInitialize()
@@ -637 +636 @@
   OLEClipbrd* newObject = NULL;
   HGLOBAL hNewObject = 0;
-
+  
   /*
    * Allocate space for the object. We use GlobalAlloc since we need
@@ -651 +650 @@
    */
   newObject = GlobalLock(hNewObject);
-
+  
   /*
    * Initialize the virtual function table.
@@ -658 +657 @@
 
   /*
-   * Start with one reference count. The caller of this function
+   * Start with one reference count. The caller of this function 
    * must release the interface pointer when it is done.
    */
@@ -664 +663 @@
 
   newObject->hSelf = hNewObject;
-
+  
   /*
    * The Ole clipboard is a singleton - save the global handle and pointer
@@ -677 +676 @@
 {
   TRACE("()\n");
-
+    
   if ( !ptrToDestroy )
     return;
 
   /*
-   * Destroy the Ole clipboard window
+   * Destroy the Ole clipboard window 
    */
   if ( ptrToDestroy->hWndClipboard )
@@ -704 +703 @@
 /***********************************************************************
  * OLEClipbrd_CreateWindow()
- * Create the clipboard window
+ * Create the clipboard window 
  */
 static HWND OLEClipbrd_CreateWindow()
@@ -711 +710 @@
   WNDCLASSEXA wcex;
 
-  /*
-   * Register the clipboard window class if necessary
+  /* 
+   * Register the clipboard window class if necessary 
    */
     ZeroMemory( &wcex, sizeof(WNDCLASSEXA));
@@ -728 +727 @@
 
   /*
-   * Create a hidden window to receive OLE clipboard messages
+   * Create a hidden window to receive OLE clipboard messages 
    */
 
@@ -738 +737 @@
  */
 
-  hwnd = CreateWindowA(OLEClipbrd_WNDCLASS,
-                    "ClipboardWindow",
-                    WS_POPUP | WS_CLIPSIBLINGS | WS_OVERLAPPED,
-                    CW_USEDEFAULT, CW_USEDEFAULT,
-                    CW_USEDEFAULT, CW_USEDEFAULT,
-                    0,
-                    0,
-                    0,
-                    0 /*(LPVOID)&clipboardInfo */);
+  hwnd = CreateWindowA(OLEClipbrd_WNDCLASS, 
+                                    "ClipboardWindow",
+                                    WS_POPUP | WS_CLIPSIBLINGS | WS_OVERLAPPED,
+                                    CW_USEDEFAULT, CW_USEDEFAULT,
+                                    CW_USEDEFAULT, CW_USEDEFAULT,
+                                    0,
+                                    0,
+                                    0,
+                                    0 /*(LPVOID)&clipboardInfo */);
 
   return hwnd;
@@ -757 +756 @@
 static void OLEClipbrd_DestroyWindow(HWND hwnd)
 {
-  /*
-   * Destroy clipboard window and unregister its WNDCLASS
+  /* 
+   * Destroy clipboard window and unregister its WNDCLASS 
    */
   DestroyWindow(hwnd);
@@ -766 +765 @@
 /***********************************************************************
  * OLEClipbrd_WndProc(HWND, unsigned, WORD, LONG)
- * Processes messages sent to the OLE clipboard window.
- * Note that we will intercept messages in our WndProc only when data
- * has been placed in the clipboard via OleSetClipboard().
+ * Processes messages sent to the OLE clipboard window. 
+ * Note that we will intercept messages in our WndProc only when data 
+ * has been placed in the clipboard via OleSetClipboard(). 
  * i.e. Only when OLE owns the windows clipboard.
  */
@@ -774 +773 @@
   (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
-  switch (message)
+  switch (message) 
   {
     /*
-     * WM_RENDERFORMAT
+     * WM_RENDERFORMAT 
      * We receive this message to allow us to handle delayed rendering of
-     * a specific clipboard format when an application requests data in
+     * a specific clipboard format when an application requests data in 
      * that format by calling GetClipboardData.
-     * (Recall that in OleSetClipboard, we used SetClipboardData to
+     * (Recall that in OleSetClipboard, we used SetClipboardData to 
      * make all HGLOBAL formats supported by the source IDataObject
      * available using delayed rendering)
-     * On receiving this mesage we must actually render the data in the
-     * specified format and place it on the clipboard by calling the
-     * SetClipboardData function.
+     * On receiving this mesage we must actually render the data in the 
+     * specified format and place it on the clipboard by calling the 
+     * SetClipboardData function. 
      */
     case WM_RENDERFORMAT:
     {
       FORMATETC rgelt;
-
+        
       ZeroMemory( &rgelt, sizeof(FORMATETC));
 
@@ -803 +802 @@
 
       TRACE("(): WM_RENDERFORMAT(cfFormat=%d)\n", rgelt.cfFormat);
-
+      
       /*
        * Render the clipboard data.
@@ -827 +826 @@
       IEnumFORMATETC* penumFormatetc = NULL;
       FORMATETC rgelt;
-
+      
       TRACE("(): WM_RENDERALLFORMATS\n");
-
+      
       /*
        * Render all HGLOBAL formats supported by the source into
@@ -846 +845 @@
         {
           /*
-           * Render the clipboard data.
+           * Render the clipboard data. 
            */
           if ( FAILED(OLEClipbrd_RenderFormat( (IDataObject*)&(theOleClipboard->lpvtbl1), &rgelt )) )
             continue;
-
+        
           TRACE("(): WM_RENDERALLFORMATS(cfFormat=%d)\n", rgelt.cfFormat);
         }
       }
-
+      
       IEnumFORMATETC_Release(penumFormatetc);
 
@@ -993 +992 @@
 
         HeapFree(GetProcessHeap(), 0, mfBits);
-
+  
         GlobalUnlock(std2.u.hMetaFilePict);
 
@@ -1021 +1020 @@
    *  Put a copy of the rendered data back on the clipboard
    */
-
+  
   if ( !(hDup = OLEClipbrd_GlobalDupMem(hStorage)) )
     HANDLE_ERROR( E_OUTOFMEMORY );
-
+       
   if ( !SetClipboardData( pFormatetc->cfFormat, hDup ) )
   {
@@ -1032 +1031 @@
 
 CLEANUP:
-
+  
   ReleaseStgMedium(&std);
-
+  
   return hr;
 }
@@ -1048 +1047 @@
     PVOID pGlobalSrc, pGlobalDest;
     DWORD cBytes;
-
+    
     if ( !hGlobalSrc )
       return 0;
@@ -1055 +1054 @@
     if ( 0 == cBytes )
       return 0;
-
+        
     hGlobalDest = GlobalAlloc( GMEM_DDESHARE|GMEM_MOVEABLE,
                                cBytes );
     if ( !hGlobalDest )
       return 0;
-
+    
     pGlobalSrc = GlobalLock(hGlobalSrc);
     pGlobalDest = GlobalLock(hGlobalDest);
@@ -1067 +1066 @@
 
     memcpy(pGlobalDest, pGlobalSrc, cBytes);
-
+        
     GlobalUnlock(hGlobalSrc);
     GlobalUnlock(hGlobalDest);
@@ -1076 +1075 @@
 
 /*---------------------------------------------------------------------*
- *  Implementation of the internal IDataObject interface exposed by
+ *  Implementation of the internal IDataObject interface exposed by 
  *  the OLE clipboard.
  *---------------------------------------------------------------------*/
@@ -1091 +1090 @@
             void**           ppvObject)
 {
-  /*
-   * Declare "This" pointer
+  /* 
+   * Declare "This" pointer 
    */
   ICOM_THIS(OLEClipbrd, iface);
   TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObject);
-
+  
   /*
    * Perform a sanity check on the parameters.
@@ -1102 +1101 @@
   if ( (This==0) || (ppvObject==0) )
     return E_INVALIDARG;
-
+  
   /*
    * Initialize the return parameter.
@@ -1111 +1110 @@
    * Compare the riid with the interface IDs implemented by this object.
    */
-  if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0)
+  if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) 
   {
     *ppvObject = iface;
   }
-  else if (memcmp(&IID_IDataObject, riid, sizeof(IID_IDataObject)) == 0)
+  else if (memcmp(&IID_IDataObject, riid, sizeof(IID_IDataObject)) == 0) 
   {
     *ppvObject = (IDataObject*)&(This->lpvtbl1);
@@ -1124 +1123 @@
     return E_NOINTERFACE;
   }
-
+  
   /*
    * Query Interface always increases the reference count by one when it is
-   * successful.
+   * successful. 
    */
   IUnknown_AddRef((IUnknown*)*ppvObject);
@@ -1139 +1138 @@
  * See Windows documentation for more details on IUnknown methods.
  */
-static ULONG WINAPI OLEClipbrd_IDataObject_AddRef(
+static ULONG WINAPI OLEClipbrd_IDataObject_AddRef( 
             IDataObject*     iface)
 {
-  /*
-   * Declare "This" pointer
+  /* 
+   * Declare "This" pointer 
    */
   ICOM_THIS(OLEClipbrd, iface);
 
   TRACE("(%p)->(count=%lu)\n",This, This->ref);
-
+  
   This->ref++;
 
@@ -1159 +1158 @@
  * See Windows documentation for more details on IUnknown methods.
  */
-static ULONG WINAPI OLEClipbrd_IDataObject_Release(
+static ULONG WINAPI OLEClipbrd_IDataObject_Release( 
             IDataObject*     iface)
 {
-  /*
-   * Declare "This" pointer
+  /* 
+   * Declare "This" pointer 
    */
   ICOM_THIS(OLEClipbrd, iface);
 
   TRACE("(%p)->(count=%lu)\n",This, This->ref);
-
+  
   /*
    * Decrease the reference count on this object.
@@ -1181 +1180 @@
     OLEClipbrd_Destroy(This);
   }
-
+  
   return This->ref;
 }
 
-
+ 
 /************************************************************************
  * OLEClipbrd_IDataObject_GetData (IDataObject)
  *
- * The OLE Clipboard's implementation of this method delegates to
+ * The OLE Clipboard's implementation of this method delegates to 
  * a data source if there is one or wraps around the windows clipboard
  *
@@ -1195 +1194 @@
  */
 static HRESULT WINAPI OLEClipbrd_IDataObject_GetData(
-        IDataObject*     iface,
-        LPFORMATETC      pformatetcIn,
-        STGMEDIUM*       pmedium)
+            IDataObject*     iface,
+            LPFORMATETC      pformatetcIn, 
+            STGMEDIUM*       pmedium)
 {
   HANDLE      hData = 0;
@@ -1204 +1203 @@
 
   /*
-   * Declare "This" pointer
+   * Declare "This" pointer 
    */
   ICOM_THIS(OLEClipbrd, iface);
-
+ 
   TRACE("(%p,%p,%p)\n", iface, pformatetcIn, pmedium);
 
@@ -1233 +1232 @@
 */
 
-  /*
+  /* 
    * Otherwise, get the data from the windows clipboard using GetClipboardData
    */
@@ -1241 +1240 @@
   hData = GetClipboardData(pformatetcIn->cfFormat);
 
-  /*
+  /* 
    * Return the clipboard data in the storage medium structure
    */
@@ -1247 +1246 @@
   pmedium->u.hGlobal = (HGLOBAL)hData;
   pmedium->pUnkForRelease = NULL;
-
+  
   hr = S_OK;
-
+  
 CLEANUP:
   /*
@@ -1263 +1262 @@
 
 static HRESULT WINAPI OLEClipbrd_IDataObject_GetDataHere(
-        IDataObject*     iface,
-        LPFORMATETC      pformatetc,
-        STGMEDIUM*       pmedium)
+            IDataObject*     iface, 
+            LPFORMATETC      pformatetc,
+            STGMEDIUM*       pmedium)
 {
   FIXME(": Stub\n");
@@ -1274 +1273 @@
  * OLEClipbrd_IDataObject_QueryGetData (IDataObject)
  *
- * The OLE Clipboard's implementation of this method delegates to
+ * The OLE Clipboard's implementation of this method delegates to 
  * a data source if there is one or wraps around the windows clipboard
  * function IsClipboardFormatAvailable() otherwise.
@@ -1281 +1280 @@
  */
 static HRESULT WINAPI OLEClipbrd_IDataObject_QueryGetData(
-        IDataObject*     iface,
-        LPFORMATETC      pformatetc)
-{
-  /*
-   * Declare "This" pointer
+            IDataObject*     iface,
+            LPFORMATETC      pformatetc)
+{
+  /* 
+   * Declare "This" pointer 
    */
   ICOM_THIS(OLEClipbrd, iface);
@@ -1315 +1314 @@
   if ( pformatetc->tymed != TYMED_HGLOBAL )
     return DV_E_TYMED;
-
+          
   /*
    * Delegate to the Windows clipboard function IsClipboardFormatAvailable
@@ -1328 +1327 @@
  */
 static HRESULT WINAPI OLEClipbrd_IDataObject_GetCanonicalFormatEtc(
-        IDataObject*     iface,
-        LPFORMATETC      pformatectIn,
-        LPFORMATETC      pformatetcOut)
+            IDataObject*     iface, 
+            LPFORMATETC      pformatectIn, 
+            LPFORMATETC      pformatetcOut)
 {
   TRACE("(%p, %p, %p)\n", iface, pformatectIn, pformatetcOut);
@@ -1344 +1343 @@
  * OLEClipbrd_IDataObject_SetData (IDataObject)
  *
- * The OLE Clipboard's does not implement this method
+ * The OLE Clipboard's does not implement this method 
  *
  * See Windows documentation for more details on IDataObject methods.
  */
 static HRESULT WINAPI OLEClipbrd_IDataObject_SetData(
-        IDataObject*     iface,
-        LPFORMATETC      pformatetc,
-        STGMEDIUM*       pmedium,
-        BOOL             fRelease)
+            IDataObject*     iface,
+            LPFORMATETC      pformatetc, 
+            STGMEDIUM*       pmedium, 
+            BOOL             fRelease)
 {
   TRACE("\n");
@@ -1364 +1363 @@
  */
 static HRESULT WINAPI OLEClipbrd_IDataObject_EnumFormatEtc(
-        IDataObject*     iface,
-        DWORD            dwDirection,
-        IEnumFORMATETC** ppenumFormatEtc)
+            IDataObject*     iface,
+            DWORD            dwDirection,
+            IEnumFORMATETC** ppenumFormatEtc)
 {
   HRESULT hr = S_OK;
@@ -1373 +1372 @@
   UINT format;
   BOOL bClipboardOpen;
-
-  /*
-   * Declare "This" pointer
+  
+  /* 
+   * Declare "This" pointer 
    */
   ICOM_THIS(OLEClipbrd, iface);
@@ -1428 +1427 @@
       HANDLE_ERROR( E_FAIL );
     }
-
+    
     /* Init the FORMATETC struct */
     afmt[i].cfFormat = format;
@@ -1447 +1446 @@
   if (FAILED( hr = IEnumFORMATETC_AddRef(*ppenumFormatEtc)))
     HANDLE_ERROR( hr );
-
+      
   hr = S_OK;
-
+  
 CLEANUP:
   /*
@@ -1456 +1455 @@
   if (afmt)
     HeapFree(GetProcessHeap(), 0, afmt);
-
+  
   /*
    * Close Windows clipboard
@@ -1469 +1468 @@
  * OLEClipbrd_IDataObject_DAdvise (IDataObject)
  *
- * The OLE Clipboard's does not implement this method
+ * The OLE Clipboard's does not implement this method 
  *
  * See Windows documentation for more details on IDataObject methods.
  */
 static HRESULT WINAPI OLEClipbrd_IDataObject_DAdvise(
-        IDataObject*     iface,
-        FORMATETC*       pformatetc,
-        DWORD            advf,
-        IAdviseSink*     pAdvSink,
-        DWORD*           pdwConnection)
+            IDataObject*     iface, 
+            FORMATETC*       pformatetc, 
+            DWORD            advf, 
+            IAdviseSink*     pAdvSink, 
+            DWORD*           pdwConnection)
 {
   TRACE("\n");
@@ -1487 +1486 @@
  * OLEClipbrd_IDataObject_DUnadvise (IDataObject)
  *
- * The OLE Clipboard's does not implement this method
+ * The OLE Clipboard's does not implement this method 
  *
  * See Windows documentation for more details on IDataObject methods.
  */
 static HRESULT WINAPI OLEClipbrd_IDataObject_DUnadvise(
-        IDataObject*     iface,
-        DWORD            dwConnection)
+            IDataObject*     iface,
+            DWORD            dwConnection)
 {
   TRACE("\n");
@@ -1507 +1506 @@
  */
 static HRESULT WINAPI OLEClipbrd_IDataObject_EnumDAdvise(
-        IDataObject*     iface,
-        IEnumSTATDATA**  ppenumAdvise)
+            IDataObject*     iface,
+            IEnumSTATDATA**  ppenumAdvise)
 {
   TRACE("\n");
@@ -1534 +1533 @@
   DWORD size=cfmt * sizeof(FORMATETC);
   LPMALLOC pIMalloc;
-
+  
   ef = (IEnumFORMATETCImpl*)HeapAlloc(GetProcessHeap(),
                                       HEAP_ZERO_MEMORY,
@@ -1540 +1539 @@
   if (!ef)
     return NULL;
-
+  
   ef->ref = 0;
   ICOM_VTBL(ef) = &efvt;
   ef->pUnkDataObj = pUnkDataObj;
-
+  
   ef->posFmt = 0;
   ef->countFmt = cfmt;
@@ -1551 +1550 @@
   ef->pFmt = (LPFORMATETC)IMalloc_Alloc(pIMalloc, size);
   IMalloc_Release(pIMalloc);
-
+  
   if (ef->pFmt)
     memcpy(ef->pFmt, afmt, size);
-
+  
   TRACE("(%p)->()\n",ef);
   return (LPENUMFORMATETC)ef;
@@ -1576 +1575 @@
    * we only need to support the IUnknown and IEnumFORMATETC interfaces
    */
-
+  
   *ppvObj = NULL;
-
+  
   if(IsEqualIID(riid, &IID_IUnknown))
   {
@@ -1586 +1585 @@
   {
     *ppvObj = (IDataObject*)This;
-  }
-
+  }   
+  
   if(*ppvObj)
   {
@@ -1594 +1593 @@
     return S_OK;
   }
-
+  
   TRACE("-- Interface: E_NOINTERFACE\n");
   return E_NOINTERFACE;
@@ -1615 +1614 @@
   if (This->pUnkDataObj)
     IUnknown_AddRef(This->pUnkDataObj);
-
+  
   return ++(This->ref);
 }
@@ -1633 +1632 @@
   if (This->pUnkDataObj)
     IUnknown_Release(This->pUnkDataObj);  /* Release parent data object */
-
-  if (!--(This->ref))
+  
+  if (!--(This->ref)) 
   {
     TRACE("() - destroying IEnumFORMATETC(%p)\n",This);
@@ -1642 +1641 @@
       IMalloc_Release(pIMalloc);
     }
-
+      
     HeapFree(GetProcessHeap(),0,This);
     return 0;
@@ -1661 +1660 @@
   UINT cfetch;
   HRESULT hres = S_FALSE;
-
+  
   TRACE("(%p)->(pos=%u)\n", This, This->posFmt);
-
+  
   if (This->posFmt < This->countFmt)
   {
@@ -1672 +1671 @@
       hres = S_OK;
     }
-
+    
     memcpy(rgelt, &This->pFmt[This->posFmt], cfetch * sizeof(FORMATETC));
     This->posFmt += cfetch;
@@ -1680 +1679 @@
     cfetch = 0;
   }
-
+  
   if (pceltFethed)
   {
     *pceltFethed = cfetch;
   }
-
+  
   return hres;
 }
@@ -1698 +1697 @@
   ICOM_THIS(IEnumFORMATETCImpl,iface);
   TRACE("(%p)->(num=%lu)\n", This, celt);
-
+  
   This->posFmt += celt;
   if (This->posFmt > This->countFmt)
@@ -1717 +1716 @@
   ICOM_THIS(IEnumFORMATETCImpl,iface);
   TRACE("(%p)->()\n", This);
-
+  
   This->posFmt = 0;
   return S_OK;
@@ -1732 +1731 @@
   ICOM_THIS(IEnumFORMATETCImpl,iface);
   HRESULT hr = S_OK;
-
+  
   TRACE("(%p)->(ppenum=%p)\n", This, ppenum);
 
@@ -1744 +1743 @@
   if (FAILED( hr = IEnumFORMATETC_AddRef(*ppenum)))
     return ( hr );
-
+  
   return (*ppenum) ? S_OK : E_OUTOFMEMORY;
 }

trunk/src/ole32/compobj.c

@@ -1 @@
-/* $Id: compobj.c,v 1.2 2001-09-05 13:17:07 bird Exp $ */
 /*
- *  COMPOBJ library
- *
- *  Copyright 1995  Martin von Loewis
- *  Copyright 1998  Justin Bradford
+ *      COMPOBJ library
+ *
+ *      Copyright 1995  Martin von Loewis
+ *      Copyright 1998  Justin Bradford
  *      Copyright 1999  Francis Beaudet
  *  Copyright 1999  Sylvain St-Germain
@@ -38 +37 @@
 #ifdef __WIN32OS2__
 #include <heapstring.h>
+
+#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
 
@@ -45 +54 @@
  *  COM External Lock structures and methods declaration
  *
- *  This api provides a linked list to managed external references to
- *  COM objects.
- *
- *  The public interface consists of three calls:
+ *  This api provides a linked list to managed external references to 
+ *  COM objects.  
+ *
+ *  The public interface consists of three calls: 
  *      COM_ExternalLockAddRef
  *      COM_ExternalLockRelease
@@ -58 +67 @@
 
 /*
- * Declaration of the static structure that manage the
+ * Declaration of the static structure that manage the 
  * external lock to COM  objects.
  */
@@ -83 +92 @@
 
 /*
- * Public Interface to the external lock list
+ * Public Interface to the external lock list   
  */
 static void COM_ExternalLockFreeList();
@@ -91 +100 @@
 
 /*
- * Private methods used to managed the linked list
+ * Private methods used to managed the linked list   
  */
 static BOOL COM_ExternalLockInsert(
@@ -153 +162 @@
  */
 typedef struct tagOpenDll {
-  HINSTANCE hLibrary;
+  HINSTANCE hLibrary;       
   struct tagOpenDll *next;
 } OpenDll;
@@ -164 +173 @@
  */
 static HRESULT COM_GetRegisteredClassObject(REFCLSID    rclsid,
-                        DWORD       dwClsContext,
-                        LPUNKNOWN*  ppUnk);
+                                            DWORD       dwClsContext,
+                                            LPUNKNOWN*  ppUnk);
 
 static void COM_RevokeAllClasses();
@@ -174 +183 @@
  *
  * RETURNS
- *  Current build version, hiword is majornumber, loword is minornumber
+ *      Current build version, hiword is majornumber, loword is minornumber
  */
 DWORD WINAPI CoBuildVersion(void)
@@ -184 +193 @@
 #ifndef __WIN32OS2__
 /******************************************************************************
- *      CoInitialize16  [COMPOBJ.2]
+ *              CoInitialize16  [COMPOBJ.2]
  * Set the win16 IMalloc used for memory management
  */
 HRESULT WINAPI CoInitialize16(
-    LPVOID lpReserved   /* [in] pointer to win16 malloc interface */
+        LPVOID lpReserved       /* [in] pointer to win16 malloc interface */
 ) {
     currentMalloc16 = (LPMALLOC16)lpReserved;
@@ -196 +205 @@
 
 /******************************************************************************
- *      CoInitialize    [OLE32.26]
+ *              CoInitialize    [OLE32.26]
  *
  * Initializes the COM libraries.
@@ -203 +212 @@
  */
 HRESULT WINAPI CoInitialize(
-    LPVOID lpReserved   /* [in] pointer to win32 malloc interface
+        LPVOID lpReserved       /* [in] pointer to win32 malloc interface
                                    (obsolete, should be NULL) */
-)
+) 
 {
   /*
@@ -214 +223 @@
 
 /******************************************************************************
- *      CoInitializeEx  [OLE32.163]
+ *              CoInitializeEx  [OLE32.163]
  *
  * Initializes the COM libraries. The behavior used to set the win32 IMalloc
@@ -226 +235 @@
  *
  * BUGS
- * Only the single threaded model is supported. As a result RPC_E_CHANGED_MODE
+ * Only the single threaded model is supported. As a result RPC_E_CHANGED_MODE 
  * is never returned.
  *
@@ -232 +241 @@
  */
 HRESULT WINAPI CoInitializeEx(
-    LPVOID lpReserved,  /* [in] pointer to win32 malloc interface
+        LPVOID lpReserved,      /* [in] pointer to win32 malloc interface
                                    (obsolete, should be NULL) */
-    DWORD dwCoInit      /* [in] A value from COINIT specifies the threading model */
-)
+        DWORD dwCoInit          /* [in] A value from COINIT specifies the threading model */
+) 
 {
   HRESULT hr;
@@ -249 +258 @@
    * Check for unsupported features.
    */
-  if (dwCoInit!=COINIT_APARTMENTTHREADED)
+  if (dwCoInit!=COINIT_APARTMENTTHREADED) 
   {
     FIXME(":(%p,%x): unsupported flag %x\n", lpReserved, (int)dwCoInit, (int)dwCoInit);
@@ -284 +293 @@
 /***********************************************************************
  *           CoUninitialize16   [COMPOBJ.3]
- * Don't know what it does.
+ * Don't know what it does. 
  * 3-Nov-98 -- this was originally misspelled, I changed it to what I
  *   believe is the correct spelling
@@ -305 +314 @@
 {
   TRACE("()\n");
-
+  
   /*
    * Decrease the reference count.
    */
   s_COMLockCount--;
-
+  
   /*
    * If we are back to 0 locks on the COM library, make sure we free
@@ -344 +353 @@
  *           CoGetMalloc16    [COMPOBJ.4]
  * RETURNS
- *  The current win16 IMalloc
+ *      The current win16 IMalloc
  */
 HRESULT WINAPI CoGetMalloc16(
-    DWORD dwMemContext, /* [in] unknown */
-    LPMALLOC16 * lpMalloc   /* [out] current win16 malloc interface */
+        DWORD dwMemContext,     /* [in] unknown */
+        LPMALLOC16 * lpMalloc   /* [out] current win16 malloc interface */
 ) {
     if(!currentMalloc16)
-    currentMalloc16 = IMalloc16_Constructor();
+        currentMalloc16 = IMalloc16_Constructor();
     *lpMalloc = currentMalloc16;
     return S_OK;
@@ -358 +367 @@
 
 /******************************************************************************
- *      CoGetMalloc [OLE32.20]
+ *              CoGetMalloc     [OLE32.20]
  *
  * RETURNS
- *  The current win32 IMalloc
+ *      The current win32 IMalloc
  */
 HRESULT WINAPI CoGetMalloc(
-    DWORD dwMemContext, /* [in] unknown */
-    LPMALLOC *lpMalloc  /* [out] current win32 malloc interface */
+        DWORD dwMemContext,     /* [in] unknown */
+        LPMALLOC *lpMalloc      /* [out] current win32 malloc interface */
 ) {
     if(!currentMalloc32)
-    currentMalloc32 = IMalloc_Constructor();
+        currentMalloc32 = IMalloc_Constructor();
     *lpMalloc = currentMalloc32;
     return S_OK;
@@ -378 +387 @@
  */
 HRESULT WINAPI CoCreateStandardMalloc16(DWORD dwMemContext,
-                      LPMALLOC16 *lpMalloc)
+                                          LPMALLOC16 *lpMalloc)
 {
     /* FIXME: docu says we shouldn't return the same allocator as in
@@ -387 +396 @@
 
 /******************************************************************************
- *      CoDisconnectObject  [COMPOBJ.15]
+ *              CoDisconnectObject      [COMPOBJ.15]
  */
 HRESULT WINAPI CoDisconnectObject( LPUNKNOWN lpUnk, DWORD reserved )
@@ -401 +410 @@
  *
  * RETURNS
- *  TRUE if equal
+ *      TRUE if equal
  */
 BOOL16 WINAPI IsEqualGUID16(
-    GUID* g1,   /* [in] unique id 1 */
-    GUID* g2    /* [in] unique id 2 */
+        GUID* g1,       /* [in] unique id 1 */
+        GUID* g2        /* [in] unique id 2 */
 ) {
     return !memcmp( g1, g2, sizeof(GUID) );
@@ -412 +421 @@
 
 /******************************************************************************
- *      CLSIDFromString16   [COMPOBJ.20]
- * Converts a unique identifier from its string representation into
+ *              CLSIDFromString16       [COMPOBJ.20]
+ * Converts a unique identifier from its string representation into 
  * the GUID struct.
  *
- * Class id: DWORD-WORD-WORD-BYTES[2]-BYTES[6]
+ * Class id: DWORD-WORD-WORD-BYTES[2]-BYTES[6] 
  *
  * RETURNS
- *  the converted GUID
+ *      the converted GUID
  */
 HRESULT WINAPI CLSIDFromString16(
-    LPCOLESTR16 idstr,  /* [in] string representation of guid */
-    CLSID *id       /* [out] GUID converted from string */
+        LPCOLESTR16 idstr,      /* [in] string representation of guid */
+        CLSID *id               /* [out] GUID converted from string */
 ) {
   BYTE *s = (BYTE *) idstr;
   BYTE *p;
-  int   i;
+  int   i;
   BYTE table[256];
 
   if (!s)
-      s = "{00000000-0000-0000-0000-000000000000}";
+          s = "{00000000-0000-0000-0000-000000000000}";
   else {  /* validate the CLSID string */
 
@@ -468 +477 @@
   p = (BYTE *) id;
 
-  s++;  /* skip leading brace  */
+  s++;  /* skip leading brace  */
   for (i = 0; i < 4; i++) {
     p[3 - i] = table[*s]<<4 | table[*(s+1)];
@@ -474 +483 @@
   }
   p += 4;
-  s++;  /* skip - */
+  s++;  /* skip - */
 
   for (i = 0; i < 2; i++) {
@@ -481 +490 @@
   }
   p += 2;
-  s++;  /* skip - */
+  s++;  /* skip - */
 
   for (i = 0; i < 2; i++) {
@@ -488 +497 @@
   }
   p += 2;
-  s++;  /* skip - */
+  s++;  /* skip - */
 
   /* these are just sequential bytes */
@@ -495 +504 @@
     s += 2;
   }
-  s++;  /* skip - */
+  s++;  /* skip - */
 
   for (i = 0; i < 6; i++) {
@@ -506 +515 @@
 
 /******************************************************************************
- *      CoCreateGuid[OLE32.6]
+ *              CoCreateGuid[OLE32.6]
  *
  */
 HRESULT WINAPI CoCreateGuid(
-    GUID *pguid /* [out] points to the GUID to initialize */
+        GUID *pguid /* [out] points to the GUID to initialize */
 ) {
     return UuidCreate(pguid);
@@ -516 +525 @@
 
 /******************************************************************************
- *      CLSIDFromString [OLE32.3]
- * Converts a unique identifier from its string representation into
+ *              CLSIDFromString [OLE32.3]
+ * Converts a unique identifier from its string representation into 
  * the GUID struct.
  *
@@ -524 +533 @@
  *
  * RETURNS
- *  the converted GUID
+ *      the converted GUID
  */
 HRESULT WINAPI CLSIDFromString(
-    LPCOLESTR idstr,    /* [in] string representation of GUID */
-    CLSID *id       /* [out] GUID represented by above string */
+        LPCOLESTR idstr,        /* [in] string representation of GUID */
+        CLSID *id               /* [out] GUID represented by above string */
 ) {
     LPOLESTR16      xid = HEAP_strdupWtoA(GetProcessHeap(),0,idstr);
@@ -541 +550 @@
 
 /******************************************************************************
- *      WINE_StringFromCLSID    [Internal]
+ *              WINE_StringFromCLSID    [Internal]
  * Converts a GUID into the respective string representation.
  *
@@ -547 +556 @@
  *
  * RETURNS
- *  the string representation and HRESULT
+ *      the string representation and HRESULT
  */
 #ifdef __WIN32OS2__
 HRESULT WINAPI WINE_StringFromCLSID(
-    const CLSID *id,    /* [in] GUID to be converted */
-    LPSTR idstr     /* [out] pointer to buffer to contain converted guid */
+        const CLSID *id,        /* [in] GUID to be converted */
+        LPSTR idstr             /* [out] pointer to buffer to contain converted guid */
 #else
 static HRESULT WINE_StringFromCLSID(
-    const CLSID *id,    /* [in] GUID to be converted */
-    LPSTR idstr     /* [out] pointer to buffer to contain converted guid */
+        const CLSID *id,        /* [in] GUID to be converted */
+        LPSTR idstr             /* [out] pointer to buffer to contain converted guid */
 #endif
 ) {
   static const char *hex = "0123456789ABCDEF";
   char *s;
-  int   i;
+  int   i;
 
   if (!id)
-    { ERR("called with id=Null\n");
-      *idstr = 0x00;
-      return E_FAIL;
-    }
-
+        { ERR("called with id=Null\n");
+          *idstr = 0x00;
+          return E_FAIL;
+        }
+        
   sprintf(idstr, "{%08lX-%04X-%04X-%02X%02X-",
-      id->Data1, id->Data2, id->Data3,
-      id->Data4[0], id->Data4[1]);
+          id->Data1, id->Data2, id->Data3,
+          id->Data4[0], id->Data4[1]);
   s = &idstr[25];
 
@@ -589 +598 @@
 #ifndef __WIN32OS2__
 /******************************************************************************
- *      StringFromCLSID16   [COMPOBJ.19]
+ *              StringFromCLSID16       [COMPOBJ.19]
  * Converts a GUID into the respective string representation.
  * The target string is allocated using the OLE IMalloc.
  * RETURNS
- *  the string representation and HRESULT
+ *      the string representation and HRESULT
  */
 HRESULT WINAPI StringFromCLSID16(
         REFCLSID id,            /* [in] the GUID to be converted */
-    LPOLESTR16 *idstr   /* [out] a pointer to a to-be-allocated segmented pointer pointing to the resulting string */
+        LPOLESTR16 *idstr       /* [out] a pointer to a to-be-allocated segmented pointer pointing to the resulting string */
 
 ) {
     extern BOOL WINAPI K32WOWCallback16Ex( DWORD vpfn16, DWORD dwFlags,
                                            DWORD cbArgs, LPVOID pArgs, LPDWORD pdwRetCode );
-    LPMALLOC16  mllc;
-    HRESULT ret;
-    DWORD   args[2];
+    LPMALLOC16  mllc;
+    HRESULT     ret;
+    DWORD       args[2];
 
     ret = CoGetMalloc16(0,&mllc);
@@ -616 +625 @@
      */
     if (!K32WOWCallback16Ex(
-        (DWORD)((ICOM_VTABLE(IMalloc16)*)MapSL(
+        (DWORD)((ICOM_VTABLE(IMalloc16)*)MapSL(
             (SEGPTR)ICOM_VTBL(((LPMALLOC16)MapSL((SEGPTR)mllc))))
-    )->Alloc,
-    WCB16_CDECL,
-    2*sizeof(DWORD),
-    (LPVOID)args,
-    (LPDWORD)idstr
+        )->Alloc,
+        WCB16_CDECL,
+        2*sizeof(DWORD),
+        (LPVOID)args,
+        (LPDWORD)idstr
     )) {
-        WARN("CallTo16 IMalloc16 failed\n");
-        return E_FAIL;
+        WARN("CallTo16 IMalloc16 failed\n");
+        return E_FAIL;
     }
     return WINE_StringFromCLSID(id,MapSL((SEGPTR)*idstr));
@@ -631 +640 @@
 #endif
 /******************************************************************************
- *      StringFromCLSID [OLE32.151]
+ *              StringFromCLSID [OLE32.151]
  * Converts a GUID into the respective string representation.
  * The target string is allocated using the OLE IMalloc.
  * RETURNS
- *  the string representation and HRESULT
+ *      the string representation and HRESULT
  */
 HRESULT WINAPI StringFromCLSID(
         REFCLSID id,            /* [in] the GUID to be converted */
-    LPOLESTR *idstr /* [out] a pointer to a to-be-allocated pointer pointing to the resulting string */
+        LPOLESTR *idstr /* [out] a pointer to a to-be-allocated pointer pointing to the resulting string */
 ) {
-    char            buf[80];
-    HRESULT       ret;
-    LPMALLOC    mllc;
-
-    if ((ret=CoGetMalloc(0,&mllc)))
-        return ret;
-
-    ret=WINE_StringFromCLSID(id,buf);
-    if (!ret) {
+        char            buf[80];
+        HRESULT       ret;
+        LPMALLOC        mllc;
+
+        if ((ret=CoGetMalloc(0,&mllc)))
+                return ret;
+
+        ret=WINE_StringFromCLSID(id,buf);
+        if (!ret) {
             DWORD len = MultiByteToWideChar( CP_ACP, 0, buf, -1, NULL, 0 );
             *idstr = IMalloc_Alloc( mllc, len * sizeof(WCHAR) );
             MultiByteToWideChar( CP_ACP, 0, buf, -1, *idstr, len );
-    }
-    return ret;
-}
-
-/******************************************************************************
- *      StringFromGUID2 [COMPOBJ.76] [OLE32.152]
+        }
+        return ret;
+}
+
+/******************************************************************************
+ *              StringFromGUID2 [COMPOBJ.76] [OLE32.152]
  *
  * Converts a global unique identifier into a string of an API-
@@ -664 +673 @@
  *
  * RETURNS
- *  The (UNICODE) string representation of the GUID in 'str'
- *  The length of the resulting string, 0 if there was any problem.
+ *      The (UNICODE) string representation of the GUID in 'str'
+ *      The length of the resulting string, 0 if there was any problem.
  */
 INT WINAPI
 StringFromGUID2(REFGUID id, LPOLESTR str, INT cmax)
 {
-  char      xguid[80];
+  char          xguid[80];
 
   if (WINE_StringFromCLSID(id,xguid))
-    return 0;
+        return 0;
   return MultiByteToWideChar( CP_ACP, 0, xguid, -1, str, cmax );
 }
@@ -730 +739 @@
 
 /******************************************************************************
- *      CLSIDFromProgID16   [COMPOBJ.61]
+ *              CLSIDFromProgID16       [COMPOBJ.61]
  * Converts a program id into the respective GUID. (By using a registry lookup)
  * RETURNS
- *  riid associated with the progid
+ *      riid associated with the progid
  */
 HRESULT WINAPI CLSIDFromProgID16(
-    LPCOLESTR16 progid, /* [in] program id as found in registry */
-    LPCLSID riid        /* [out] associated CLSID */
+        LPCOLESTR16 progid,     /* [in] program id as found in registry */
+        LPCLSID riid            /* [out] associated CLSID */
 ) {
-    char    *buf,buf2[80];
-    DWORD   buf2len;
-    HRESULT err;
-    HKEY    xhkey;
-
-    buf = HeapAlloc(GetProcessHeap(),0,strlen(progid)+8);
-    sprintf(buf,"%s\\CLSID",progid);
-    if ((err=RegOpenKeyA(HKEY_CLASSES_ROOT,buf,&xhkey))) {
-        HeapFree(GetProcessHeap(),0,buf);
+        char    *buf,buf2[80];
+        DWORD   buf2len;
+        HRESULT err;
+        HKEY    xhkey;
+
+        buf = HeapAlloc(GetProcessHeap(),0,strlen(progid)+8);
+        sprintf(buf,"%s\\CLSID",progid);
+        if ((err=RegOpenKeyA(HKEY_CLASSES_ROOT,buf,&xhkey))) {
+                HeapFree(GetProcessHeap(),0,buf);
                 return CO_E_CLASSSTRING;
-    }
-    HeapFree(GetProcessHeap(),0,buf);
-    buf2len = sizeof(buf2);
-    if ((err=RegQueryValueA(xhkey,NULL,buf2,&buf2len))) {
-        RegCloseKey(xhkey);
+        }
+        HeapFree(GetProcessHeap(),0,buf);
+        buf2len = sizeof(buf2);
+        if ((err=RegQueryValueA(xhkey,NULL,buf2,&buf2len))) {
+                RegCloseKey(xhkey);
                 return CO_E_CLASSSTRING;
-    }
-    RegCloseKey(xhkey);
-    return CLSIDFromString16(buf2,riid);
-}
-
-/******************************************************************************
- *      CLSIDFromProgID [OLE32.2]
+        }
+        RegCloseKey(xhkey);
+        return CLSIDFromString16(buf2,riid);
+}
+
+/******************************************************************************
+ *              CLSIDFromProgID [OLE32.2]
  * Converts a program id into the respective GUID. (By using a registry lookup)
  * RETURNS
- *  riid associated with the progid
+ *      riid associated with the progid
  */
 HRESULT WINAPI CLSIDFromProgID(
-    LPCOLESTR progid,   /* [in] program id as found in registry */
-    LPCLSID riid        /* [out] associated CLSID */
+        LPCOLESTR progid,       /* [in] program id as found in registry */
+        LPCLSID riid            /* [out] associated CLSID */
 ) {
-    LPOLESTR16 pid = HEAP_strdupWtoA(GetProcessHeap(),0,progid);
-    HRESULT       ret = CLSIDFromProgID16(pid,riid);
-
-    HeapFree(GetProcessHeap(),0,pid);
-    return ret;
+        LPOLESTR16 pid = HEAP_strdupWtoA(GetProcessHeap(),0,progid);
+        HRESULT       ret = CLSIDFromProgID16(pid,riid);
+
+        HeapFree(GetProcessHeap(),0,pid);
+        return ret;
 }
 
@@ -783 +792 @@
  *
  * This function returns the CLSID of the DLL that implements the proxy and stub
- * for the specified interface.
- *
- * It determines this by searching the
+ * for the specified interface. 
+ *
+ * It determines this by searching the 
  * HKEY_CLASSES_ROOT\Interface\{string form of riid}\ProxyStubClsid32 in the registry
  * and any interface id registered by CoRegisterPSClsid within the current process.
- *
+ * 
  * FIXME: We only search the registry, not ids registered with CoRegisterPSClsid.
  */
@@ -823 +832 @@
 
     /* ... Once we have the key, query the registry to get the
-       value of CLSID as a string, and convert it into a
+       value of CLSID as a string, and convert it into a 
        proper CLSID structure to be passed back to the app */
     buf2len = sizeof(buf2);
@@ -847 +856 @@
 
 /***********************************************************************
- *      WriteClassStm
+ *              WriteClassStm
  *
  * This function write a CLSID on stream
@@ -862 +871 @@
 
 /***********************************************************************
- *      ReadClassStm
+ *              ReadClassStm
  *
  * This function read a CLSID from a stream
@@ -870 +879 @@
     ULONG nbByte;
     HRESULT res;
-
+    
     TRACE("(%p,%p)\n",pStm,rclsid);
 
     if (rclsid==NULL)
         return E_INVALIDARG;
-
+    
     res = IStream_Read(pStm,(void*)rclsid,sizeof(CLSID),&nbByte);
 
     if (FAILED(res))
         return res;
-
+    
     if (nbByte != sizeof(CLSID))
         return S_FALSE;
@@ -893 +902 @@
  */
 HRESULT WINAPI LookupETask16(HTASK16 *hTask,LPVOID p) {
-    FIXME("(%p,%p),stub!\n",hTask,p);
-    if ((*hTask = GetCurrentTask()) == hETask) {
-        memcpy(p, Table_ETask, sizeof(Table_ETask));
-    }
-    return 0;
+        FIXME("(%p,%p),stub!\n",hTask,p);
+        if ((*hTask = GetCurrentTask()) == hETask) {
+                memcpy(p, Table_ETask, sizeof(Table_ETask));
+        }
+        return 0;
 }
 
@@ -906 +915 @@
 HRESULT WINAPI SetETask16(HTASK16 hTask, LPVOID p) {
         FIXME("(%04x,%p),stub!\n",hTask,p);
-    hETask = hTask;
-    return 0;
+        hETask = hTask;
+        return 0;
 }
 
@@ -915 +924 @@
  */
 HRESULT WINAPI CallObjectInWOW(LPVOID p1,LPVOID p2) {
-    FIXME("(%p,%p),stub!\n",p1,p2);
-    return 0;
-}
-
-/******************************************************************************
- *      CoRegisterClassObject16 [COMPOBJ.5]
+        FIXME("(%p,%p),stub!\n",p1,p2);
+        return 0;
+}
+
+/******************************************************************************
+ *              CoRegisterClassObject16 [COMPOBJ.5]
  *
  * Don't know where it registers it ...
  */
 HRESULT WINAPI CoRegisterClassObject16(
-    REFCLSID rclsid,
-    LPUNKNOWN pUnk,
-    DWORD dwClsContext, /* [in] CLSCTX flags indicating the context in which to run the executable */
-    DWORD flags,        /* [in] REGCLS flags indicating how connections are made */
-    LPDWORD lpdwRegister
+        REFCLSID rclsid,
+        LPUNKNOWN pUnk,
+        DWORD dwClsContext, /* [in] CLSCTX flags indicating the context in which to run the executable */
+        DWORD flags,        /* [in] REGCLS flags indicating how connections are made */
+        LPDWORD lpdwRegister
 ) {
-    char    buf[80];
-
-    WINE_StringFromCLSID(rclsid,buf);
-
-    FIXME("(%s,%p,0x%08lx,0x%08lx,%p),stub\n",
-        buf,pUnk,dwClsContext,flags,lpdwRegister
-    );
-    return 0;
+        char    buf[80];
+
+        WINE_StringFromCLSID(rclsid,buf);
+
+        FIXME("(%s,%p,0x%08lx,0x%08lx,%p),stub\n",
+                buf,pUnk,dwClsContext,flags,lpdwRegister
+        );
+        return 0;
 }
 
@@ -957 +966 @@
  * COM_GetRegisteredClassObject
  *
- * This internal method is used to scan the registered class list to
+ * This internal method is used to scan the registered class list to 
  * find a class object.
  *
- * Params:
+ * Params: 
  *   rclsid        Class ID of the class to find.
  *   dwClsContext  Class context to match.
@@ -968 +977 @@
  */
 static HRESULT COM_GetRegisteredClassObject(
-    REFCLSID    rclsid,
-    DWORD       dwClsContext,
-    LPUNKNOWN*  ppUnk)
+        REFCLSID    rclsid,
+        DWORD       dwClsContext,
+        LPUNKNOWN*  ppUnk)
 {
   RegisteredClass* curClass;
@@ -1019 +1028 @@
 
 /******************************************************************************
- *      CoRegisterClassObject   [OLE32.36]
+ *              CoRegisterClassObject   [OLE32.36]
  *
  * This method will register the class object for a given class ID.
@@ -1026 +1035 @@
  */
 HRESULT WINAPI CoRegisterClassObject(
-    REFCLSID rclsid,
-    LPUNKNOWN pUnk,
-    DWORD dwClsContext, /* [in] CLSCTX flags indicating the context in which to run the executable */
-    DWORD flags,        /* [in] REGCLS flags indicating how connections are made */
-    LPDWORD lpdwRegister
-)
+        REFCLSID rclsid,
+        LPUNKNOWN pUnk,
+        DWORD dwClsContext, /* [in] CLSCTX flags indicating the context in which to run the executable */
+        DWORD flags,        /* [in] REGCLS flags indicating how connections are made */
+        LPDWORD lpdwRegister
+) 
 {
   RegisteredClass* newClass;
@@ -1041 +1050 @@
 
   TRACE("(%s,%p,0x%08lx,0x%08lx,%p)\n",
-    buf,pUnk,dwClsContext,flags,lpdwRegister);
+        buf,pUnk,dwClsContext,flags,lpdwRegister);
 
   /*
@@ -1072 +1081 @@
     return CO_E_OBJISREG;
   }
-
+    
   /*
    * If it is not registered, we must create a new entry for this class and
@@ -1103 +1112 @@
    */
   *lpdwRegister = newClass->dwCookie;
-
+    
   /*
    * We're successful Yippee!
@@ -1118 +1127 @@
  */
 HRESULT WINAPI CoRevokeClassObject(
-        DWORD dwRegister)
+        DWORD dwRegister) 
 {
   RegisteredClass** prevClassLink;
@@ -1176 +1185 @@
     REFIID iid, LPVOID *ppv
 ) {
-    LPUNKNOWN   regClassObject;
-    HRESULT hres = E_UNEXPECTED;
-    char    xclsid[80];
+    LPUNKNOWN   regClassObject;
+    HRESULT     hres = E_UNEXPECTED;
+    char        xclsid[80];
     WCHAR dllName[MAX_PATH+1];
     DWORD dllNameLen = sizeof(dllName);
     HINSTANCE hLibrary;
 #ifdef __WIN32OS2__
-    typedef HRESULT (* CALLBACK DllGetClassObjectFunc)(REFCLSID clsid,
-                 REFIID iid, LPVOID *ppv);
+    typedef HRESULT (* CALLBACK DllGetClassObjectFunc)(REFCLSID clsid, 
+                             REFIID iid, LPVOID *ppv);
 #else
-    typedef HRESULT CALLBACK (*DllGetClassObjectFunc)(REFCLSID clsid,
-                 REFIID iid, LPVOID *ppv);
+    typedef HRESULT CALLBACK (*DllGetClassObjectFunc)(REFCLSID clsid, 
+                             REFIID iid, LPVOID *ppv);
 #endif
     DllGetClassObjectFunc DllGetClassObject;
@@ -1194 +1203 @@
 
     TRACE("\n\tCLSID:\t%s,\n\tIID:\t%s\n",
-    debugstr_guid(rclsid),
-    debugstr_guid(iid)
+        debugstr_guid(rclsid),
+        debugstr_guid(iid)
     );
 
     if (pServerInfo) {
-    FIXME("\tpServerInfo: name=%s\n",debugstr_w(pServerInfo->pwszName));
-    FIXME("\t\tpAuthInfo=%p\n",pServerInfo->pAuthInfo);
+        FIXME("\tpServerInfo: name=%s\n",debugstr_w(pServerInfo->pwszName));
+        FIXME("\t\tpAuthInfo=%p\n",pServerInfo->pAuthInfo);
     }
 
     /*
-     * First, try and see if we can't match the class ID with one of the
+     * First, try and see if we can't match the class ID with one of the 
      * registered classes.
      */
@@ -1229 +1238 @@
     ){
         FIXME("%s %s not supported!\n",
-        (dwClsContext&CLSCTX_LOCAL_SERVER)?"CLSCTX_LOCAL_SERVER":"",
-        (dwClsContext&CLSCTX_REMOTE_SERVER)?"CLSCTX_REMOTE_SERVER":""
-    );
-    return E_ACCESSDENIED;
+                (dwClsContext&CLSCTX_LOCAL_SERVER)?"CLSCTX_LOCAL_SERVER":"",
+                (dwClsContext&CLSCTX_REMOTE_SERVER)?"CLSCTX_REMOTE_SERVER":""
+        );
+        return E_ACCESSDENIED;
     }
 
     if ((CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER) & dwClsContext) {
         HKEY key;
-    char buf[200];
-
-    sprintf(buf,"CLSID\\%s\\InprocServer32",xclsid);
+        char buf[200];
+
+        sprintf(buf,"CLSID\\%s\\InprocServer32",xclsid);
         hres = RegOpenKeyExA(HKEY_CLASSES_ROOT, buf, 0, KEY_READ, &key);
 
-    if (hres != ERROR_SUCCESS) {
-        return REGDB_E_CLASSNOTREG;
-    }
-
-    memset(dllName,0,sizeof(dllName));
-    hres= RegQueryValueExW(key,NULL,NULL,NULL,(LPBYTE)dllName,&dllNameLen);
-    if (hres)
-        return REGDB_E_CLASSNOTREG; /* FIXME: check retval */
-    RegCloseKey(key);
-    TRACE("found InprocServer32 dll %s\n", debugstr_w(dllName));
-
-    /* open dll, call DllGetClassObject */
-    hLibrary = CoLoadLibrary(dllName, TRUE);
-    if (hLibrary == 0) {
-        FIXME("couldn't load InprocServer32 dll %s\n", debugstr_w(dllName));
-        return E_ACCESSDENIED; /* or should this be CO_E_DLLNOTFOUND? */
-    }
-    DllGetClassObject = (DllGetClassObjectFunc)GetProcAddress(hLibrary, "DllGetClassObject");
-    if (!DllGetClassObject) {
-        /* not sure if this should be called here CoFreeLibrary(hLibrary);*/
-        FIXME("couldn't find function DllGetClassObject in %s\n", debugstr_w(dllName));
-        return E_ACCESSDENIED;
-    }
-
-    /*
-     * Ask the DLL for its class object. (there was a note here about class
-     * factories but this is good.
-     */
-    return DllGetClassObject(rclsid, iid, ppv);
+        if (hres != ERROR_SUCCESS) {
+            return REGDB_E_CLASSNOTREG;
+        }
+
+        memset(dllName,0,sizeof(dllName));
+        hres= RegQueryValueExW(key,NULL,NULL,NULL,(LPBYTE)dllName,&dllNameLen);
+        if (hres)
+                return REGDB_E_CLASSNOTREG; /* FIXME: check retval */
+        RegCloseKey(key);
+        TRACE("found InprocServer32 dll %s\n", debugstr_w(dllName));
+
+        /* open dll, call DllGetClassObject */
+        hLibrary = CoLoadLibrary(dllName, TRUE);
+        if (hLibrary == 0) {
+            FIXME("couldn't load InprocServer32 dll %s\n", debugstr_w(dllName));
+            return E_ACCESSDENIED; /* or should this be CO_E_DLLNOTFOUND? */
+        }
+        DllGetClassObject = (DllGetClassObjectFunc)GetProcAddress(hLibrary, "DllGetClassObject");
+        if (!DllGetClassObject) {
+            /* not sure if this should be called here CoFreeLibrary(hLibrary);*/
+            FIXME("couldn't find function DllGetClassObject in %s\n", debugstr_w(dllName));
+            return E_ACCESSDENIED;
+        }
+
+        /*
+         * Ask the DLL for its class object. (there was a note here about class
+         * factories but this is good.
+         */
+        return DllGetClassObject(rclsid, iid, ppv);
     }
     return hres;
@@ -1282 +1291 @@
 HRESULT WINAPI CoResumeClassObjects(void)
 {
-    FIXME("\n");
-    return S_OK;
+        FIXME("\n");
+        return S_OK;
 }
 
@@ -1317 +1326 @@
        pattern in the registry. this case is not frequently used ! so I present only the psodocode for
        this case
-
+       
      for(i=0;i<nFileTypes;i++)
 
@@ -1350 +1359 @@
     length=lstrlenW(absFile);
     for(i=length-1; ( (i>=0) && (extention[i]=absFile[i]) );i--);
-
+        
     /* get the progId associated to the extension */
     progId=CoTaskMemAlloc(sizeProgId);
@@ -1378 +1387 @@
 #ifndef __WIN32OS2__
 /******************************************************************************
- *      CoRegisterMessageFilter16   [COMPOBJ.27]
+ *              CoRegisterMessageFilter16       [COMPOBJ.27]
  */
 HRESULT WINAPI CoRegisterMessageFilter16(
-    LPMESSAGEFILTER lpMessageFilter,
-    LPMESSAGEFILTER *lplpMessageFilter
+        LPMESSAGEFILTER lpMessageFilter,
+        LPMESSAGEFILTER *lplpMessageFilter
 ) {
-    FIXME("(%p,%p),stub!\n",lpMessageFilter,lplpMessageFilter);
-    return 0;
+        FIXME("(%p,%p),stub!\n",lpMessageFilter,lplpMessageFilter);
+        return 0;
 }
 #endif
@@ -1393 +1402 @@
  */
 HRESULT WINAPI CoCreateInstance(
-    REFCLSID rclsid,
-    LPUNKNOWN pUnkOuter,
-    DWORD dwClsContext,
-    REFIID iid,
-    LPVOID *ppv)
-{
-    HRESULT hres;
-    LPCLASSFACTORY lpclf = 0;
+        REFCLSID rclsid,
+        LPUNKNOWN pUnkOuter,
+        DWORD dwClsContext,
+        REFIID iid,
+        LPVOID *ppv) 
+{
+        HRESULT hres;
+        LPCLASSFACTORY lpclf = 0;
 
   /*
@@ -1412 +1421 @@
    */
   *ppv = 0;
-
+  
   /*
    * Get a class factory to construct the object we want.
    */
   hres = CoGetClassObject(rclsid,
-              dwClsContext,
-              NULL,
-              &IID_IClassFactory,
-              (LPVOID)&lpclf);
+                          dwClsContext,
+                          NULL,
+                          &IID_IClassFactory,
+                          (LPVOID)&lpclf);
 
   if (FAILED(hres)) {
@@ -1430 +1439 @@
    * Create the object and don't forget to release the factory
    */
-    hres = IClassFactory_CreateInstance(lpclf, pUnkOuter, iid, ppv);
-    IClassFactory_Release(lpclf);
-
-    return hres;
+        hres = IClassFactory_CreateInstance(lpclf, pUnkOuter, iid, ppv);
+        IClassFactory_Release(lpclf);
+
+        return hres;
 }
 
@@ -1440 +1449 @@
  */
 HRESULT WINAPI CoCreateInstanceEx(
-  REFCLSID      rclsid,
+  REFCLSID      rclsid, 
   LPUNKNOWN     pUnkOuter,
-  DWORD         dwClsContext,
+  DWORD         dwClsContext, 
   COSERVERINFO* pServerInfo,
   ULONG         cmq,
@@ -1473 +1482 @@
    * Get the object and get its IUnknown pointer.
    */
-  hr = CoCreateInstance(rclsid,
-            pUnkOuter,
-            dwClsContext,
-            &IID_IUnknown,
-            (VOID**)&pUnk);
+  hr = CoCreateInstance(rclsid, 
+                        pUnkOuter,
+                        dwClsContext,
+                        &IID_IUnknown,
+                        (VOID**)&pUnk);
 
   if (hr)
@@ -1488 +1497 @@
   {
     pResults[index].hr = IUnknown_QueryInterface(pUnk,
-                         pResults[index].pIID,
-                         (VOID**)&(pResults[index].pItf));
+                                                 pResults[index].pIID,
+                                                 (VOID**)&(pResults[index].pItf));
 
     if (pResults[index].hr == S_OK)
@@ -1520 +1529 @@
     prev = NULL;
     for (ptr = openDllList; ptr != NULL; ptr=ptr->next) {
-    if (ptr->hLibrary == hLibrary) {
-        break;
-    }
-    prev = ptr;
+        if (ptr->hLibrary == hLibrary) {
+            break;
+        }
+        prev = ptr;
     }
 
     if (ptr == NULL) {
-    /* shouldn't happen if user passed in a valid hLibrary */
-    return;
+        /* shouldn't happen if user passed in a valid hLibrary */
+        return;
     }
     /* assert: ptr points to the library entry to free */
@@ -1535 +1544 @@
     FreeLibrary(hLibrary);
     if (ptr == openDllList) {
-    tmp = openDllList->next;
-    HeapFree(GetProcessHeap(), 0, openDllList);
-    openDllList = tmp;
+        tmp = openDllList->next;
+        HeapFree(GetProcessHeap(), 0, openDllList);
+        openDllList = tmp;
     } else {
-    tmp = ptr->next;
-    HeapFree(GetProcessHeap(), 0, ptr);
-    prev->next = tmp;
+        tmp = ptr->next;
+        HeapFree(GetProcessHeap(), 0, ptr);
+        prev->next = tmp;
     }
 
@@ -1555 +1564 @@
 
     for (ptr = openDllList; ptr != NULL; ) {
-    tmp=ptr->next;
-    CoFreeLibrary(ptr->hLibrary);
-    ptr = tmp;
+        tmp=ptr->next;
+        CoFreeLibrary(ptr->hLibrary);
+        ptr = tmp;
     }
 }
@@ -1573 +1582 @@
 
     for (ptr = openDllList; ptr != NULL; ) {
-    DllCanUnloadNow = (DllCanUnloadNowFunc)
-        GetProcAddress(ptr->hLibrary, "DllCanUnloadNow");
-
-    if ( (DllCanUnloadNow != NULL) &&
-         (DllCanUnloadNow() == S_OK) ) {
-        tmp=ptr->next;
-        CoFreeLibrary(ptr->hLibrary);
-        ptr = tmp;
-    } else {
-        ptr=ptr->next;
-    }
+        DllCanUnloadNow = (DllCanUnloadNowFunc)
+            GetProcAddress(ptr->hLibrary, "DllCanUnloadNow");
+        
+        if ( (DllCanUnloadNow != NULL) &&
+             (DllCanUnloadNow() == S_OK) ) {
+            tmp=ptr->next;
+            CoFreeLibrary(ptr->hLibrary);
+            ptr = tmp;
+        } else {
+            ptr=ptr->next;
+        }
     }
 }
@@ -1590 +1599 @@
  *           CoFileTimeNow [COMPOBJ.82, OLE32.10]
  * RETURNS
- *  the current system time in lpFileTime
+ *      the current system time in lpFileTime
  */
 HRESULT WINAPI CoFileTimeNow( FILETIME *lpFileTime ) /* [out] the current time */
@@ -1601 +1610 @@
  *           CoTaskMemAlloc (OLE32.43)
  * RETURNS
- *  pointer to newly allocated block
+ *      pointer to newly allocated block
  */
 LPVOID WINAPI CoTaskMemAlloc(
-    ULONG size  /* [in] size of memoryblock to be allocated */
+        ULONG size      /* [in] size of memoryblock to be allocated */
 ) {
-    LPMALLOC    lpmalloc;
-    HRESULT ret = CoGetMalloc(0,&lpmalloc);
-
-    if (FAILED(ret))
-    return NULL;
+    LPMALLOC    lpmalloc;
+    HRESULT     ret = CoGetMalloc(0,&lpmalloc);
+
+    if (FAILED(ret)) 
+        return NULL;
 
     return IMalloc_Alloc(lpmalloc,size);
@@ -1618 +1627 @@
  */
 VOID WINAPI CoTaskMemFree(
-    LPVOID ptr  /* [in] pointer to be freed */
+        LPVOID ptr      /* [in] pointer to be freed */
 ) {
-    LPMALLOC    lpmalloc;
-    HRESULT ret = CoGetMalloc(0,&lpmalloc);
-
-    if (FAILED(ret))
+    LPMALLOC    lpmalloc;
+    HRESULT     ret = CoGetMalloc(0,&lpmalloc);
+
+    if (FAILED(ret)) 
       return;
 
@@ -1632 +1641 @@
  *           CoTaskMemRealloc (OLE32.45)
  * RETURNS
- *  pointer to newly allocated block
+ *      pointer to newly allocated block
  */
 LPVOID WINAPI CoTaskMemRealloc(
   LPVOID pvOld,
-  ULONG  size)  /* [in] size of memoryblock to be allocated */
+  ULONG  size)  /* [in] size of memoryblock to be allocated */
 {
   LPMALLOC lpmalloc;
   HRESULT  ret = CoGetMalloc(0,&lpmalloc);
-
-  if (FAILED(ret))
+  
+  if (FAILED(ret)) 
     return NULL;
 
@@ -1655 +1664 @@
     OpenDll *ptr;
     OpenDll *tmp;
-
+  
     TRACE("(%s, %d)\n", debugstr_w(lpszLibName), bAutoFree);
 
@@ -1661 +1670 @@
 
     if (!bAutoFree)
-    return hLibrary;
+        return hLibrary;
 
     if (openDllList == NULL) {
         /* empty list -- add first node */
         openDllList = (OpenDll*)HeapAlloc(GetProcessHeap(),0, sizeof(OpenDll));
-    openDllList->hLibrary=hLibrary;
-    openDllList->next = NULL;
+        openDllList->hLibrary=hLibrary;
+        openDllList->next = NULL;
     } else {
         /* search for this dll */
         int found = FALSE;
         for (ptr = openDllList; ptr->next != NULL; ptr=ptr->next) {
-        if (ptr->hLibrary == hLibrary) {
-            found = TRUE;
-        break;
+            if (ptr->hLibrary == hLibrary) {
+                found = TRUE;
+                break;
+            }
         }
-        }
-    if (!found) {
-        /* dll not found, add it */
-        tmp = openDllList;
-        openDllList = (OpenDll*)HeapAlloc(GetProcessHeap(),0, sizeof(OpenDll));
-        openDllList->hLibrary = hLibrary;
-        openDllList->next = tmp;
-    }
-    }
-
+        if (!found) {
+            /* dll not found, add it */
+            tmp = openDllList;
+            openDllList = (OpenDll*)HeapAlloc(GetProcessHeap(),0, sizeof(OpenDll));
+            openDllList->hLibrary = hLibrary;
+            openDllList->next = tmp;
+        }
+    }
+     
     return hLibrary;
 }
@@ -1699 +1708 @@
 #ifndef __WIN32OS2__
 /******************************************************************************
- *      CoLockObjectExternal16  [COMPOBJ.63]
+ *              CoLockObjectExternal16  [COMPOBJ.63]
  */
 HRESULT WINAPI CoLockObjectExternal16(
-    LPUNKNOWN pUnk,     /* [in] object to be locked */
-    BOOL16 fLock,       /* [in] do lock */
-    BOOL16 fLastUnlockReleases  /* [in] ? */
+    LPUNKNOWN pUnk,             /* [in] object to be locked */
+    BOOL16 fLock,               /* [in] do lock */
+    BOOL16 fLastUnlockReleases  /* [in] ? */
 ) {
     FIXME("(%p,%d,%d),stub!\n",pUnk,fLock,fLastUnlockReleases);
@@ -1712 +1721 @@
 
 /******************************************************************************
- *      CoLockObjectExternal    [OLE32.31]
+ *              CoLockObjectExternal    [OLE32.31]
  */
 HRESULT WINAPI CoLockObjectExternal(
-    LPUNKNOWN pUnk,     /* [in] object to be locked */
-    BOOL fLock,     /* [in] do lock */
+    LPUNKNOWN pUnk,             /* [in] object to be locked */
+    BOOL fLock,         /* [in] do lock */
     BOOL fLastUnlockReleases) /* [in] unlock all */
 {
 
-  if (fLock)
+  if (fLock) 
   {
-    /*
+    /* 
      * Increment the external lock coutner, COM_ExternalLockAddRef also
      * increment the object's internal lock counter.
      */
-    COM_ExternalLockAddRef( pUnk);
+    COM_ExternalLockAddRef( pUnk); 
   }
   else
   {
-    /*
+    /* 
      * Decrement the external lock coutner, COM_ExternalLockRelease also
      * decrement the object's internal lock counter.
@@ -1766 +1775 @@
 {
    FIXME ("(%p %p): stub\n", punkOuter, ppunkMarshal);
-
+    
    return S_OK;
 }
@@ -1775 +1784 @@
  */
 HRESULT WINAPI OLE32_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv)
-{
-    FIXME("\n\tCLSID:\t%s,\n\tIID:\t%s\n",debugstr_guid(rclsid),debugstr_guid(iid));
-    *ppv = NULL;
-    return CLASS_E_CLASSNOTAVAILABLE;
+{       
+        FIXME("\n\tCLSID:\t%s,\n\tIID:\t%s\n",debugstr_guid(rclsid),debugstr_guid(iid));
+        *ppv = NULL;
+        return CLASS_E_CLASSNOTAVAILABLE;
 }
 
@@ -1785 +1794 @@
  * COM_RevokeAllClasses
  *
- * This method is called when the COM libraries are uninitialized to
+ * This method is called when the COM libraries are uninitialized to 
  * release all the references to the class objects registered with
  * the library
@@ -1802 +1811 @@
 
 /****************************************************************************
- * Public - Method that increments the count for a IUnknown* in the linked
+ * Public - Method that increments the count for a IUnknown* in the linked 
  * list.  The item is inserted if not already in the list.
  */
@@ -1823 +1832 @@
    * Add an internal lock to the object
    */
-  IUnknown_AddRef(pUnk);
+  IUnknown_AddRef(pUnk); 
 }
 
 /****************************************************************************
- * Public - Method that decrements the count for a IUnknown* in the linked
+ * Public - Method that decrements the count for a IUnknown* in the linked 
  * list.  The item is removed from the list if its count end up at zero or if
  * bRelAll is TRUE.
@@ -1844 +1853 @@
       IUnknown_Release(pUnk);     /* release local locks as well */
 
-      if ( bRelAll == FALSE )
+      if ( bRelAll == FALSE ) 
         break;  /* perform single release */
 
-    } while ( externalLock->uRefCount > 0 );
+    } while ( externalLock->uRefCount > 0 );  
 
     if ( externalLock->uRefCount == 0 )  /* get rid of the list entry */
@@ -1865 +1874 @@
     COM_ExternalLockDelete(head);     /* get rid of the head stuff       */
 
-    head = elList.head;               /* get the new head...             */
+    head = elList.head;               /* get the new head...             */ 
   }
 }
@@ -1881 +1890 @@
   {
       DPRINTF( "\t%p with %lu references count.\n", current->pUnk, current->uRefCount);
-
-    /* Skip to the next item */
+ 
+    /* Skip to the next item */ 
     current = current->next;
-  }
+  } 
 
 }
@@ -1904 +1913 @@
   IUnknown         *pUnk)
 {
-  if ( element == EL_END_OF_LIST )
+  if ( element == EL_END_OF_LIST )  
     return EL_NOT_FOUND;
 
@@ -1910 +1919 @@
     return element;
 
-  else                                 /* Not the right guy, keep on looking */
+  else                                 /* Not the right guy, keep on looking */ 
     return COM_ExternalLockLocate( element->next, pUnk);
 }
@@ -1930 +1939 @@
   if (newLock!=NULL)
   {
-    if ( elList.head == EL_END_OF_LIST )
+    if ( elList.head == EL_END_OF_LIST ) 
     {
       elList.head = newLock;    /* The list is empty */
     }
-    else
+    else 
     {
-      /*
+      /* 
        * insert does it at the head
        */
@@ -1944 +1953 @@
 
     /*
-     * Set new list item data member
+     * Set new list item data member 
      */
     newLock->pUnk      = pUnk;
     newLock->uRefCount = 1;
     newLock->next      = previousHead;
-
+    
     return TRUE;
   }
@@ -1966 +1975 @@
   if ( current == itemList )
   {
-    /*
-     * this section handles the deletion of the first node
+    /* 
+     * this section handles the deletion of the first node 
      */
     elList.head = itemList->next;
-    HeapFree( GetProcessHeap(), 0, itemList);
+    HeapFree( GetProcessHeap(), 0, itemList);  
   }
   else
   {
-    do
+    do 
     {
       if ( current->next == itemList )   /* We found the item to free  */
       {
         current->next = itemList->next;  /* readjust the list pointers */
-
-        HeapFree( GetProcessHeap(), 0, itemList);
-        break;
+  
+        HeapFree( GetProcessHeap(), 0, itemList);  
+        break; 
       }
-
-      /* Skip to the next item */
+ 
+      /* Skip to the next item */ 
       current = current->next;
-
+  
     } while ( current != EL_END_OF_LIST );
   }
@@ -2032 +2041 @@
     {
         res = REGDB_E_CLASSNOTREG;
-    goto done;
+        goto done;
     }
     len = 200;
@@ -2040 +2049 @@
     {
         res = REGDB_E_KEYMISSING;
-    goto done;
+        goto done;
     }
     MultiByteToWideChar( CP_ACP, 0, buf, -1, wbuf, sizeof(wbuf)/sizeof(WCHAR) );
@@ -2065 +2074 @@
     {
         res = REGDB_E_CLASSNOTREG;
-    goto done;
+        goto done;
     }
     if (RegCreateKeyA(hkey, "AutoConvertTo", &hkeyConvert))
     {
         res = REGDB_E_WRITEREGDB;
-    goto done;
+        goto done;
     }
     if (RegSetValueExA(hkeyConvert, NULL, 0,
@@ -2076 +2085 @@
     {
         res = REGDB_E_WRITEREGDB;
-    goto done;
+        goto done;
     }
 
@@ -2092 +2101 @@
  *
  * RETURNS
- *  TRUE if equal
+ *      TRUE if equal
  */
 #undef IsEqualGUID
@@ -2111 +2120 @@
 
 HRESULT WIN32API CLSIDFromStringA(
-    LPCSTR      lpsz,       // [in] - ASCII string CLSID
-    LPCLSID     pclsid)     // [out] - Binary CLSID
+    LPCSTR              lpsz,           // [in] - ASCII string CLSID
+    LPCLSID             pclsid)         // [out] - Binary CLSID
 {
     return CLSIDFromString16(lpsz, pclsid);

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)

trunk/src/ole32/datacache.c

@@ -1 @@
-/* $Id: datacache.c,v 1.2 2001-09-05 13:17:08 bird Exp $ */
 /*
- *  OLE 2 Data cache
+ *      OLE 2 Data cache
  *
  *      Copyright 1999  Francis Beaudet
@@ -18 +17 @@
  *  -  This implementation of the datacache will let your application
  *     load documents that have embedded OLE objects in them and it will
- *     also retrieve the metafile representation of those objects.
+ *     also retrieve the metafile representation of those objects. 
  *  -  This implementation of the datacache will also allow your
  *     application to save new documents with OLE objects in them.
- *  -  The main thing that it doesn't do is allow you to activate
+ *  -  The main thing that it doesn't do is allow you to activate 
  *     or modify the OLE objects in any way.
  *  -  I haven't found any good documentation on the real usage of
@@ -28 +27 @@
  *     "\002OlePresXXX". It appears to just be a counter.
  *  -  Also, I don't know the real content of the presentation stream
- *     header. I was able to figure-out where the extent of the object
+ *     header. I was able to figure-out where the extent of the object 
  *     was stored and the aspect, but that's about it.
  */
@@ -61 +60 @@
 typedef struct PresentationDataHeader
 {
-  DWORD unknown1;   /* -1 */
-  DWORD unknown2;   /* 3, possibly CF_METAFILEPICT */
-  DWORD unknown3;   /* 4, possibly TYMED_ISTREAM */
+  DWORD unknown1;       /* -1 */
+  DWORD unknown2;       /* 3, possibly CF_METAFILEPICT */
+  DWORD unknown3;       /* 4, possibly TYMED_ISTREAM */
   DVASPECT dvAspect;
-  DWORD unknown5;   /* -1 */
+  DWORD unknown5;       /* -1 */
 
   DWORD unknown6;
-  DWORD unknown7;   /* 0 */
+  DWORD unknown7;       /* 0 */
   DWORD dwObjectExtentX;
   DWORD dwObjectExtentY;
@@ -82 +81 @@
    * List all interface VTables here
    */
-  ICOM_VTABLE(IDataObject)*      lpvtbl1;
+  ICOM_VTABLE(IDataObject)*      lpvtbl1; 
   ICOM_VTABLE(IUnknown)*         lpvtbl2;
   ICOM_VTABLE(IPersistStorage)*  lpvtbl3;
-  ICOM_VTABLE(IViewObject2)*     lpvtbl4;
+  ICOM_VTABLE(IViewObject2)*     lpvtbl4;  
   ICOM_VTABLE(IOleCache2)*       lpvtbl5;
   ICOM_VTABLE(IOleCacheControl)* lpvtbl6;
@@ -120 +119 @@
 
 /*
- * Here, I define utility macros to help with the casting of the
+ * Here, I define utility macros to help with the casting of the 
  * "this" parameter.
  * There is a version to accomodate all of the VTables implemented
@@ -126 +125 @@
  */
 #define _ICOM_THIS_From_IDataObject(class,name)       class* this = (class*)name;
-#define _ICOM_THIS_From_NDIUnknown(class, name)       class* this = (class*)(((char*)name)-sizeof(void*));
-#define _ICOM_THIS_From_IPersistStorage(class, name)  class* this = (class*)(((char*)name)-2*sizeof(void*));
-#define _ICOM_THIS_From_IViewObject2(class, name)     class* this = (class*)(((char*)name)-3*sizeof(void*));
-#define _ICOM_THIS_From_IOleCache2(class, name)       class* this = (class*)(((char*)name)-4*sizeof(void*));
-#define _ICOM_THIS_From_IOleCacheControl(class, name) class* this = (class*)(((char*)name)-5*sizeof(void*));
+#define _ICOM_THIS_From_NDIUnknown(class, name)       class* this = (class*)(((char*)name)-sizeof(void*)); 
+#define _ICOM_THIS_From_IPersistStorage(class, name)  class* this = (class*)(((char*)name)-2*sizeof(void*)); 
+#define _ICOM_THIS_From_IViewObject2(class, name)     class* this = (class*)(((char*)name)-3*sizeof(void*)); 
+#define _ICOM_THIS_From_IOleCache2(class, name)       class* this = (class*)(((char*)name)-4*sizeof(void*)); 
+#define _ICOM_THIS_From_IOleCacheControl(class, name) class* this = (class*)(((char*)name)-5*sizeof(void*)); 
 
 /*
@@ -136 +135 @@
  */
 static DataCache* DataCache_Construct(REFCLSID  clsid,
-                      LPUNKNOWN pUnkOuter);
+                                      LPUNKNOWN pUnkOuter);
 static void       DataCache_Destroy(DataCache* ptrToDestroy);
 static HRESULT    DataCache_ReadPresentationData(DataCache*              this,
-                         DWORD                   drawAspect,
-                         PresentationDataHeader* header);
+                                                 DWORD                   drawAspect,
+                                                 PresentationDataHeader* header);
 static HRESULT    DataCache_OpenPresStream(DataCache *this,
-                       DWORD      drawAspect,
-                       IStream  **pStm);
+                                           DWORD      drawAspect,
+                                           IStream  **pStm);
 static HMETAFILE  DataCache_ReadPresMetafile(DataCache* this,
-                         DWORD      drawAspect);
+                                             DWORD      drawAspect);
 static void       DataCache_FireOnViewChange(DataCache* this,
-                         DWORD      aspect,
-                         LONG       lindex);
+                                             DWORD      aspect,
+                                             LONG       lindex);
 
 /*
@@ -158 +157 @@
             REFIID         riid,
             void**         ppvObject);
-static ULONG WINAPI DataCache_NDIUnknown_AddRef(
+static ULONG WINAPI DataCache_NDIUnknown_AddRef( 
             IUnknown*      iface);
-static ULONG WINAPI DataCache_NDIUnknown_Release(
+static ULONG WINAPI DataCache_NDIUnknown_Release( 
             IUnknown*      iface);
 
@@ -171 +170 @@
             REFIID           riid,
             void**           ppvObject);
-static ULONG WINAPI DataCache_IDataObject_AddRef(
+static ULONG WINAPI DataCache_IDataObject_AddRef( 
             IDataObject*     iface);
-static ULONG WINAPI DataCache_IDataObject_Release(
+static ULONG WINAPI DataCache_IDataObject_Release( 
             IDataObject*     iface);
 static HRESULT WINAPI DataCache_GetData(
-        IDataObject*     iface,
-        LPFORMATETC      pformatetcIn,
-        STGMEDIUM*       pmedium);
+            IDataObject*     iface,
+            LPFORMATETC      pformatetcIn, 
+            STGMEDIUM*       pmedium);
 static HRESULT WINAPI DataCache_GetDataHere(
-        IDataObject*     iface,
-        LPFORMATETC      pformatetc,
-        STGMEDIUM*       pmedium);
+            IDataObject*     iface, 
+            LPFORMATETC      pformatetc,
+            STGMEDIUM*       pmedium);
 static HRESULT WINAPI DataCache_QueryGetData(
-        IDataObject*     iface,
-        LPFORMATETC      pformatetc);
+            IDataObject*     iface,
+            LPFORMATETC      pformatetc);
 static HRESULT WINAPI DataCache_GetCanonicalFormatEtc(
-        IDataObject*     iface,
-        LPFORMATETC      pformatectIn,
-        LPFORMATETC      pformatetcOut);
+            IDataObject*     iface, 
+            LPFORMATETC      pformatectIn, 
+            LPFORMATETC      pformatetcOut);
 static HRESULT WINAPI DataCache_IDataObject_SetData(
-        IDataObject*     iface,
-        LPFORMATETC      pformatetc,
-        STGMEDIUM*       pmedium,
-        BOOL             fRelease);
+            IDataObject*     iface,
+            LPFORMATETC      pformatetc, 
+            STGMEDIUM*       pmedium, 
+            BOOL             fRelease);
 static HRESULT WINAPI DataCache_EnumFormatEtc(
-        IDataObject*     iface,
-        DWORD            dwDirection,
-        IEnumFORMATETC** ppenumFormatEtc);
+            IDataObject*     iface,       
+            DWORD            dwDirection,
+            IEnumFORMATETC** ppenumFormatEtc);
 static HRESULT WINAPI DataCache_DAdvise(
-        IDataObject*     iface,
-        FORMATETC*       pformatetc,
-        DWORD            advf,
-        IAdviseSink*     pAdvSink,
-        DWORD*           pdwConnection);
+            IDataObject*     iface, 
+            FORMATETC*       pformatetc, 
+            DWORD            advf, 
+            IAdviseSink*     pAdvSink, 
+            DWORD*           pdwConnection);
 static HRESULT WINAPI DataCache_DUnadvise(
-        IDataObject*     iface,
-        DWORD            dwConnection);
+            IDataObject*     iface,
+            DWORD            dwConnection);
 static HRESULT WINAPI DataCache_EnumDAdvise(
-        IDataObject*     iface,
-        IEnumSTATDATA**  ppenumAdvise);
+            IDataObject*     iface,
+            IEnumSTATDATA**  ppenumAdvise);
 
 /*
@@ -220 +219 @@
             REFIID           riid,
             void**           ppvObject);
-static ULONG WINAPI DataCache_IPersistStorage_AddRef(
+static ULONG WINAPI DataCache_IPersistStorage_AddRef( 
             IPersistStorage* iface);
-static ULONG WINAPI DataCache_IPersistStorage_Release(
+static ULONG WINAPI DataCache_IPersistStorage_Release( 
             IPersistStorage* iface);
-static HRESULT WINAPI DataCache_GetClassID(
+static HRESULT WINAPI DataCache_GetClassID( 
             IPersistStorage* iface,
-        CLSID*           pClassID);
-static HRESULT WINAPI DataCache_IsDirty(
+            CLSID*           pClassID);
+static HRESULT WINAPI DataCache_IsDirty( 
             IPersistStorage* iface);
-static HRESULT WINAPI DataCache_InitNew(
+static HRESULT WINAPI DataCache_InitNew( 
+            IPersistStorage* iface, 
+            IStorage*        pStg);
+static HRESULT WINAPI DataCache_Load( 
             IPersistStorage* iface,
-        IStorage*        pStg);
-static HRESULT WINAPI DataCache_Load(
+            IStorage*        pStg);
+static HRESULT WINAPI DataCache_Save( 
             IPersistStorage* iface,
-        IStorage*        pStg);
-static HRESULT WINAPI DataCache_Save(
-            IPersistStorage* iface,
-        IStorage*        pStg,
-        BOOL             fSameAsLoad);
-static HRESULT WINAPI DataCache_SaveCompleted(
-            IPersistStorage* iface,
-        IStorage*        pStgNew);
+            IStorage*        pStg, 
+            BOOL             fSameAsLoad);
+static HRESULT WINAPI DataCache_SaveCompleted( 
+            IPersistStorage* iface,  
+            IStorage*        pStgNew);
 static HRESULT WINAPI DataCache_HandsOffStorage(
             IPersistStorage* iface);
@@ -253 +252 @@
             REFIID           riid,
             void**           ppvObject);
-static ULONG WINAPI DataCache_IViewObject2_AddRef(
+static ULONG WINAPI DataCache_IViewObject2_AddRef( 
             IViewObject2* iface);
-static ULONG WINAPI DataCache_IViewObject2_Release(
+static ULONG WINAPI DataCache_IViewObject2_Release( 
             IViewObject2* iface);
 static HRESULT WINAPI DataCache_Draw(
             IViewObject2*    iface,
-        DWORD            dwDrawAspect,
-        LONG             lindex,
-        void*            pvAspect,
-        DVTARGETDEVICE*  ptd,
-        HDC              hdcTargetDev,
-        HDC              hdcDraw,
-        LPCRECTL         lprcBounds,
-        LPCRECTL         lprcWBounds,
-        IVO_ContCallback pfnContinue,
-        DWORD            dwContinue);
+            DWORD            dwDrawAspect,
+            LONG             lindex,
+            void*            pvAspect,
+            DVTARGETDEVICE*  ptd, 
+            HDC              hdcTargetDev, 
+            HDC              hdcDraw,
+            LPCRECTL         lprcBounds,
+            LPCRECTL         lprcWBounds,
+            IVO_ContCallback pfnContinue,
+            DWORD            dwContinue);
 static HRESULT WINAPI DataCache_GetColorSet(
-            IViewObject2*   iface,
-        DWORD           dwDrawAspect,
-        LONG            lindex,
-        void*           pvAspect,
-        DVTARGETDEVICE* ptd,
-        HDC             hicTargetDevice,
-        LOGPALETTE**    ppColorSet);
+            IViewObject2*   iface, 
+            DWORD           dwDrawAspect, 
+            LONG            lindex, 
+            void*           pvAspect, 
+            DVTARGETDEVICE* ptd, 
+            HDC             hicTargetDevice, 
+            LOGPALETTE**    ppColorSet);
 static HRESULT WINAPI DataCache_Freeze(
             IViewObject2*   iface,
-        DWORD           dwDrawAspect,
-        LONG            lindex,
-        void*           pvAspect,
-        DWORD*          pdwFreeze);
+            DWORD           dwDrawAspect,
+            LONG            lindex,
+            void*           pvAspect, 
+            DWORD*          pdwFreeze);
 static HRESULT WINAPI DataCache_Unfreeze(
             IViewObject2*   iface,
-        DWORD           dwFreeze);
+            DWORD           dwFreeze);
 static HRESULT WINAPI DataCache_SetAdvise(
             IViewObject2*   iface,
-        DWORD           aspects,
-        DWORD           advf,
-        IAdviseSink*    pAdvSink);
+            DWORD           aspects, 
+            DWORD           advf, 
+            IAdviseSink*    pAdvSink);
 static HRESULT WINAPI DataCache_GetAdvise(
-            IViewObject2*   iface,
-        DWORD*          pAspects,
-        DWORD*          pAdvf,
-        IAdviseSink**   ppAdvSink);
+            IViewObject2*   iface, 
+            DWORD*          pAspects, 
+            DWORD*          pAdvf, 
+            IAdviseSink**   ppAdvSink);
 static HRESULT WINAPI DataCache_GetExtent(
-            IViewObject2*   iface,
-        DWORD           dwDrawAspect,
-        LONG            lindex,
-        DVTARGETDEVICE* ptd,
-        LPSIZEL         lpsizel);
+            IViewObject2*   iface, 
+            DWORD           dwDrawAspect, 
+            LONG            lindex, 
+            DVTARGETDEVICE* ptd, 
+            LPSIZEL         lpsizel);
 
 /*
@@ -311 +310 @@
             REFIID          riid,
             void**          ppvObject);
-static ULONG WINAPI DataCache_IOleCache2_AddRef(
+static ULONG WINAPI DataCache_IOleCache2_AddRef( 
             IOleCache2*     iface);
-static ULONG WINAPI DataCache_IOleCache2_Release(
+static ULONG WINAPI DataCache_IOleCache2_Release( 
             IOleCache2*     iface);
 static HRESULT WINAPI DataCache_Cache(
             IOleCache2*     iface,
-        FORMATETC*      pformatetc,
-        DWORD           advf,
-        DWORD*          pdwConnection);
+            FORMATETC*      pformatetc,
+            DWORD           advf,
+            DWORD*          pdwConnection);
 static HRESULT WINAPI DataCache_Uncache(
-        IOleCache2*     iface,
-        DWORD           dwConnection);
+            IOleCache2*     iface,
+            DWORD           dwConnection);
 static HRESULT WINAPI DataCache_EnumCache(
             IOleCache2*     iface,
-        IEnumSTATDATA** ppenumSTATDATA);
+            IEnumSTATDATA** ppenumSTATDATA);
 static HRESULT WINAPI DataCache_InitCache(
-        IOleCache2*     iface,
-        IDataObject*    pDataObject);
+            IOleCache2*     iface,
+            IDataObject*    pDataObject);
 static HRESULT WINAPI DataCache_IOleCache2_SetData(
             IOleCache2*     iface,
-        FORMATETC*      pformatetc,
-        STGMEDIUM*      pmedium,
-        BOOL            fRelease);
+            FORMATETC*      pformatetc,
+            STGMEDIUM*      pmedium,
+            BOOL            fRelease);
 static HRESULT WINAPI DataCache_UpdateCache(
             IOleCache2*     iface,
-        LPDATAOBJECT    pDataObject,
-        DWORD           grfUpdf,
-        LPVOID          pReserved);
+            LPDATAOBJECT    pDataObject, 
+            DWORD           grfUpdf,
+            LPVOID          pReserved);
 static HRESULT WINAPI DataCache_DiscardCache(
             IOleCache2*     iface,
-        DWORD           dwDiscardOptions);
+            DWORD           dwDiscardOptions);
 
 /*
@@ -351 +350 @@
             REFIID            riid,
             void**            ppvObject);
-static ULONG WINAPI DataCache_IOleCacheControl_AddRef(
+static ULONG WINAPI DataCache_IOleCacheControl_AddRef( 
             IOleCacheControl* iface);
-static ULONG WINAPI DataCache_IOleCacheControl_Release(
+static ULONG WINAPI DataCache_IOleCacheControl_Release( 
             IOleCacheControl* iface);
 static HRESULT WINAPI DataCache_OnRun(
-        IOleCacheControl* iface,
-        LPDATAOBJECT      pDataObject);
+            IOleCacheControl* iface,
+            LPDATAOBJECT      pDataObject);
 static HRESULT WINAPI DataCache_OnStop(
-        IOleCacheControl* iface);
+            IOleCacheControl* iface);
 
 /*
@@ -448 +447 @@
  */
 HRESULT WINAPI CreateDataCache(
-  LPUNKNOWN pUnkOuter,
-  REFCLSID  rclsid,
-  REFIID    riid,
+  LPUNKNOWN pUnkOuter, 
+  REFCLSID  rclsid, 
+  REFIID    riid, 
   LPVOID*   ppvObj)
 {
@@ -472 +471 @@
    * IUnknown pointer can be returned to the outside.
    */
-  if ( (pUnkOuter!=NULL) &&
+  if ( (pUnkOuter!=NULL) && 
        (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) != 0) )
     return CLASS_E_NOAGGREGATION;
@@ -479 +478 @@
    * Try to construct a new instance of the class.
    */
-  newCache = DataCache_Construct(rclsid,
-                 pUnkOuter);
+  newCache = DataCache_Construct(rclsid, 
+                                 pUnkOuter);
 
   if (newCache == 0)
@@ -515 +514 @@
   if (newObject==0)
     return newObject;
-
+  
   /*
    * Initialize the virtual function table.
@@ -525 +524 @@
   newObject->lpvtbl5 = &DataCache_IOleCache2_VTable;
   newObject->lpvtbl6 = &DataCache_IOleCacheControl_VTable;
-
-  /*
-   * Start with one reference count. The caller of this function
+  
+  /*
+   * Start with one reference count. The caller of this function 
    * must release the interface pointer when it is done.
    */
@@ -534 +533 @@
   /*
    * Initialize the outer unknown
-   * We don't keep a reference on the outer unknown since, the way
+   * We don't keep a reference on the outer unknown since, the way 
    * aggregation works, our lifetime is at least as large as it's
    * lifetime.
@@ -580 +579 @@
  * DataCache_ReadPresentationData
  *
- * This method will read information for the requested presentation
+ * This method will read information for the requested presentation 
  * into the given structure.
  *
@@ -602 +601 @@
   hres = DataCache_OpenPresStream(
            this,
-       drawAspect,
-       &presStream);
+           drawAspect,
+           &presStream);
 
   if (FAILED(hres))
@@ -614 +613 @@
   hres = IStream_Read(
            presStream,
-       header,
-       sizeof(PresentationDataHeader),
-       NULL);
+           header,
+           sizeof(PresentationDataHeader),
+           NULL);
 
   /*
@@ -658 +657 @@
     {
       IAdviseSink_OnViewChange(this->sinkInterface,
-                   aspect,
-                   lindex);
+                               aspect,
+                               lindex);
 
       /*
@@ -667 +666 @@
       if ( (this->sinkAdviseFlag & ADVF_ONLYONCE) != 0)
       {
-    IAdviseSink_Release(this->sinkInterface);
-
-    this->sinkInterface  = NULL;
-    this->sinkAspects    = 0;
-    this->sinkAdviseFlag = 0;
+        IAdviseSink_Release(this->sinkInterface);
+
+        this->sinkInterface  = NULL;
+        this->sinkAspects    = 0;
+        this->sinkAdviseFlag = 0;
       }
     }
@@ -687 +686 @@
 
     return (elem->type == STGTY_STREAM)
-    && (elem->cbSize.s.LowPart >= sizeof(PresentationDataHeader))
-    && (strlenW(name) == 11)
-    && (strncmpW(name, OlePres, 8) == 0)
-    && (name[8] >= '0') && (name[8] <= '9')
-    && (name[9] >= '0') && (name[9] <= '9')
-    && (name[10] >= '0') && (name[10] <= '9');
+        && (elem->cbSize.s.LowPart >= sizeof(PresentationDataHeader))
+        && (strlenW(name) == 11)
+        && (strncmpW(name, OlePres, 8) == 0)
+        && (name[8] >= '0') && (name[8] <= '9')
+        && (name[9] >= '0') && (name[9] <= '9')
+        && (name[10] >= '0') && (name[10] <= '9');
 }
 
@@ -708 +707 @@
  *
  * Errors:
- *   S_OK       The requested stream has been opened.
- *   OLE_E_BLANK    The requested stream could not be found.
+ *   S_OK               The requested stream has been opened.
+ *   OLE_E_BLANK        The requested stream could not be found.
  *   Quite a few others I'm too lazy to map correctly.
  *
  * Notes:
- *   Algorithm: Scan the elements of the presentation storage, looking
- *      for presentation streams. For each presentation stream,
- *      load the header and check to see if the aspect maches.
+ *   Algorithm: Scan the elements of the presentation storage, looking
+ *              for presentation streams. For each presentation stream,
+ *              load the header and check to see if the aspect maches.
  *
  *   If a fallback is desired, just opening the first presentation stream
@@ -736 +735 @@
     while ((hr = IEnumSTATSTG_Next(pEnum, 1, &elem, NULL)) == S_OK)
     {
-    if (DataCache_IsPresentationStream(&elem))
-    {
-        IStream *pStm;
-
-        hr = IStorage_OpenStream(this->presentationStorage, elem.pwcsName,
-                     NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0,
-                     &pStm);
-        if (SUCCEEDED(hr))
-        {
-        PresentationDataHeader header;
-        ULONG actual_read;
-
-        hr = IStream_Read(pStm, &header, sizeof(header), &actual_read);
-
-        /* can't use SUCCEEDED(hr): S_FALSE counts as an error */
-        if (hr == S_OK && actual_read == sizeof(header)
-            && header.dvAspect == drawAspect)
-        {
-            /* Rewind the stream before returning it. */
-            LARGE_INTEGER offset;
-            offset.s.LowPart = 0;
-            offset.s.HighPart = 0;
-            IStream_Seek(pStm, offset, STREAM_SEEK_SET, NULL);
-
-            *ppStm = pStm;
-
-            CoTaskMemFree(elem.pwcsName);
-            IEnumSTATSTG_Release(pEnum);
-
-            return S_OK;
-        }
-
-        IStream_Release(pStm);
-        }
+        if (DataCache_IsPresentationStream(&elem))
+        {
+            IStream *pStm;
+
+            hr = IStorage_OpenStream(this->presentationStorage, elem.pwcsName,
+                                     NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0,
+                                     &pStm);
+            if (SUCCEEDED(hr))
+            {
+                PresentationDataHeader header;
+                ULONG actual_read;
+
+                hr = IStream_Read(pStm, &header, sizeof(header), &actual_read);
+
+                /* can't use SUCCEEDED(hr): S_FALSE counts as an error */
+                if (hr == S_OK && actual_read == sizeof(header)
+                    && header.dvAspect == drawAspect)
+                {
+                    /* Rewind the stream before returning it. */
+                    LARGE_INTEGER offset;
+                    offset.s.LowPart = 0;
+                    offset.s.HighPart = 0;
+                    IStream_Seek(pStm, offset, STREAM_SEEK_SET, NULL);
+
+                    *ppStm = pStm;
+
+                    CoTaskMemFree(elem.pwcsName);
+                    IEnumSTATSTG_Release(pEnum);
+
+                    return S_OK;
+                }
+
+                IStream_Release(pStm);
+            }
+        }
+
+        CoTaskMemFree(elem.pwcsName);
     }
 
-    CoTaskMemFree(elem.pwcsName);
-    }
-
     IEnumSTATSTG_Release(pEnum);
 
@@ -783 +782 @@
  * DataCache_ReadPresentationData
  *
- * This method will read information for the requested presentation
+ * This method will read information for the requested presentation 
  * into the given structure.
  *
@@ -809 +808 @@
    */
   hres = DataCache_OpenPresStream(
-           this,
-       drawAspect,
-       &presStream);
+           this, 
+           drawAspect,
+           &presStream);
 
   if (FAILED(hres))
@@ -820 +819 @@
    */
   hres = IStream_Stat(presStream,
-              &streamInfo,
-              STATFLAG_NONAME);
+                      &streamInfo,
+                      STATFLAG_NONAME);
 
   /*
@@ -831 +830 @@
   hres = IStream_Seek(
            presStream,
-       offset,
-       STREAM_SEEK_SET,
-       NULL);
+           offset,
+           STREAM_SEEK_SET,
+           NULL);
 
   streamInfo.cbSize.s.LowPart -= offset.s.LowPart;
@@ -840 +839 @@
    * Allocate a buffer for the metafile bits.
    */
-  metafileBits = HeapAlloc(GetProcessHeap(),
-               0,
-               streamInfo.cbSize.s.LowPart);
+  metafileBits = HeapAlloc(GetProcessHeap(), 
+                           0, 
+                           streamInfo.cbSize.s.LowPart);
 
   /*
@@ -848 +847 @@
    */
   hres = IStream_Read(
-       presStream,
-       metafileBits,
-       streamInfo.cbSize.s.LowPart,
-       NULL);
+           presStream,
+           metafileBits,
+           streamInfo.cbSize.s.LowPart,
+           NULL);
 
   /*
@@ -898 +897 @@
   if ( (this==0) || (ppvObject==0) )
     return E_INVALIDARG;
-
+  
   /*
    * Initialize the return parameter.
@@ -907 +906 @@
    * Compare the riid with the interface IDs implemented by this object.
    */
-  if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0)
+  if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) 
   {
     *ppvObject = iface;
   }
-  else if (memcmp(&IID_IDataObject, riid, sizeof(IID_IDataObject)) == 0)
+  else if (memcmp(&IID_IDataObject, riid, sizeof(IID_IDataObject)) == 0) 
   {
     *ppvObject = (IDataObject*)&(this->lpvtbl1);
   }
   else if ( (memcmp(&IID_IPersistStorage, riid, sizeof(IID_IPersistStorage)) == 0)  ||
-        (memcmp(&IID_IPersist, riid, sizeof(IID_IPersist)) == 0) )
+            (memcmp(&IID_IPersist, riid, sizeof(IID_IPersist)) == 0) )
   {
     *ppvObject = (IPersistStorage*)&(this->lpvtbl3);
   }
   else if ( (memcmp(&IID_IViewObject, riid, sizeof(IID_IViewObject)) == 0) ||
-        (memcmp(&IID_IViewObject2, riid, sizeof(IID_IViewObject2)) == 0) )
+            (memcmp(&IID_IViewObject2, riid, sizeof(IID_IViewObject2)) == 0) )
   {
     *ppvObject = (IViewObject2*)&(this->lpvtbl4);
   }
   else if ( (memcmp(&IID_IOleCache, riid, sizeof(IID_IOleCache)) == 0) ||
-        (memcmp(&IID_IOleCache2, riid, sizeof(IID_IOleCache2)) == 0) )
+            (memcmp(&IID_IOleCache2, riid, sizeof(IID_IOleCache2)) == 0) )
   {
     *ppvObject = (IOleCache2*)&(this->lpvtbl5);
   }
-  else if (memcmp(&IID_IOleCacheControl, riid, sizeof(IID_IOleCacheControl)) == 0)
+  else if (memcmp(&IID_IOleCacheControl, riid, sizeof(IID_IOleCacheControl)) == 0) 
   {
     *ppvObject = (IOleCacheControl*)&(this->lpvtbl6);
@@ -943 +942 @@
     return E_NOINTERFACE;
   }
-
+  
   /*
    * Query Interface always increases the reference count by one when it is
-   * successful.
+   * successful. 
    */
   IUnknown_AddRef((IUnknown*)*ppvObject);
 
-  return S_OK;;
+  return S_OK;;  
 }
 
@@ -961 +960 @@
  * to the outer unknown.
  */
-static ULONG WINAPI DataCache_NDIUnknown_AddRef(
+static ULONG WINAPI DataCache_NDIUnknown_AddRef( 
             IUnknown*      iface)
 {
@@ -979 +978 @@
  * to the outer unknown.
  */
-static ULONG WINAPI DataCache_NDIUnknown_Release(
+static ULONG WINAPI DataCache_NDIUnknown_Release( 
             IUnknown*      iface)
 {
@@ -998 +997 @@
     return 0;
   }
-
+  
   return this->ref;
 }
@@ -1019 +1018 @@
   _ICOM_THIS_From_IDataObject(DataCache, iface);
 
-  return IUnknown_QueryInterface(this->outerUnknown, riid, ppvObject);
+  return IUnknown_QueryInterface(this->outerUnknown, riid, ppvObject);  
 }
 
@@ -1027 +1026 @@
  * See Windows documentation for more details on IUnknown methods.
  */
-static ULONG WINAPI DataCache_IDataObject_AddRef(
+static ULONG WINAPI DataCache_IDataObject_AddRef( 
             IDataObject*     iface)
 {
   _ICOM_THIS_From_IDataObject(DataCache, iface);
 
-  return IUnknown_AddRef(this->outerUnknown);
+  return IUnknown_AddRef(this->outerUnknown);  
 }
 
@@ -1040 +1039 @@
  * See Windows documentation for more details on IUnknown methods.
  */
-static ULONG WINAPI DataCache_IDataObject_Release(
+static ULONG WINAPI DataCache_IDataObject_Release( 
             IDataObject*     iface)
 {
   _ICOM_THIS_From_IDataObject(DataCache, iface);
 
-  return IUnknown_Release(this->outerUnknown);
+  return IUnknown_Release(this->outerUnknown);  
 }
 
@@ -1056 +1055 @@
  */
 static HRESULT WINAPI DataCache_GetData(
-        IDataObject*     iface,
-        LPFORMATETC      pformatetcIn,
-        STGMEDIUM*       pmedium)
+            IDataObject*     iface,
+            LPFORMATETC      pformatetcIn, 
+            STGMEDIUM*       pmedium)
 {
   HRESULT hr = 0;
@@ -1155 +1154 @@
 
 static HRESULT WINAPI DataCache_GetDataHere(
-        IDataObject*     iface,
-        LPFORMATETC      pformatetc,
-        STGMEDIUM*       pmedium)
+            IDataObject*     iface, 
+            LPFORMATETC      pformatetc,
+            STGMEDIUM*       pmedium)
 {
   FIXME("stub\n");
@@ -1164 +1163 @@
 
 static HRESULT WINAPI DataCache_QueryGetData(
-        IDataObject*     iface,
-        LPFORMATETC      pformatetc)
+            IDataObject*     iface,
+            LPFORMATETC      pformatetc)
 {
   FIXME("stub\n");
@@ -1179 +1178 @@
  */
 static HRESULT WINAPI DataCache_GetCanonicalFormatEtc(
-        IDataObject*     iface,
-        LPFORMATETC      pformatectIn,
-        LPFORMATETC      pformatetcOut)
+            IDataObject*     iface, 
+            LPFORMATETC      pformatectIn, 
+            LPFORMATETC      pformatetcOut)
 {
   TRACE("()\n");
@@ -1195 +1194 @@
  */
 static HRESULT WINAPI DataCache_IDataObject_SetData(
-        IDataObject*     iface,
-        LPFORMATETC      pformatetc,
-        STGMEDIUM*       pmedium,
-        BOOL             fRelease)
+            IDataObject*     iface,
+            LPFORMATETC      pformatetc, 
+            STGMEDIUM*       pmedium, 
+            BOOL             fRelease)
 {
   IOleCache2* oleCache = NULL;
@@ -1225 +1224 @@
  */
 static HRESULT WINAPI DataCache_EnumFormatEtc(
-        IDataObject*     iface,
-        DWORD            dwDirection,
-        IEnumFORMATETC** ppenumFormatEtc)
+            IDataObject*     iface,       
+            DWORD            dwDirection,
+            IEnumFORMATETC** ppenumFormatEtc)
 {
   TRACE("()\n");
@@ -1241 +1240 @@
  */
 static HRESULT WINAPI DataCache_DAdvise(
-        IDataObject*     iface,
-        FORMATETC*       pformatetc,
-        DWORD            advf,
-        IAdviseSink*     pAdvSink,
-        DWORD*           pdwConnection)
+            IDataObject*     iface, 
+            FORMATETC*       pformatetc, 
+            DWORD            advf, 
+            IAdviseSink*     pAdvSink, 
+            DWORD*           pdwConnection)
 {
   TRACE("()\n");
@@ -1259 +1258 @@
  */
 static HRESULT WINAPI DataCache_DUnadvise(
-        IDataObject*     iface,
-        DWORD            dwConnection)
+            IDataObject*     iface,
+            DWORD            dwConnection)
 {
   TRACE("()\n");
@@ -1274 +1273 @@
  */
 static HRESULT WINAPI DataCache_EnumDAdvise(
-        IDataObject*     iface,
-        IEnumSTATDATA**  ppenumAdvise)
+            IDataObject*     iface,
+            IEnumSTATDATA**  ppenumAdvise)
 {
   TRACE("()\n");
@@ -1298 +1297 @@
   _ICOM_THIS_From_IPersistStorage(DataCache, iface);
 
-  return IUnknown_QueryInterface(this->outerUnknown, riid, ppvObject);
+  return IUnknown_QueryInterface(this->outerUnknown, riid, ppvObject);  
 }
 
@@ -1306 +1305 @@
  * See Windows documentation for more details on IUnknown methods.
  */
-static ULONG WINAPI DataCache_IPersistStorage_AddRef(
+static ULONG WINAPI DataCache_IPersistStorage_AddRef( 
             IPersistStorage* iface)
 {
   _ICOM_THIS_From_IPersistStorage(DataCache, iface);
 
-  return IUnknown_AddRef(this->outerUnknown);
+  return IUnknown_AddRef(this->outerUnknown);  
 }
 
@@ -1319 +1318 @@
  * See Windows documentation for more details on IUnknown methods.
  */
-static ULONG WINAPI DataCache_IPersistStorage_Release(
+static ULONG WINAPI DataCache_IPersistStorage_Release( 
             IPersistStorage* iface)
 {
   _ICOM_THIS_From_IPersistStorage(DataCache, iface);
 
-  return IUnknown_Release(this->outerUnknown);
+  return IUnknown_Release(this->outerUnknown);  
 }
 
@@ -1334 +1333 @@
  * See Windows documentation for more details on IPersistStorage methods.
  */
-static HRESULT WINAPI DataCache_GetClassID(
+static HRESULT WINAPI DataCache_GetClassID( 
             IPersistStorage* iface,
-        CLSID*           pClassID)
+            CLSID*           pClassID)
 {
   TRACE("(%p, %p)\n", iface, pClassID);
@@ -1345 +1344 @@
  * DataCache_IsDirty (IPersistStorage)
  *
- * Until we actully connect to a running object and retrieve new
+ * Until we actully connect to a running object and retrieve new 
  * information to it, we never get dirty.
  *
  * See Windows documentation for more details on IPersistStorage methods.
  */
-static HRESULT WINAPI DataCache_IsDirty(
+static HRESULT WINAPI DataCache_IsDirty( 
             IPersistStorage* iface)
 {
@@ -1366 +1365 @@
  * See Windows documentation for more details on IPersistStorage methods.
  */
-static HRESULT WINAPI DataCache_InitNew(
+static HRESULT WINAPI DataCache_InitNew( 
+            IPersistStorage* iface, 
+            IStorage*        pStg)
+{
+  TRACE("(%p, %p)\n", iface, pStg);
+
+  return DataCache_Load(iface, pStg);
+}
+
+/************************************************************************
+ * DataCache_Load (IPersistStorage)
+ *
+ * The data cache implementation of IPersistStorage_Load doesn't 
+ * actually load anything. Instead, it holds on to the storage pointer
+ * and it will load the presentation information when the 
+ * IDataObject_GetData or IViewObject2_Draw methods are called.
+ *
+ * See Windows documentation for more details on IPersistStorage methods.
+ */
+static HRESULT WINAPI DataCache_Load( 
             IPersistStorage* iface,
-        IStorage*        pStg)
-{
+            IStorage*        pStg)
+{
+  _ICOM_THIS_From_IPersistStorage(DataCache, iface);
+
   TRACE("(%p, %p)\n", iface, pStg);
 
-  return DataCache_Load(iface, pStg);
-}
-
-/************************************************************************
- * DataCache_Load (IPersistStorage)
- *
- * The data cache implementation of IPersistStorage_Load doesn't
- * actually load anything. Instead, it holds on to the storage pointer
- * and it will load the presentation information when the
- * IDataObject_GetData or IViewObject2_Draw methods are called.
- *
- * See Windows documentation for more details on IPersistStorage methods.
- */
-static HRESULT WINAPI DataCache_Load(
-            IPersistStorage* iface,
-        IStorage*        pStg)
-{
-  _ICOM_THIS_From_IPersistStorage(DataCache, iface);
-
-  TRACE("(%p, %p)\n", iface, pStg);
-
   if (this->presentationStorage != NULL)
   {
@@ -1410 +1409 @@
  * DataCache_Save (IPersistStorage)
  *
- * Until we actully connect to a running object and retrieve new
+ * Until we actully connect to a running object and retrieve new 
  * information to it, we never have to save anything. However, it is
  * our responsability to copy the information when saving to a new
@@ -1417 +1416 @@
  * See Windows documentation for more details on IPersistStorage methods.
  */
-static HRESULT WINAPI DataCache_Save(
+static HRESULT WINAPI DataCache_Save( 
             IPersistStorage* iface,
-        IStorage*        pStg,
-        BOOL             fSameAsLoad)
+            IStorage*        pStg, 
+            BOOL             fSameAsLoad)
 {
   _ICOM_THIS_From_IPersistStorage(DataCache, iface);
@@ -1426 +1425 @@
   TRACE("(%p, %p, %d)\n", iface, pStg, fSameAsLoad);
 
-  if ( (!fSameAsLoad) &&
+  if ( (!fSameAsLoad) && 
        (this->presentationStorage!=NULL) )
   {
     return IStorage_CopyTo(this->presentationStorage,
-               0,
-               NULL,
-               NULL,
-               pStg);
+                           0,
+                           NULL,
+                           NULL,
+                           pStg);
   }
 
@@ -1447 +1446 @@
  * See Windows documentation for more details on IPersistStorage methods.
  */
-static HRESULT WINAPI DataCache_SaveCompleted(
-            IPersistStorage* iface,
-        IStorage*        pStgNew)
+static HRESULT WINAPI DataCache_SaveCompleted( 
+            IPersistStorage* iface,  
+            IStorage*        pStgNew)
 {
   TRACE("(%p, %p)\n", iface, pStgNew);
@@ -1512 +1511 @@
   _ICOM_THIS_From_IViewObject2(DataCache, iface);
 
-  return IUnknown_QueryInterface(this->outerUnknown, riid, ppvObject);
+  return IUnknown_QueryInterface(this->outerUnknown, riid, ppvObject);  
 }
 
@@ -1520 +1519 @@
  * See Windows documentation for more details on IUnknown methods.
  */
-static ULONG WINAPI DataCache_IViewObject2_AddRef(
+static ULONG WINAPI DataCache_IViewObject2_AddRef( 
             IViewObject2* iface)
 {
   _ICOM_THIS_From_IViewObject2(DataCache, iface);
 
-  return IUnknown_AddRef(this->outerUnknown);
+  return IUnknown_AddRef(this->outerUnknown);  
 }
 
@@ -1533 +1532 @@
  * See Windows documentation for more details on IUnknown methods.
  */
-static ULONG WINAPI DataCache_IViewObject2_Release(
+static ULONG WINAPI DataCache_IViewObject2_Release( 
             IViewObject2* iface)
 {
   _ICOM_THIS_From_IViewObject2(DataCache, iface);
 
-  return IUnknown_Release(this->outerUnknown);
+  return IUnknown_Release(this->outerUnknown);  
 }
 
@@ -1551 +1550 @@
 static HRESULT WINAPI DataCache_Draw(
             IViewObject2*    iface,
-        DWORD            dwDrawAspect,
-        LONG             lindex,
-        void*            pvAspect,
-        DVTARGETDEVICE*  ptd,
-        HDC              hdcTargetDev,
-        HDC              hdcDraw,
-        LPCRECTL         lprcBounds,
-        LPCRECTL         lprcWBounds,
-        IVO_ContCallback pfnContinue,
-        DWORD            dwContinue)
+            DWORD            dwDrawAspect,
+            LONG             lindex,
+            void*            pvAspect,
+            DVTARGETDEVICE*  ptd, 
+            HDC              hdcTargetDev, 
+            HDC              hdcDraw,
+            LPCRECTL         lprcBounds,
+            LPCRECTL         lprcWBounds,
+            IVO_ContCallback pfnContinue,
+            DWORD            dwContinue)
 {
   PresentationDataHeader presData;
@@ -1569 +1568 @@
 
   TRACE("(%p, %lx, %ld, %p, %x, %x, %p, %p, %p, %lx)\n",
-    iface,
-    dwDrawAspect,
-    lindex,
-    pvAspect,
-    hdcTargetDev,
-    hdcDraw,
-    lprcBounds,
-    lprcWBounds,
-    pfnContinue,
-    dwContinue);
+        iface,
+        dwDrawAspect,
+        lindex,
+        pvAspect,
+        hdcTargetDev, 
+        hdcDraw,
+        lprcBounds,
+        lprcWBounds,
+        pfnContinue,
+        dwContinue);
 
   /*
@@ -1591 +1590 @@
    */
   hres = DataCache_ReadPresentationData(this,
-                    dwDrawAspect,
-                    &presData);
+                                        dwDrawAspect,
+                                        &presData);
 
   if (FAILED(hres))
@@ -1605 +1604 @@
    */
   presMetafile = DataCache_ReadPresMetafile(this,
-                        dwDrawAspect);
+                                            dwDrawAspect);
 
   /*
@@ -1620 +1619 @@
 
     SetWindowExtEx(hdcDraw,
-           presData.dwObjectExtentX,
-           presData.dwObjectExtentY,
-           &oldWindowExt);
-
-    SetViewportExtEx(hdcDraw,
-             lprcBounds->right - lprcBounds->left,
-             lprcBounds->bottom - lprcBounds->top,
-             &oldViewportExt);
+                   presData.dwObjectExtentX,
+                   presData.dwObjectExtentY,
+                   &oldWindowExt);
+
+    SetViewportExtEx(hdcDraw, 
+                     lprcBounds->right - lprcBounds->left,
+                     lprcBounds->bottom - lprcBounds->top,
+                     &oldViewportExt);
 
     SetViewportOrgEx(hdcDraw,
-             lprcBounds->left,
-             lprcBounds->top,
-             &oldViewportOrg);
+                     lprcBounds->left,
+                     lprcBounds->top,
+                     &oldViewportOrg);
 
     PlayMetaFile(hdcDraw, presMetafile);
 
     SetWindowExtEx(hdcDraw,
-           oldWindowExt.cx,
-           oldWindowExt.cy,
-           NULL);
-
-    SetViewportExtEx(hdcDraw,
-             oldViewportExt.cx,
-             oldViewportExt.cy,
-             NULL);
+                   oldWindowExt.cx,
+                   oldWindowExt.cy,
+                   NULL);
+
+    SetViewportExtEx(hdcDraw, 
+                     oldViewportExt.cx,
+                     oldViewportExt.cy,
+                     NULL);
 
     SetViewportOrgEx(hdcDraw,
-             oldViewportOrg.x,
-             oldViewportOrg.y,
-             NULL);
+                     oldViewportOrg.x,
+                     oldViewportOrg.y,
+                     NULL);
 
     SetMapMode(hdcDraw, prevMapMode);
@@ -1660 +1659 @@
 
 static HRESULT WINAPI DataCache_GetColorSet(
-            IViewObject2*   iface,
-        DWORD           dwDrawAspect,
-        LONG            lindex,
-        void*           pvAspect,
-        DVTARGETDEVICE* ptd,
-        HDC             hicTargetDevice,
-        LOGPALETTE**    ppColorSet)
+            IViewObject2*   iface, 
+            DWORD           dwDrawAspect, 
+            LONG            lindex, 
+            void*           pvAspect, 
+            DVTARGETDEVICE* ptd, 
+            HDC             hicTargetDevice, 
+            LOGPALETTE**    ppColorSet)
 {
   FIXME("stub\n");
@@ -1674 +1673 @@
 static HRESULT WINAPI DataCache_Freeze(
             IViewObject2*   iface,
-        DWORD           dwDrawAspect,
-        LONG            lindex,
-        void*           pvAspect,
-        DWORD*          pdwFreeze)
+            DWORD           dwDrawAspect,
+            LONG            lindex,
+            void*           pvAspect, 
+            DWORD*          pdwFreeze)
 {
   FIXME("stub\n");
@@ -1685 +1684 @@
 static HRESULT WINAPI DataCache_Unfreeze(
             IViewObject2*   iface,
-        DWORD           dwFreeze)
+            DWORD           dwFreeze)
 {
   FIXME("stub\n");
@@ -1701 +1700 @@
 static HRESULT WINAPI DataCache_SetAdvise(
             IViewObject2*   iface,
-        DWORD           aspects,
-        DWORD           advf,
-        IAdviseSink*    pAdvSink)
+            DWORD           aspects, 
+            DWORD           advf, 
+            IAdviseSink*    pAdvSink)
 {
   _ICOM_THIS_From_IViewObject2(DataCache, iface);
@@ -1716 +1715 @@
     IAdviseSink_Release(this->sinkInterface);
     this->sinkInterface  = NULL;
-    this->sinkAspects    = 0;
+    this->sinkAspects    = 0; 
     this->sinkAdviseFlag = 0;
   }
@@ -1726 +1725 @@
   {
     this->sinkInterface  = pAdvSink;
-    this->sinkAspects    = aspects;
-    this->sinkAdviseFlag = advf;
+    this->sinkAspects    = aspects; 
+    this->sinkAdviseFlag = advf;    
 
     IAdviseSink_AddRef(this->sinkInterface);
@@ -1739 +1738 @@
   {
     DataCache_FireOnViewChange(this,
-                   DVASPECT_CONTENT,
-                   -1);
+                               DVASPECT_CONTENT,
+                               -1);
   }
 
@@ -1749 +1748 @@
  * DataCache_GetAdvise (IViewObject2)
  *
- * This method queries the current state of the advise sink
+ * This method queries the current state of the advise sink 
  * installed on the data cache.
  *
@@ -1755 +1754 @@
  */
 static HRESULT WINAPI DataCache_GetAdvise(
-            IViewObject2*   iface,
-        DWORD*          pAspects,
-        DWORD*          pAdvf,
-        IAdviseSink**   ppAdvSink)
+            IViewObject2*   iface, 
+            DWORD*          pAspects, 
+            DWORD*          pAdvf, 
+            IAdviseSink**   ppAdvSink)
 {
   _ICOM_THIS_From_IViewObject2(DataCache, iface);
@@ -1775 +1774 @@
   if (ppAdvSink!=NULL)
   {
-    IAdviseSink_QueryInterface(this->sinkInterface,
-                   &IID_IAdviseSink,
-                   (void**)ppAdvSink);
+    IAdviseSink_QueryInterface(this->sinkInterface, 
+                               &IID_IAdviseSink, 
+                               (void**)ppAdvSink);
   }
 
@@ -1791 +1790 @@
  */
 static HRESULT WINAPI DataCache_GetExtent(
-            IViewObject2*   iface,
-        DWORD           dwDrawAspect,
-        LONG            lindex,
-        DVTARGETDEVICE* ptd,
-        LPSIZEL         lpsizel)
+            IViewObject2*   iface, 
+            DWORD           dwDrawAspect, 
+            LONG            lindex, 
+            DVTARGETDEVICE* ptd, 
+            LPSIZEL         lpsizel)
 {
   PresentationDataHeader presData;
@@ -1802 +1801 @@
   _ICOM_THIS_From_IViewObject2(DataCache, iface);
 
-  TRACE("(%p, %lx, %ld, %p, %p)\n",
-    iface, dwDrawAspect, lindex, ptd, lpsizel);
+  TRACE("(%p, %lx, %ld, %p, %p)\n", 
+        iface, dwDrawAspect, lindex, ptd, lpsizel);
 
   /*
@@ -1829 +1828 @@
   if (ptd!=NULL)
     FIXME("Unimplemented ptd = %p\n", ptd);
-
-  /*
-   * Get the presentation information from the
+  
+  /*
+   * Get the presentation information from the 
    * cache.
    */
   hres = DataCache_ReadPresentationData(this,
-                    dwDrawAspect,
-                    &presData);
+                                        dwDrawAspect,
+                                        &presData);
 
   if (SUCCEEDED(hres))
@@ -1871 +1870 @@
   _ICOM_THIS_From_IOleCache2(DataCache, iface);
 
-  return IUnknown_QueryInterface(this->outerUnknown, riid, ppvObject);
+  return IUnknown_QueryInterface(this->outerUnknown, riid, ppvObject);  
 }
 
@@ -1879 +1878 @@
  * See Windows documentation for more details on IUnknown methods.
  */
-static ULONG WINAPI DataCache_IOleCache2_AddRef(
+static ULONG WINAPI DataCache_IOleCache2_AddRef( 
             IOleCache2*     iface)
 {
   _ICOM_THIS_From_IOleCache2(DataCache, iface);
 
-  return IUnknown_AddRef(this->outerUnknown);
+  return IUnknown_AddRef(this->outerUnknown);  
 }
 
@@ -1892 +1891 @@
  * See Windows documentation for more details on IUnknown methods.
  */
-static ULONG WINAPI DataCache_IOleCache2_Release(
+static ULONG WINAPI DataCache_IOleCache2_Release( 
             IOleCache2*     iface)
 {
   _ICOM_THIS_From_IOleCache2(DataCache, iface);
 
-  return IUnknown_Release(this->outerUnknown);
+  return IUnknown_Release(this->outerUnknown);  
 }
 
 static HRESULT WINAPI DataCache_Cache(
             IOleCache2*     iface,
-        FORMATETC*      pformatetc,
-        DWORD           advf,
-        DWORD*          pdwConnection)
+            FORMATETC*      pformatetc,
+            DWORD           advf,
+            DWORD*          pdwConnection)
 {
   FIXME("stub\n");
@@ -1911 +1910 @@
 
 static HRESULT WINAPI DataCache_Uncache(
-        IOleCache2*     iface,
-        DWORD           dwConnection)
+            IOleCache2*     iface,
+            DWORD           dwConnection)
 {
   FIXME("stub\n");
@@ -1920 +1919 @@
 static HRESULT WINAPI DataCache_EnumCache(
             IOleCache2*     iface,
-        IEnumSTATDATA** ppenumSTATDATA)
+            IEnumSTATDATA** ppenumSTATDATA)
 {
   FIXME("stub\n");
@@ -1927 +1926 @@
 
 static HRESULT WINAPI DataCache_InitCache(
-        IOleCache2*     iface,
-        IDataObject*    pDataObject)
+            IOleCache2*     iface,
+            IDataObject*    pDataObject)
 {
   FIXME("stub\n");
@@ -1936 +1935 @@
 static HRESULT WINAPI DataCache_IOleCache2_SetData(
             IOleCache2*     iface,
-        FORMATETC*      pformatetc,
-        STGMEDIUM*      pmedium,
-        BOOL            fRelease)
+            FORMATETC*      pformatetc,
+            STGMEDIUM*      pmedium,
+            BOOL            fRelease)
 {
   FIXME("stub\n");
@@ -1946 +1945 @@
 static HRESULT WINAPI DataCache_UpdateCache(
             IOleCache2*     iface,
-        LPDATAOBJECT    pDataObject,
-        DWORD           grfUpdf,
-        LPVOID          pReserved)
+            LPDATAOBJECT    pDataObject, 
+            DWORD           grfUpdf,
+            LPVOID          pReserved)
 {
   FIXME("stub\n");
@@ -1956 +1955 @@
 static HRESULT WINAPI DataCache_DiscardCache(
             IOleCache2*     iface,
-        DWORD           dwDiscardOptions)
+            DWORD           dwDiscardOptions)
 {
   FIXME("stub\n");
@@ -1980 +1979 @@
   _ICOM_THIS_From_IOleCacheControl(DataCache, iface);
 
-  return IUnknown_QueryInterface(this->outerUnknown, riid, ppvObject);
+  return IUnknown_QueryInterface(this->outerUnknown, riid, ppvObject);  
 }
 
@@ -1988 +1987 @@
  * See Windows documentation for more details on IUnknown methods.
  */
-static ULONG WINAPI DataCache_IOleCacheControl_AddRef(
+static ULONG WINAPI DataCache_IOleCacheControl_AddRef( 
             IOleCacheControl* iface)
 {
   _ICOM_THIS_From_IOleCacheControl(DataCache, iface);
 
-  return IUnknown_AddRef(this->outerUnknown);
+  return IUnknown_AddRef(this->outerUnknown);  
 }
 
@@ -2001 +2000 @@
  * See Windows documentation for more details on IUnknown methods.
  */
-static ULONG WINAPI DataCache_IOleCacheControl_Release(
+static ULONG WINAPI DataCache_IOleCacheControl_Release( 
             IOleCacheControl* iface)
 {
   _ICOM_THIS_From_IOleCacheControl(DataCache, iface);
 
-  return IUnknown_Release(this->outerUnknown);
+  return IUnknown_Release(this->outerUnknown);  
 }
 
 static HRESULT WINAPI DataCache_OnRun(
-        IOleCacheControl* iface,
-        LPDATAOBJECT      pDataObject)
+            IOleCacheControl* iface,
+            LPDATAOBJECT      pDataObject)
 {
   FIXME("stub\n");
@@ -2018 +2017 @@
 
 static HRESULT WINAPI DataCache_OnStop(
-        IOleCacheControl* iface)
+            IOleCacheControl* iface)
 {
   FIXME("stub\n");

trunk/src/ole32/defaulthandler.c

@@ -1 @@
-/* $Id: defaulthandler.c,v 1.2 2001-09-05 13:17:08 bird Exp $ */
 /*
- *  OLE 2 default object handler
+ *      OLE 2 default object handler
  *
  *      Copyright 1999  Francis Beaudet
@@ -26 +25 @@
  *   done in this area.
  *
- * - Some functions still return E_NOTIMPL they have to be
+ * - Some functions still return E_NOTIMPL they have to be 
  *   implemented. Most of those are related to the running of the
  *   actual server.
@@ -54 +53 @@
    * List all interface VTables here
    */
-  ICOM_VTABLE(IOleObject)*      lpvtbl1;
+  ICOM_VTABLE(IOleObject)*      lpvtbl1; 
   ICOM_VTABLE(IUnknown)*        lpvtbl2;
   ICOM_VTABLE(IDataObject)*     lpvtbl3;
@@ -91 +90 @@
 
   /*
-   * The IDataAdviseHolder maintains the data
+   * The IDataAdviseHolder maintains the data 
    * connections on behalf of the default handler.
    */
@@ -99 +98 @@
    * Name of the container and object contained
    */
-  LPWSTR containerApp;
+  LPWSTR containerApp; 
   LPWSTR containerObj;
 
@@ -107 +106 @@
 
 /*
- * Here, I define utility macros to help with the casting of the
+ * Here, I define utility macros to help with the casting of the 
  * "this" parameter.
  * There is a version to accomodate all of the VTables implemented
@@ -113 +112 @@
  */
 #define _ICOM_THIS_From_IOleObject(class,name)       class* this = (class*)name;
-#define _ICOM_THIS_From_NDIUnknown(class, name)      class* this = (class*)(((char*)name)-sizeof(void*));
-#define _ICOM_THIS_From_IDataObject(class, name)     class* this = (class*)(((char*)name)-2*sizeof(void*));
-#define _ICOM_THIS_From_IRunnableObject(class, name) class* this = (class*)(((char*)name)-3*sizeof(void*));
+#define _ICOM_THIS_From_NDIUnknown(class, name)      class* this = (class*)(((char*)name)-sizeof(void*)); 
+#define _ICOM_THIS_From_IDataObject(class, name)     class* this = (class*)(((char*)name)-2*sizeof(void*)); 
+#define _ICOM_THIS_From_IRunnableObject(class, name) class* this = (class*)(((char*)name)-3*sizeof(void*)); 
 
 /*
@@ -121 +120 @@
  */
 static DefaultHandler* DefaultHandler_Construct(REFCLSID  clsid,
-                        LPUNKNOWN pUnkOuter);
+                                                LPUNKNOWN pUnkOuter);
 static void            DefaultHandler_Destroy(DefaultHandler* ptrToDestroy);
 
@@ -132 +131 @@
             REFIID         riid,
             void**         ppvObject);
-static ULONG WINAPI DefaultHandler_NDIUnknown_AddRef(
+static ULONG WINAPI DefaultHandler_NDIUnknown_AddRef( 
             IUnknown*      iface);
-static ULONG WINAPI DefaultHandler_NDIUnknown_Release(
+static ULONG WINAPI DefaultHandler_NDIUnknown_Release( 
             IUnknown*      iface);
 
@@ -145 +144 @@
             REFIID           riid,
             void**           ppvObject);
-static ULONG WINAPI DefaultHandler_AddRef(
+static ULONG WINAPI DefaultHandler_AddRef( 
             IOleObject*        iface);
-static ULONG WINAPI DefaultHandler_Release(
+static ULONG WINAPI DefaultHandler_Release( 
             IOleObject*        iface);
 static HRESULT WINAPI DefaultHandler_SetClientSite(
-        IOleObject*        iface,
-        IOleClientSite*    pClientSite);
+            IOleObject*        iface,
+            IOleClientSite*    pClientSite);
 static HRESULT WINAPI DefaultHandler_GetClientSite(
-        IOleObject*        iface,
-        IOleClientSite**   ppClientSite);
+            IOleObject*        iface,
+            IOleClientSite**   ppClientSite);
 static HRESULT WINAPI DefaultHandler_SetHostNames(
-        IOleObject*        iface,
-        LPCOLESTR          szContainerApp,
-        LPCOLESTR          szContainerObj);
+            IOleObject*        iface,
+            LPCOLESTR          szContainerApp, 
+            LPCOLESTR          szContainerObj);
 static HRESULT WINAPI DefaultHandler_Close(
-        IOleObject*        iface,
-        DWORD              dwSaveOption);
+            IOleObject*        iface, 
+            DWORD              dwSaveOption);
 static HRESULT WINAPI DefaultHandler_SetMoniker(
-        IOleObject*        iface,
-        DWORD              dwWhichMoniker,
-        IMoniker*          pmk);
+            IOleObject*        iface, 
+            DWORD              dwWhichMoniker,
+            IMoniker*          pmk);
 static HRESULT WINAPI DefaultHandler_GetMoniker(
-        IOleObject*        iface,
-        DWORD              dwAssign,
-        DWORD              dwWhichMoniker,
-        IMoniker**         ppmk);
+            IOleObject*        iface,
+            DWORD              dwAssign,
+            DWORD              dwWhichMoniker,
+            IMoniker**         ppmk);
 static HRESULT WINAPI DefaultHandler_InitFromData(
-        IOleObject*        iface,
-        IDataObject*       pDataObject,
-        BOOL               fCreation,
-        DWORD              dwReserved);
+            IOleObject*        iface, 
+            IDataObject*       pDataObject, 
+            BOOL               fCreation,
+            DWORD              dwReserved);
 static HRESULT WINAPI DefaultHandler_GetClipboardData(
-        IOleObject*        iface,
-        DWORD              dwReserved,
-        IDataObject**      ppDataObject);
+            IOleObject*        iface, 
+            DWORD              dwReserved, 
+            IDataObject**      ppDataObject);
 static HRESULT WINAPI DefaultHandler_DoVerb(
-        IOleObject*        iface,
-        LONG               iVerb,
+            IOleObject*        iface, 
+            LONG               iVerb, 
 #ifdef __WIN32OS2__
-        LPMSG              lpmsg,
+            LPMSG              lpmsg, 
 #else
-        struct tagMSG*     lpmsg,
+            struct tagMSG*     lpmsg, 
 #endif
-        IOleClientSite*    pActiveSite,
-        LONG               lindex,
-        HWND               hwndParent,
-        LPCRECT            lprcPosRect);
+            IOleClientSite*    pActiveSite, 
+            LONG               lindex, 
+            HWND               hwndParent, 
+            LPCRECT            lprcPosRect);
 static HRESULT WINAPI DefaultHandler_EnumVerbs(
-        IOleObject*        iface,
-        IEnumOLEVERB**     ppEnumOleVerb);
+            IOleObject*        iface, 
+            IEnumOLEVERB**     ppEnumOleVerb);
 static HRESULT WINAPI DefaultHandler_Update(
-        IOleObject*        iface);
+            IOleObject*        iface);
 static HRESULT WINAPI DefaultHandler_IsUpToDate(
-        IOleObject*        iface);
+            IOleObject*        iface);
 static HRESULT WINAPI DefaultHandler_GetUserClassID(
-        IOleObject*        iface,
-        CLSID*             pClsid);
+            IOleObject*        iface, 
+            CLSID*             pClsid);
 static HRESULT WINAPI DefaultHandler_GetUserType(
-        IOleObject*        iface,
-        DWORD              dwFormOfType,
-        LPOLESTR*          pszUserType);
+            IOleObject*        iface, 
+            DWORD              dwFormOfType, 
+            LPOLESTR*          pszUserType);
 static HRESULT WINAPI DefaultHandler_SetExtent(
-        IOleObject*        iface,
-        DWORD              dwDrawAspect,
-        SIZEL*             psizel);
+            IOleObject*        iface, 
+            DWORD              dwDrawAspect, 
+            SIZEL*             psizel);
 static HRESULT WINAPI DefaultHandler_GetExtent(
-        IOleObject*        iface,
-        DWORD              dwDrawAspect,
-        SIZEL*             psizel);
+            IOleObject*        iface, 
+            DWORD              dwDrawAspect, 
+            SIZEL*             psizel);
 static HRESULT WINAPI DefaultHandler_Advise(
-        IOleObject*        iface,
-        IAdviseSink*       pAdvSink,
-        DWORD*             pdwConnection);
+            IOleObject*        iface, 
+            IAdviseSink*       pAdvSink, 
+            DWORD*             pdwConnection);
 static HRESULT WINAPI DefaultHandler_Unadvise(
-        IOleObject*        iface,
-        DWORD              dwConnection);
+            IOleObject*        iface, 
+            DWORD              dwConnection);
 static HRESULT WINAPI DefaultHandler_EnumAdvise(
-        IOleObject*        iface,
-        IEnumSTATDATA**    ppenumAdvise);
+            IOleObject*        iface, 
+            IEnumSTATDATA**    ppenumAdvise);
 static HRESULT WINAPI DefaultHandler_GetMiscStatus(
-        IOleObject*        iface,
-        DWORD              dwAspect,
-        DWORD*             pdwStatus);
+            IOleObject*        iface, 
+            DWORD              dwAspect, 
+            DWORD*             pdwStatus);
 static HRESULT WINAPI DefaultHandler_SetColorScheme(
-        IOleObject*           iface,
-        struct tagLOGPALETTE* pLogpal);
+            IOleObject*           iface,
+            struct tagLOGPALETTE* pLogpal);
 
 /*
@@ -240 +239 @@
             REFIID           riid,
             void**           ppvObject);
-static ULONG WINAPI DefaultHandler_IDataObject_AddRef(
+static ULONG WINAPI DefaultHandler_IDataObject_AddRef( 
             IDataObject*     iface);
-static ULONG WINAPI DefaultHandler_IDataObject_Release(
+static ULONG WINAPI DefaultHandler_IDataObject_Release( 
             IDataObject*     iface);
 static HRESULT WINAPI DefaultHandler_GetData(
-        IDataObject*     iface,
-        LPFORMATETC      pformatetcIn,
-        STGMEDIUM*       pmedium);
+            IDataObject*     iface,
+            LPFORMATETC      pformatetcIn, 
+            STGMEDIUM*       pmedium);
 static HRESULT WINAPI DefaultHandler_GetDataHere(
-        IDataObject*     iface,
-        LPFORMATETC      pformatetc,
-        STGMEDIUM*       pmedium);
+            IDataObject*     iface, 
+            LPFORMATETC      pformatetc,
+            STGMEDIUM*       pmedium);
 static HRESULT WINAPI DefaultHandler_QueryGetData(
-        IDataObject*     iface,
-        LPFORMATETC      pformatetc);
+            IDataObject*     iface,
+            LPFORMATETC      pformatetc);
 static HRESULT WINAPI DefaultHandler_GetCanonicalFormatEtc(
-        IDataObject*     iface,
-        LPFORMATETC      pformatectIn,
-        LPFORMATETC      pformatetcOut);
+            IDataObject*     iface, 
+            LPFORMATETC      pformatectIn, 
+            LPFORMATETC      pformatetcOut);
 static HRESULT WINAPI DefaultHandler_SetData(
-        IDataObject*     iface,
-        LPFORMATETC      pformatetc,
-        STGMEDIUM*       pmedium,
-        BOOL             fRelease);
+            IDataObject*     iface,
+            LPFORMATETC      pformatetc, 
+            STGMEDIUM*       pmedium, 
+            BOOL             fRelease);
 static HRESULT WINAPI DefaultHandler_EnumFormatEtc(
-        IDataObject*     iface,
-        DWORD            dwDirection,
-        IEnumFORMATETC** ppenumFormatEtc);
+            IDataObject*     iface,       
+            DWORD            dwDirection,
+            IEnumFORMATETC** ppenumFormatEtc);
 static HRESULT WINAPI DefaultHandler_DAdvise(
-        IDataObject*     iface,
-        FORMATETC*       pformatetc,
-        DWORD            advf,
-        IAdviseSink*     pAdvSink,
-        DWORD*           pdwConnection);
+            IDataObject*     iface, 
+            FORMATETC*       pformatetc, 
+            DWORD            advf, 
+            IAdviseSink*     pAdvSink, 
+            DWORD*           pdwConnection);
 static HRESULT WINAPI DefaultHandler_DUnadvise(
-        IDataObject*     iface,
-        DWORD            dwConnection);
+            IDataObject*     iface,
+            DWORD            dwConnection);
 static HRESULT WINAPI DefaultHandler_EnumDAdvise(
-        IDataObject*     iface,
-        IEnumSTATDATA**  ppenumAdvise);
+            IDataObject*     iface,
+            IEnumSTATDATA**  ppenumAdvise);
 
 /*
@@ -289 +288 @@
             REFIID               riid,
             void**               ppvObject);
-static ULONG WINAPI DefaultHandler_IRunnableObject_AddRef(
+static ULONG WINAPI DefaultHandler_IRunnableObject_AddRef( 
             IRunnableObject*     iface);
-static ULONG WINAPI DefaultHandler_IRunnableObject_Release(
+static ULONG WINAPI DefaultHandler_IRunnableObject_Release( 
             IRunnableObject*     iface);
-static HRESULT WINAPI DefaultHandler_GetRunningClass(
+static HRESULT WINAPI DefaultHandler_GetRunningClass( 
+            IRunnableObject*     iface,   
+            LPCLSID              lpClsid);
+static HRESULT WINAPI DefaultHandler_Run( 
             IRunnableObject*     iface,
-        LPCLSID              lpClsid);
-static HRESULT WINAPI DefaultHandler_Run(
-            IRunnableObject*     iface,
-        IBindCtx*            pbc);
-static BOOL    WINAPI DefaultHandler_IsRunning(
+            IBindCtx*            pbc);
+static BOOL    WINAPI DefaultHandler_IsRunning( 
             IRunnableObject*     iface);
-static HRESULT WINAPI DefaultHandler_LockRunning(
-            IRunnableObject*     iface,
-        BOOL                 fLock,
-        BOOL                 fLastUnlockCloses);
-static HRESULT WINAPI DefaultHandler_SetContainedObject(
-            IRunnableObject*     iface,
-        BOOL                 fContained);
+static HRESULT WINAPI DefaultHandler_LockRunning( 
+            IRunnableObject*     iface, 
+            BOOL                 fLock, 
+            BOOL                 fLastUnlockCloses);
+static HRESULT WINAPI DefaultHandler_SetContainedObject( 
+            IRunnableObject*     iface, 
+            BOOL                 fContained);
 
 
@@ -408 +407 @@
    * IUnknown pointer can be returned to the outside.
    */
-  if ( (pUnkOuter!=NULL) &&
+  if ( (pUnkOuter!=NULL) && 
        (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) != 0) )
     return CLASS_E_NOAGGREGATION;
@@ -415 +414 @@
    * Try to construct a new instance of the class.
    */
-  newHandler = DefaultHandler_Construct(clsid,
-                    pUnkOuter);
+  newHandler = DefaultHandler_Construct(clsid, 
+                                        pUnkOuter);
 
   if (newHandler == 0)
@@ -451 +450 @@
   if (newObject==0)
     return newObject;
-
+  
   /*
    * Initialize the virtual function table.
@@ -461 +460 @@
 
   /*
-   * Start with one reference count. The caller of this function
+   * Start with one reference count. The caller of this function 
    * must release the interface pointer when it is done.
    */
@@ -468 +467 @@
   /*
    * Initialize the outer unknown
-   * We don't keep a reference on the outer unknown since, the way
+   * We don't keep a reference on the outer unknown since, the way 
    * aggregation works, our lifetime is at least as large as it's
    * lifetime.
@@ -480 +479 @@
    * Create a datacache object.
    * We aggregate with the datacache. Make sure we pass our outer
-   * unknown as the datacache's outer unknown.
+   * unknown as the datacache's outer unknown. 
    */
   CreateDataCache(newObject->outerUnknown,
-          clsid,
-          &IID_IUnknown,
-          (void**)&newObject->dataCache);
+                  clsid,
+                  &IID_IUnknown,
+                  (void**)&newObject->dataCache);
 
   /*
@@ -517 +516 @@
     ptrToDestroy->containerObj = NULL;
   }
-
+  
   /*
    * Release our reference to the data cache.
@@ -586 +585 @@
   if ( (this==0) || (ppvObject==0) )
     return E_INVALIDARG;
-
+  
   /*
    * Initialize the return parameter.
@@ -595 +594 @@
    * Compare the riid with the interface IDs implemented by this object.
    */
-  if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0)
+  if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) 
   {
     *ppvObject = iface;
   }
-  else if (memcmp(&IID_IOleObject, riid, sizeof(IID_IOleObject)) == 0)
+  else if (memcmp(&IID_IOleObject, riid, sizeof(IID_IOleObject)) == 0) 
   {
     *ppvObject = (IOleObject*)&(this->lpvtbl1);
   }
-  else if (memcmp(&IID_IDataObject, riid, sizeof(IID_IDataObject)) == 0)
+  else if (memcmp(&IID_IDataObject, riid, sizeof(IID_IDataObject)) == 0) 
   {
     *ppvObject = (IDataObject*)&(this->lpvtbl3);
   }
-  else if (memcmp(&IID_IRunnableObject, riid, sizeof(IID_IRunnableObject)) == 0)
+  else if (memcmp(&IID_IRunnableObject, riid, sizeof(IID_IRunnableObject)) == 0) 
   {
     *ppvObject = (IRunnableObject*)&(this->lpvtbl4);
@@ -617 +616 @@
      */
     if (IUnknown_QueryInterface(this->dataCache, riid, ppvObject) == S_OK)
-    return S_OK;
-  }
-
+        return S_OK;
+  }
+  
   /*
    * Check that we obtained an interface.
@@ -628 +627 @@
     return E_NOINTERFACE;
   }
-
+  
   /*
    * Query Interface always increases the reference count by one when it is
-   * successful.
+   * successful. 
    */
   IUnknown_AddRef((IUnknown*)*ppvObject);
 
-  return S_OK;;
+  return S_OK;;  
 }
 
@@ -646 +645 @@
  * to the outer unknown.
  */
-static ULONG WINAPI DefaultHandler_NDIUnknown_AddRef(
+static ULONG WINAPI DefaultHandler_NDIUnknown_AddRef( 
             IUnknown*      iface)
 {
@@ -664 +663 @@
  * to the outer unknown.
  */
-static ULONG WINAPI DefaultHandler_NDIUnknown_Release(
+static ULONG WINAPI DefaultHandler_NDIUnknown_Release( 
             IUnknown*      iface)
 {
@@ -683 +682 @@
     return 0;
   }
-
+  
   return this->ref;
 }
@@ -704 +703 @@
   _ICOM_THIS_From_IOleObject(DefaultHandler, iface);
 
-  return IUnknown_QueryInterface(this->outerUnknown, riid, ppvObject);
+  return IUnknown_QueryInterface(this->outerUnknown, riid, ppvObject);  
 }
 
@@ -712 +711 @@
  * See Windows documentation for more details on IUnknown methods.
  */
-static ULONG WINAPI DefaultHandler_AddRef(
+static ULONG WINAPI DefaultHandler_AddRef( 
             IOleObject*        iface)
 {
@@ -725 +724 @@
  * See Windows documentation for more details on IUnknown methods.
  */
-static ULONG WINAPI DefaultHandler_Release(
+static ULONG WINAPI DefaultHandler_Release( 
             IOleObject*        iface)
 {
@@ -742 +741 @@
  */
 static HRESULT WINAPI DefaultHandler_SetClientSite(
-        IOleObject*        iface,
-        IOleClientSite*    pClientSite)
+            IOleObject*        iface,
+            IOleClientSite*    pClientSite)
 {
   _ICOM_THIS_From_IOleObject(DefaultHandler, iface);
@@ -777 +776 @@
  */
 static HRESULT WINAPI DefaultHandler_GetClientSite(
-        IOleObject*        iface,
-        IOleClientSite**   ppClientSite)
+            IOleObject*        iface,
+            IOleClientSite**   ppClientSite)
 {
   _ICOM_THIS_From_IOleObject(DefaultHandler, iface);
@@ -807 +806 @@
  */
 static HRESULT WINAPI DefaultHandler_SetHostNames(
-        IOleObject*        iface,
-        LPCOLESTR          szContainerApp,
-        LPCOLESTR          szContainerObj)
+            IOleObject*        iface,
+            LPCOLESTR          szContainerApp, 
+            LPCOLESTR          szContainerObj)
 {
   _ICOM_THIS_From_IOleObject(DefaultHandler, iface);
 
   TRACE("(%p, %s, %s)\n",
-    iface,
-    debugstr_w(szContainerApp),
-    debugstr_w(szContainerObj));
+        iface,
+        debugstr_w(szContainerApp), 
+        debugstr_w(szContainerObj));
 
   /*
    * Be sure to cleanup before re-assinging the strings.
-   */
+   */ 
   if (this->containerApp!=NULL)
   {
@@ -861 +860 @@
  */
 static HRESULT WINAPI DefaultHandler_Close(
-        IOleObject*        iface,
-        DWORD              dwSaveOption)
+            IOleObject*        iface, 
+            DWORD              dwSaveOption)
 {
   TRACE("()\n");
@@ -876 +875 @@
  */
 static HRESULT WINAPI DefaultHandler_SetMoniker(
-        IOleObject*        iface,
-        DWORD              dwWhichMoniker,
-        IMoniker*          pmk)
+            IOleObject*        iface, 
+            DWORD              dwWhichMoniker,
+            IMoniker*          pmk)
 {
   TRACE("(%p, %ld, %p)\n",
-    iface,
-    dwWhichMoniker,
-    pmk);
+        iface, 
+        dwWhichMoniker, 
+        pmk);
 
   return S_OK;
@@ -896 +895 @@
  */
 static HRESULT WINAPI DefaultHandler_GetMoniker(
-        IOleObject*        iface,
-        DWORD              dwAssign,
-        DWORD              dwWhichMoniker,
-        IMoniker**         ppmk)
+            IOleObject*        iface,
+            DWORD              dwAssign,
+            DWORD              dwWhichMoniker,
+            IMoniker**         ppmk)
 {
   _ICOM_THIS_From_IOleObject(DefaultHandler, iface);
 
   TRACE("(%p, %ld, %ld, %p)\n",
-    iface, dwAssign, dwWhichMoniker, ppmk);
+        iface, dwAssign, dwWhichMoniker, ppmk);
 
   if (this->clientSite)
   {
     return IOleClientSite_GetMoniker(this->clientSite,
-                     dwAssign,
-                     dwWhichMoniker,
-                     ppmk);
-
+                                     dwAssign,
+                                     dwWhichMoniker,
+                                     ppmk);
+                              
   }
 
@@ -922 +921 @@
  *
  * This method is meaningless if the server is not running
- *
+ * 
  * See Windows documentation for more details on IOleObject methods.
  */
 static HRESULT WINAPI DefaultHandler_InitFromData(
-        IOleObject*        iface,
-        IDataObject*       pDataObject,
-        BOOL               fCreation,
-        DWORD              dwReserved)
+            IOleObject*        iface, 
+            IDataObject*       pDataObject, 
+            BOOL               fCreation,
+            DWORD              dwReserved)
 {
   TRACE("(%p, %p, %d, %ld)\n",
-    iface, pDataObject, fCreation, dwReserved);
+        iface, pDataObject, fCreation, dwReserved);
 
   return OLE_E_NOTRUNNING;
@@ -941 +940 @@
  *
  * This method is meaningless if the server is not running
- *
+ * 
  * See Windows documentation for more details on IOleObject methods.
  */
 static HRESULT WINAPI DefaultHandler_GetClipboardData(
-        IOleObject*        iface,
-        DWORD              dwReserved,
-        IDataObject**      ppDataObject)
+            IOleObject*        iface, 
+            DWORD              dwReserved, 
+            IDataObject**      ppDataObject)
 {
   TRACE("(%p, %ld, %p)\n",
-    iface, dwReserved, ppDataObject);
+        iface, dwReserved, ppDataObject);
 
   return OLE_E_NOTRUNNING;
@@ -956 +955 @@
 
 static HRESULT WINAPI DefaultHandler_DoVerb(
-        IOleObject*        iface,
-        LONG               iVerb,
+            IOleObject*        iface, 
+            LONG               iVerb, 
 #ifdef __WIN32OS2__
-        LPMSG              lpmsg,
+            LPMSG              lpmsg, 
 #else
-        struct tagMSG*     lpmsg,
+            struct tagMSG*     lpmsg, 
 #endif
-        IOleClientSite*    pActiveSite,
-        LONG               lindex,
-        HWND               hwndParent,
-        LPCRECT            lprcPosRect)
+            IOleClientSite*    pActiveSite, 
+            LONG               lindex, 
+            HWND               hwndParent, 
+            LPCRECT            lprcPosRect)
 {
   FIXME(": Stub\n");
@@ -977 +976 @@
  * The default handler implementation of this method simply delegates
  * to OleRegEnumVerbs
- *
+ * 
  * See Windows documentation for more details on IOleObject methods.
  */
 static HRESULT WINAPI DefaultHandler_EnumVerbs(
-        IOleObject*        iface,
-        IEnumOLEVERB**     ppEnumOleVerb)
+            IOleObject*        iface, 
+            IEnumOLEVERB**     ppEnumOleVerb)
 {
   _ICOM_THIS_From_IOleObject(DefaultHandler, iface);
@@ -992 +991 @@
 
 static HRESULT WINAPI DefaultHandler_Update(
-        IOleObject*        iface)
+            IOleObject*        iface)
 {
   FIXME(": Stub\n");
@@ -1002 +1001 @@
  *
  * This method is meaningless if the server is not running
- *
+ * 
  * See Windows documentation for more details on IOleObject methods.
  */
 static HRESULT WINAPI DefaultHandler_IsUpToDate(
-        IOleObject*        iface)
+            IOleObject*        iface)
 {
   TRACE("(%p)\n", iface);
@@ -1017 +1016 @@
  *
  * TODO: Map to a new class ID if emulation is active.
- *
+ * 
  * See Windows documentation for more details on IOleObject methods.
  */
 static HRESULT WINAPI DefaultHandler_GetUserClassID(
-        IOleObject*        iface,
-        CLSID*             pClsid)
+            IOleObject*        iface, 
+            CLSID*             pClsid)
 {
   _ICOM_THIS_From_IOleObject(DefaultHandler, iface);
@@ -1044 +1043 @@
  * The default handler implementation of this method simply delegates
  * to OleRegGetUserType
- *
+ * 
  * See Windows documentation for more details on IOleObject methods.
  */
 static HRESULT WINAPI DefaultHandler_GetUserType(
-        IOleObject*        iface,
-        DWORD              dwFormOfType,
-        LPOLESTR*          pszUserType)
+            IOleObject*        iface, 
+            DWORD              dwFormOfType, 
+            LPOLESTR*          pszUserType)
 {
   _ICOM_THIS_From_IOleObject(DefaultHandler, iface);
@@ -1067 +1066 @@
  */
 static HRESULT WINAPI DefaultHandler_SetExtent(
-        IOleObject*        iface,
-        DWORD              dwDrawAspect,
-        SIZEL*             psizel)
+            IOleObject*        iface, 
+            DWORD              dwDrawAspect, 
+            SIZEL*             psizel)
 {
   TRACE("(%p, %lx, (%ld x %ld))\n", iface,
@@ -1085 +1084 @@
  */
 static HRESULT WINAPI DefaultHandler_GetExtent(
-        IOleObject*        iface,
-        DWORD              dwDrawAspect,
-        SIZEL*             psizel)
+            IOleObject*        iface, 
+            DWORD              dwDrawAspect, 
+            SIZEL*             psizel)
 {
   DVTARGETDEVICE* targetDevice;
@@ -1093 +1092 @@
   HRESULT         hres;
 
-  _ICOM_THIS_From_IOleObject(DefaultHandler, iface);
+  _ICOM_THIS_From_IOleObject(DefaultHandler, iface);  
 
   TRACE("(%p, %lx, %p)\n", iface, dwDrawAspect, psizel);
@@ -1106 +1105 @@
    *
    * Here we would build a valid DVTARGETDEVICE structure
-   * but, since we are calling into the data cache, we
-   * know it's implementation and we'll skip this
+   * but, since we are calling into the data cache, we 
+   * know it's implementation and we'll skip this 
    * extra work until later.
    */
@@ -1113 +1112 @@
 
   hres = IViewObject2_GetExtent(cacheView,
-                dwDrawAspect,
-                -1,
-                targetDevice,
-                psizel);
+                                dwDrawAspect,
+                                -1,
+                                targetDevice,
+                                psizel);
 
   /*
@@ -1135 +1134 @@
  */
 static HRESULT WINAPI DefaultHandler_Advise(
-        IOleObject*        iface,
-        IAdviseSink*       pAdvSink,
-        DWORD*             pdwConnection)
+            IOleObject*        iface, 
+            IAdviseSink*       pAdvSink, 
+            DWORD*             pdwConnection)
 {
   HRESULT hres = S_OK;
-  _ICOM_THIS_From_IOleObject(DefaultHandler, iface);
+  _ICOM_THIS_From_IOleObject(DefaultHandler, iface);  
 
   TRACE("(%p, %p, %p)\n", iface, pAdvSink, pdwConnection);
@@ -1154 +1153 @@
   if (SUCCEEDED(hres))
   {
-    hres = IOleAdviseHolder_Advise(this->oleAdviseHolder,
-                   pAdvSink,
-                   pdwConnection);
+    hres = IOleAdviseHolder_Advise(this->oleAdviseHolder, 
+                                   pAdvSink, 
+                                   pdwConnection);
   }
 
@@ -1171 +1170 @@
  */
 static HRESULT WINAPI DefaultHandler_Unadvise(
-        IOleObject*        iface,
-        DWORD              dwConnection)
-{
-  _ICOM_THIS_From_IOleObject(DefaultHandler, iface);
+            IOleObject*        iface, 
+            DWORD              dwConnection)
+{
+  _ICOM_THIS_From_IOleObject(DefaultHandler, iface);  
 
   TRACE("(%p, %ld)\n", iface, dwConnection);
@@ -1186 +1185 @@
 
   return IOleAdviseHolder_Unadvise(this->oleAdviseHolder,
-                   dwConnection);
+                                   dwConnection);
 }
 
@@ -1198 +1197 @@
  */
 static HRESULT WINAPI DefaultHandler_EnumAdvise(
-        IOleObject*        iface,
-        IEnumSTATDATA**    ppenumAdvise)
-{
-  _ICOM_THIS_From_IOleObject(DefaultHandler, iface);
+            IOleObject*        iface, 
+            IEnumSTATDATA**    ppenumAdvise)
+{
+  _ICOM_THIS_From_IOleObject(DefaultHandler, iface);  
 
   TRACE("(%p, %p)\n", iface, ppenumAdvise);
@@ -1218 +1217 @@
   if (this->oleAdviseHolder==NULL)
     return IOleAdviseHolder_EnumAdvise(this->oleAdviseHolder,
-                       ppenumAdvise);
+                                       ppenumAdvise);
 
   return S_OK;
@@ -1232 +1231 @@
  */
 static HRESULT WINAPI DefaultHandler_GetMiscStatus(
-        IOleObject*        iface,
-        DWORD              dwAspect,
-        DWORD*             pdwStatus)
+            IOleObject*        iface, 
+            DWORD              dwAspect, 
+            DWORD*             pdwStatus)
 {
   HRESULT hres;
@@ -1257 +1256 @@
  */
 static HRESULT WINAPI DefaultHandler_SetColorScheme(
-        IOleObject*           iface,
-        struct tagLOGPALETTE* pLogpal)
+            IOleObject*           iface,
+            struct tagLOGPALETTE* pLogpal)
 {
   TRACE("(%p, %p))\n", iface, pLogpal);
@@ -1275 +1274 @@
  */
 static HRESULT WINAPI DefaultHandler_IDataObject_QueryInterface(
-            IDataObject*     iface,
+            IDataObject*     iface, 
            REFIID           riid,
             void**           ppvObject)
@@ -1281 +1280 @@
   _ICOM_THIS_From_IDataObject(DefaultHandler, iface);
 
-  return IUnknown_QueryInterface(this->outerUnknown, riid, ppvObject);
+  return IUnknown_QueryInterface(this->outerUnknown, riid, ppvObject);  
 }
 
@@ -1289 +1288 @@
  * See Windows documentation for more details on IUnknown methods.
  */
-static ULONG WINAPI DefaultHandler_IDataObject_AddRef(
+static ULONG WINAPI DefaultHandler_IDataObject_AddRef( 
             IDataObject*     iface)
 {
   _ICOM_THIS_From_IDataObject(DefaultHandler, iface);
 
-  return IUnknown_AddRef(this->outerUnknown);
+  return IUnknown_AddRef(this->outerUnknown);  
 }
 
@@ -1302 +1301 @@
  * See Windows documentation for more details on IUnknown methods.
  */
-static ULONG WINAPI DefaultHandler_IDataObject_Release(
+static ULONG WINAPI DefaultHandler_IDataObject_Release( 
             IDataObject*     iface)
 {
   _ICOM_THIS_From_IDataObject(DefaultHandler, iface);
 
-  return IUnknown_Release(this->outerUnknown);
+  return IUnknown_Release(this->outerUnknown);  
 }
 
@@ -1318 +1317 @@
  */
 static HRESULT WINAPI DefaultHandler_GetData(
-        IDataObject*     iface,
-        LPFORMATETC      pformatetcIn,
-        STGMEDIUM*       pmedium)
+            IDataObject*     iface,
+            LPFORMATETC      pformatetcIn, 
+            STGMEDIUM*       pmedium)
 {
   IDataObject* cacheDataObject = NULL;
@@ -1329 +1328 @@
   TRACE("(%p, %p, %p)\n", iface, pformatetcIn, pmedium);
 
-  hres = IUnknown_QueryInterface(this->dataCache,
-                 &IID_IDataObject,
-                 (void**)&cacheDataObject);
+  hres = IUnknown_QueryInterface(this->dataCache, 
+                                 &IID_IDataObject,
+                                 (void**)&cacheDataObject);
 
   if (FAILED(hres))
@@ -1337 +1336 @@
 
   hres = IDataObject_GetData(cacheDataObject,
-                 pformatetcIn,
-                 pmedium);
-
+                             pformatetcIn,
+                             pmedium);
+  
   IDataObject_Release(cacheDataObject);
-
+  
   return hres;
 }
 
 static HRESULT WINAPI DefaultHandler_GetDataHere(
-        IDataObject*     iface,
-        LPFORMATETC      pformatetc,
-        STGMEDIUM*       pmedium)
+            IDataObject*     iface, 
+            LPFORMATETC      pformatetc,
+            STGMEDIUM*       pmedium)
 {
   FIXME(": Stub\n");
@@ -1357 +1356 @@
  * DefaultHandler_QueryGetData (IDataObject)
  *
- * The default handler's implementation of this method delegates to
+ * The default handler's implementation of this method delegates to 
  * the cache.
  *
@@ -1363 +1362 @@
  */
 static HRESULT WINAPI DefaultHandler_QueryGetData(
-        IDataObject*     iface,
-        LPFORMATETC      pformatetc)
+            IDataObject*     iface,
+            LPFORMATETC      pformatetc)
 {
   IDataObject* cacheDataObject = NULL;
@@ -1373 +1372 @@
   TRACE("(%p, %p)\n", iface, pformatetc);
 
-  hres = IUnknown_QueryInterface(this->dataCache,
-                 &IID_IDataObject,
-                 (void**)&cacheDataObject);
+  hres = IUnknown_QueryInterface(this->dataCache, 
+                                 &IID_IDataObject,
+                                 (void**)&cacheDataObject);
 
   if (FAILED(hres))
@@ -1381 +1380 @@
 
   hres = IDataObject_QueryGetData(cacheDataObject,
-                  pformatetc);
+                                  pformatetc);
 
   IDataObject_Release(cacheDataObject);
-
+  
   return hres;
 }
@@ -1396 +1395 @@
  */
 static HRESULT WINAPI DefaultHandler_GetCanonicalFormatEtc(
-        IDataObject*     iface,
-        LPFORMATETC      pformatectIn,
-        LPFORMATETC      pformatetcOut)
+            IDataObject*     iface, 
+            LPFORMATETC      pformatectIn, 
+            LPFORMATETC      pformatetcOut)
 {
   FIXME("(%p, %p, %p)\n", iface, pformatectIn, pformatetcOut);
@@ -1408 +1407 @@
  * DefaultHandler_SetData (IDataObject)
  *
- * The default handler's implementation of this method delegates to
+ * The default handler's implementation of this method delegates to 
  * the cache.
  *
@@ -1414 +1413 @@
  */
 static HRESULT WINAPI DefaultHandler_SetData(
-        IDataObject*     iface,
-        LPFORMATETC      pformatetc,
-        STGMEDIUM*       pmedium,
-        BOOL             fRelease)
+            IDataObject*     iface,
+            LPFORMATETC      pformatetc, 
+            STGMEDIUM*       pmedium, 
+            BOOL             fRelease)
 {
   IDataObject* cacheDataObject = NULL;
@@ -1426 +1425 @@
   TRACE("(%p, %p, %p, %d)\n", iface, pformatetc, pmedium, fRelease);
 
-  hres = IUnknown_QueryInterface(this->dataCache,
-                 &IID_IDataObject,
-                 (void**)&cacheDataObject);
+  hres = IUnknown_QueryInterface(this->dataCache, 
+                                 &IID_IDataObject,
+                                 (void**)&cacheDataObject);
 
   if (FAILED(hres))
@@ -1434 +1433 @@
 
   hres = IDataObject_SetData(cacheDataObject,
-                 pformatetc,
-                 pmedium,
-                 fRelease);
-
+                             pformatetc,
+                             pmedium,
+                             fRelease);
+  
   IDataObject_Release(cacheDataObject);
-
+  
   return hres;
 }
@@ -1452 +1451 @@
  */
 static HRESULT WINAPI DefaultHandler_EnumFormatEtc(
-        IDataObject*     iface,
-        DWORD            dwDirection,
-        IEnumFORMATETC** ppenumFormatEtc)
+            IDataObject*     iface,       
+            DWORD            dwDirection,
+            IEnumFORMATETC** ppenumFormatEtc)
 {
   HRESULT hres;
@@ -1475 +1474 @@
  */
 static HRESULT WINAPI DefaultHandler_DAdvise(
-        IDataObject*     iface,
-        FORMATETC*       pformatetc,
-        DWORD            advf,
-        IAdviseSink*     pAdvSink,
-        DWORD*           pdwConnection)
+            IDataObject*     iface, 
+            FORMATETC*       pformatetc, 
+            DWORD            advf, 
+            IAdviseSink*     pAdvSink, 
+            DWORD*           pdwConnection)
 {
   HRESULT hres = S_OK;
-  _ICOM_THIS_From_IDataObject(DefaultHandler, iface);
-
-  TRACE("(%p, %p, %ld, %p, %p)\n",
-    iface, pformatetc, advf, pAdvSink, pdwConnection);
+  _ICOM_THIS_From_IDataObject(DefaultHandler, iface);  
+
+  TRACE("(%p, %p, %ld, %p, %p)\n", 
+        iface, pformatetc, advf, pAdvSink, pdwConnection);
 
   /*
@@ -1497 +1496 @@
   if (SUCCEEDED(hres))
   {
-    hres = IDataAdviseHolder_Advise(this->dataAdviseHolder,
-                    iface,
-                    pformatetc,
-                    advf,
-                    pAdvSink,
-                    pdwConnection);
+    hres = IDataAdviseHolder_Advise(this->dataAdviseHolder, 
+                                    iface,
+                                    pformatetc, 
+                                    advf, 
+                                    pAdvSink, 
+                                    pdwConnection);
   }
 
@@ -1517 +1516 @@
  */
 static HRESULT WINAPI DefaultHandler_DUnadvise(
-        IDataObject*     iface,
-        DWORD            dwConnection)
-{
-  _ICOM_THIS_From_IDataObject(DefaultHandler, iface);
+            IDataObject*     iface,
+            DWORD            dwConnection)
+{
+  _ICOM_THIS_From_IDataObject(DefaultHandler, iface);  
 
   TRACE("(%p, %ld)\n", iface, dwConnection);
@@ -1533 +1532 @@
   }
 
-  return IDataAdviseHolder_Unadvise(this->dataAdviseHolder,
-                    dwConnection);
+  return IDataAdviseHolder_Unadvise(this->dataAdviseHolder, 
+                                    dwConnection);
 }
 
@@ -1546 +1545 @@
  */
 static HRESULT WINAPI DefaultHandler_EnumDAdvise(
-        IDataObject*     iface,
-        IEnumSTATDATA**  ppenumAdvise)
-{
-  _ICOM_THIS_From_IDataObject(DefaultHandler, iface);
+            IDataObject*     iface,
+            IEnumSTATDATA**  ppenumAdvise)
+{
+  _ICOM_THIS_From_IDataObject(DefaultHandler, iface);  
 
   TRACE("(%p, %p)\n", iface, ppenumAdvise);
@@ -1569 +1568 @@
   if (this->dataAdviseHolder!=NULL)
   {
-    return IDataAdviseHolder_EnumAdvise(this->dataAdviseHolder,
-                    ppenumAdvise);
+    return IDataAdviseHolder_EnumAdvise(this->dataAdviseHolder, 
+                                        ppenumAdvise);
   }
 
@@ -1577 +1576 @@
 
 /*********************************************************
- * Methods implementation for the IRunnableObject part
+ * Methods implementation for the IRunnableObject part 
  * of the DefaultHandler class.
  */
@@ -1593 +1592 @@
   _ICOM_THIS_From_IRunnableObject(DefaultHandler, iface);
 
-  return IUnknown_QueryInterface(this->outerUnknown, riid, ppvObject);
+  return IUnknown_QueryInterface(this->outerUnknown, riid, ppvObject);  
 }
 
@@ -1601 +1600 @@
  * See Windows documentation for more details on IUnknown methods.
  */
-static ULONG WINAPI DefaultHandler_IRunnableObject_AddRef(
+static ULONG WINAPI DefaultHandler_IRunnableObject_AddRef( 
             IRunnableObject*     iface)
 {
@@ -1614 +1613 @@
  * See Windows documentation for more details on IUnknown methods.
  */
-static ULONG WINAPI DefaultHandler_IRunnableObject_Release(
+static ULONG WINAPI DefaultHandler_IRunnableObject_Release( 
             IRunnableObject*     iface)
 {
@@ -1625 +1624 @@
  * DefaultHandler_GetRunningClass (IRunnableObject)
  *
- * According to Brockscmidt, Chapter 19, the default handler's
+ * According to Brockscmidt, Chapter 19, the default handler's 
  * implementation of IRunnableobject does nothing until the object
  * is actually running.
@@ -1631 +1630 @@
  * See Windows documentation for more details on IRunnableObject methods.
  */
-static HRESULT WINAPI DefaultHandler_GetRunningClass(
-            IRunnableObject*     iface,
-        LPCLSID              lpClsid)
+static HRESULT WINAPI DefaultHandler_GetRunningClass( 
+            IRunnableObject*     iface,   
+            LPCLSID              lpClsid)
 {
   TRACE("()\n");
@@ -1639 +1638 @@
 }
 
-static HRESULT WINAPI DefaultHandler_Run(
+static HRESULT WINAPI DefaultHandler_Run( 
             IRunnableObject*     iface,
-        IBindCtx*            pbc)
+            IBindCtx*            pbc)
 {
   FIXME(": Stub\n");
@@ -1650 +1649 @@
  * DefaultHandler_IsRunning (IRunnableObject)
  *
- * According to Brockscmidt, Chapter 19, the default handler's
+ * According to Brockscmidt, Chapter 19, the default handler's 
  * implementation of IRunnableobject does nothing until the object
  * is actually running.
@@ -1656 +1655 @@
  * See Windows documentation for more details on IRunnableObject methods.
  */
-static BOOL    WINAPI DefaultHandler_IsRunning(
+static BOOL    WINAPI DefaultHandler_IsRunning( 
             IRunnableObject*     iface)
 {
@@ -1666 +1665 @@
  * DefaultHandler_LockRunning (IRunnableObject)
  *
- * According to Brockscmidt, Chapter 19, the default handler's
+ * According to Brockscmidt, Chapter 19, the default handler's 
  * implementation of IRunnableobject does nothing until the object
  * is actually running.
@@ -1672 +1671 @@
  * See Windows documentation for more details on IRunnableObject methods.
  */
-static HRESULT WINAPI DefaultHandler_LockRunning(
-            IRunnableObject*     iface,
-        BOOL                 fLock,
-        BOOL                 fLastUnlockCloses)
+static HRESULT WINAPI DefaultHandler_LockRunning( 
+            IRunnableObject*     iface, 
+            BOOL                 fLock, 
+            BOOL                 fLastUnlockCloses)
 {
   TRACE("()\n");
@@ -1684 +1683 @@
  * DefaultHandler_SetContainedObject (IRunnableObject)
  *
- * According to Brockscmidt, Chapter 19, the default handler's
+ * According to Brockscmidt, Chapter 19, the default handler's 
  * implementation of IRunnableobject does nothing until the object
  * is actually running.
@@ -1690 +1689 @@
  * See Windows documentation for more details on IRunnableObject methods.
  */
-static HRESULT WINAPI DefaultHandler_SetContainedObject(
-            IRunnableObject*     iface,
-        BOOL                 fContained)
+static HRESULT WINAPI DefaultHandler_SetContainedObject( 
+            IRunnableObject*     iface, 
+            BOOL                 fContained)
 {
   TRACE("()\n");

trunk/src/ole32/errorinfo.c

@@ -1 @@
-/* $Id: errorinfo.c,v 1.3 2001-09-05 13:17:09 bird Exp $ */
 /*
  * ErrorInfo API
@@ -6 +5 @@
  *
  *
- * The errorinfo is a per-thread object. The reference is stored in the
+ * The errorinfo is a per-thread object. The reference is stored in the 
  * TEB at offset 0xf80
  */
@@ -31 +30 @@
     WCHAR* stringBuffer;
     DWORD len;
-
+    
     if (in == NULL)
-    return NULL;
+        return NULL;
     /*
      * Find the lenth of the buffer passed-in in bytes.
@@ -90 +89 @@
 {
     DWORD* bufferPointer;
-
+    
     /* NULL is a valid parameter */
     if(!in) return;
@@ -112 +111 @@
 typedef struct ErrorInfoImpl
 {
-    ICOM_VTABLE(IErrorInfo)     *lpvtei;
-    ICOM_VTABLE(ICreateErrorInfo)   *lpvtcei;
-    ICOM_VTABLE(ISupportErrorInfo)  *lpvtsei;
-    DWORD               ref;
-
-    GUID m_Guid;
-    BSTR bstrSource;
-    BSTR bstrDescription;
-    BSTR bstrHelpFile;
-    DWORD m_dwHelpContext;
+        ICOM_VTABLE(IErrorInfo)         *lpvtei;
+        ICOM_VTABLE(ICreateErrorInfo)   *lpvtcei;
+        ICOM_VTABLE(ISupportErrorInfo)  *lpvtsei;
+        DWORD                           ref;
+        
+        GUID m_Guid;
+        BSTR bstrSource;
+        BSTR bstrDescription;
+        BSTR bstrHelpFile;
+        DWORD m_dwHelpContext;
 } ErrorInfoImpl;
 
-static ICOM_VTABLE(IErrorInfo)      IErrorInfoImpl_VTable;
-static ICOM_VTABLE(ICreateErrorInfo)    ICreateErrorInfoImpl_VTable;
-static ICOM_VTABLE(ISupportErrorInfo)   ISupportErrorInfoImpl_VTable;
+static ICOM_VTABLE(IErrorInfo)          IErrorInfoImpl_VTable;
+static ICOM_VTABLE(ICreateErrorInfo)    ICreateErrorInfoImpl_VTable;
+static ICOM_VTABLE(ISupportErrorInfo)   ISupportErrorInfoImpl_VTable;
 
 /*
  converts a objectpointer to This
  */
-#define _IErrorInfo_Offset ((int)(&(((ErrorInfoImpl*)0)->lpvtei)))
-#define _ICOM_THIS_From_IErrorInfo(class, name) class* This = (class*)(((char*)name)-_IErrorInfo_Offset);
-
-#define _ICreateErrorInfo_Offset ((int)(&(((ErrorInfoImpl*)0)->lpvtcei)))
-#define _ICOM_THIS_From_ICreateErrorInfo(class, name) class* This = (class*)(((char*)name)-_ICreateErrorInfo_Offset);
-
-#define _ISupportErrorInfo_Offset ((int)(&(((ErrorInfoImpl*)0)->lpvtsei)))
-#define _ICOM_THIS_From_ISupportErrorInfo(class, name) class* This = (class*)(((char*)name)-_ISupportErrorInfo_Offset);
+#define _IErrorInfo_Offset ((int)(&(((ErrorInfoImpl*)0)->lpvtei))) 
+#define _ICOM_THIS_From_IErrorInfo(class, name) class* This = (class*)(((char*)name)-_IErrorInfo_Offset); 
+
+#define _ICreateErrorInfo_Offset ((int)(&(((ErrorInfoImpl*)0)->lpvtcei))) 
+#define _ICOM_THIS_From_ICreateErrorInfo(class, name) class* This = (class*)(((char*)name)-_ICreateErrorInfo_Offset); 
+
+#define _ISupportErrorInfo_Offset ((int)(&(((ErrorInfoImpl*)0)->lpvtsei))) 
+#define _ICOM_THIS_From_ISupportErrorInfo(class, name) class* This = (class*)(((char*)name)-_ISupportErrorInfo_Offset); 
 
 /*
  converts This to a objectpointer
  */
-#define _IErrorInfo_(This)      (IErrorInfo*)&(This->lpvtei)
-#define _ICreateErrorInfo_(This)    (ICreateErrorInfo*)&(This->lpvtcei)
-#define _ISupportErrorInfo_(This)   (ISupportErrorInfo*)&(This->lpvtsei)
+#define _IErrorInfo_(This)              (IErrorInfo*)&(This->lpvtei)
+#define _ICreateErrorInfo_(This)        (ICreateErrorInfo*)&(This->lpvtcei)
+#define _ISupportErrorInfo_(This)       (ISupportErrorInfo*)&(This->lpvtsei)
 
 IErrorInfo * IErrorInfoImpl_Constructor()
 {
-    ErrorInfoImpl * ei = HeapAlloc(GetProcessHeap(), 0, sizeof(ErrorInfoImpl));
-    if (ei)
-    {
-      ei->lpvtei = &IErrorInfoImpl_VTable;
-      ei->lpvtcei = &ICreateErrorInfoImpl_VTable;
-      ei->lpvtsei = &ISupportErrorInfoImpl_VTable;
-      ei->ref = 1;
-      ei->bstrSource = NULL;
-      ei->bstrDescription = NULL;
-      ei->bstrHelpFile = NULL;
-      ei->m_dwHelpContext = 0;
-    }
-    return (IErrorInfo *)ei;
+        ErrorInfoImpl * ei = HeapAlloc(GetProcessHeap(), 0, sizeof(ErrorInfoImpl));
+        if (ei)
+        {
+          ei->lpvtei = &IErrorInfoImpl_VTable;
+          ei->lpvtcei = &ICreateErrorInfoImpl_VTable;
+          ei->lpvtsei = &ISupportErrorInfoImpl_VTable;
+          ei->ref = 1;
+          ei->bstrSource = NULL;
+          ei->bstrDescription = NULL;
+          ei->bstrHelpFile = NULL;
+          ei->m_dwHelpContext = 0;
+        }
+        return (IErrorInfo *)ei;
 }
 
 
 static HRESULT WINAPI IErrorInfoImpl_QueryInterface(
-    IErrorInfo* iface,
-    REFIID     riid,
-    VOID**     ppvoid)
-{
-    _ICOM_THIS_From_IErrorInfo(ErrorInfoImpl, iface);
-    TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvoid);
-
-    *ppvoid = NULL;
-
-    if(IsEqualIID(riid, &IID_IErrorInfo))
-    {
-      *ppvoid = _IErrorInfo_(This);
-    }
-    else if(IsEqualIID(riid, &IID_ICreateErrorInfo))
-    {
-      *ppvoid = _ICreateErrorInfo_(This);
-    }
-    else if(IsEqualIID(riid, &IID_ISupportErrorInfo))
-    {
-      *ppvoid = _ISupportErrorInfo_(This);
-    }
-
-    if(*ppvoid)
-    {
-      IUnknown_AddRef( (IUnknown*)*ppvoid );
-      TRACE("-- Interface: (%p)->(%p)\n",ppvoid,*ppvoid);
-      return S_OK;
-    }
-    TRACE("-- Interface: E_NOINTERFACE\n");
-    return E_NOINTERFACE;
+        IErrorInfo* iface,
+        REFIID     riid,
+        VOID**     ppvoid)
+{
+        _ICOM_THIS_From_IErrorInfo(ErrorInfoImpl, iface);
+        TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvoid);
+
+        *ppvoid = NULL;
+
+        if(IsEqualIID(riid, &IID_IErrorInfo))
+        {
+          *ppvoid = _IErrorInfo_(This); 
+        }
+        else if(IsEqualIID(riid, &IID_ICreateErrorInfo))
+        {
+          *ppvoid = _ICreateErrorInfo_(This);
+        }
+        else if(IsEqualIID(riid, &IID_ISupportErrorInfo))
+        {
+          *ppvoid = _ISupportErrorInfo_(This);
+        }
+
+        if(*ppvoid)
+        {
+          IUnknown_AddRef( (IUnknown*)*ppvoid );
+          TRACE("-- Interface: (%p)->(%p)\n",ppvoid,*ppvoid);
+          return S_OK;
+        }
+        TRACE("-- Interface: E_NOINTERFACE\n");
+        return E_NOINTERFACE;
 }
 
 static ULONG WINAPI IErrorInfoImpl_AddRef(
-    IErrorInfo* iface)
-{
-    _ICOM_THIS_From_IErrorInfo(ErrorInfoImpl, iface);
-    TRACE("(%p)->(count=%lu)\n",This,This->ref);
-    return InterlockedIncrement(&This->ref);
+        IErrorInfo* iface)
+{
+        _ICOM_THIS_From_IErrorInfo(ErrorInfoImpl, iface);
+        TRACE("(%p)->(count=%lu)\n",This,This->ref);
+        return InterlockedIncrement(&This->ref);
 }
 
 static ULONG WINAPI IErrorInfoImpl_Release(
-    IErrorInfo* iface)
-{
-    _ICOM_THIS_From_IErrorInfo(ErrorInfoImpl, iface);
-    TRACE("(%p)->(count=%lu)\n",This,This->ref);
-
-    if (!InterlockedDecrement(&This->ref))
-    {
-      TRACE("-- destroying IErrorInfo(%p)\n",This);
-      HeapFree(GetProcessHeap(),0,This);
-      return 0;
-    }
-    return This->ref;
+        IErrorInfo* iface)
+{
+        _ICOM_THIS_From_IErrorInfo(ErrorInfoImpl, iface);
+        TRACE("(%p)->(count=%lu)\n",This,This->ref);
+
+        if (!InterlockedDecrement(&This->ref))
+        {
+          TRACE("-- destroying IErrorInfo(%p)\n",This);
+          HeapFree(GetProcessHeap(),0,This);
+          return 0;
+        }
+        return This->ref;
 }
 
 static HRESULT WINAPI IErrorInfoImpl_GetGUID(
-    IErrorInfo* iface,
-    GUID * pGUID)
-{
-    _ICOM_THIS_From_IErrorInfo(ErrorInfoImpl, iface);
-    TRACE("(%p)->(count=%lu)\n",This,This->ref);
-    if(!pGUID )return E_INVALIDARG;
-    memcpy(pGUID, &This->m_Guid, sizeof(GUID));
-    return S_OK;
+        IErrorInfo* iface,
+        GUID * pGUID) 
+{
+        _ICOM_THIS_From_IErrorInfo(ErrorInfoImpl, iface);
+        TRACE("(%p)->(count=%lu)\n",This,This->ref);
+        if(!pGUID )return E_INVALIDARG;
+        memcpy(pGUID, &This->m_Guid, sizeof(GUID));
+        return S_OK;
 }
 
 static HRESULT WINAPI IErrorInfoImpl_GetSource(
-    IErrorInfo* iface,
-    BSTR *pBstrSource)
-{
-    _ICOM_THIS_From_IErrorInfo(ErrorInfoImpl, iface);
-    TRACE("(%p)->(pBstrSource=%p)\n",This,pBstrSource);
-    if (pBstrSource == NULL)
-        return E_INVALIDARG;
-    *pBstrSource = ERRORINFO_SysAllocString(This->bstrSource);
-    return S_OK;
+        IErrorInfo* iface,
+        BSTR *pBstrSource)
+{
+        _ICOM_THIS_From_IErrorInfo(ErrorInfoImpl, iface);
+        TRACE("(%p)->(pBstrSource=%p)\n",This,pBstrSource);
+        if (pBstrSource == NULL)
+            return E_INVALIDARG;
+        *pBstrSource = ERRORINFO_SysAllocString(This->bstrSource);
+        return S_OK;
 }
 
 static HRESULT WINAPI IErrorInfoImpl_GetDescription(
-    IErrorInfo* iface,
-    BSTR *pBstrDescription)
-{
-    _ICOM_THIS_From_IErrorInfo(ErrorInfoImpl, iface);
-
-    TRACE("(%p)->(pBstrDescription=%p)\n",This,pBstrDescription);
-    if (pBstrDescription == NULL)
-        return E_INVALIDARG;
-    *pBstrDescription = ERRORINFO_SysAllocString(This->bstrDescription);
-
-    return S_OK;
+        IErrorInfo* iface,
+        BSTR *pBstrDescription)
+{
+        _ICOM_THIS_From_IErrorInfo(ErrorInfoImpl, iface);
+
+        TRACE("(%p)->(pBstrDescription=%p)\n",This,pBstrDescription);
+        if (pBstrDescription == NULL)
+            return E_INVALIDARG;
+        *pBstrDescription = ERRORINFO_SysAllocString(This->bstrDescription);
+        
+        return S_OK;
 }
 
 static HRESULT WINAPI IErrorInfoImpl_GetHelpFile(
-    IErrorInfo* iface,
-    BSTR *pBstrHelpFile)
-{
-    _ICOM_THIS_From_IErrorInfo(ErrorInfoImpl, iface);
-
-    TRACE("(%p)->(pBstrHelpFile=%p)\n",This, pBstrHelpFile);
-    if (pBstrHelpFile == NULL)
-        return E_INVALIDARG;
-    *pBstrHelpFile = ERRORINFO_SysAllocString(This->bstrHelpFile);
-
-    return S_OK;
+        IErrorInfo* iface,
+        BSTR *pBstrHelpFile)
+{
+        _ICOM_THIS_From_IErrorInfo(ErrorInfoImpl, iface);
+
+        TRACE("(%p)->(pBstrHelpFile=%p)\n",This, pBstrHelpFile);
+        if (pBstrHelpFile == NULL)
+            return E_INVALIDARG;
+        *pBstrHelpFile = ERRORINFO_SysAllocString(This->bstrHelpFile);
+        
+        return S_OK;
 }
 
 static HRESULT WINAPI IErrorInfoImpl_GetHelpContext(
-    IErrorInfo* iface,
-    DWORD *pdwHelpContext)
-{
-    _ICOM_THIS_From_IErrorInfo(ErrorInfoImpl, iface);
-    TRACE("(%p)->(pdwHelpContext=%p)\n",This, pdwHelpContext);
-    if (pdwHelpContext == NULL)
-        return E_INVALIDARG;
-    *pdwHelpContext = This->m_dwHelpContext;
-
-    return S_OK;
+        IErrorInfo* iface,
+        DWORD *pdwHelpContext)
+{
+        _ICOM_THIS_From_IErrorInfo(ErrorInfoImpl, iface);
+        TRACE("(%p)->(pdwHelpContext=%p)\n",This, pdwHelpContext);
+        if (pdwHelpContext == NULL)
+            return E_INVALIDARG;
+        *pdwHelpContext = This->m_dwHelpContext;
+        
+        return S_OK;
 }
 
@@ -291 +290 @@
   IErrorInfoImpl_AddRef,
   IErrorInfoImpl_Release,
-
+ 
   IErrorInfoImpl_GetGUID,
   IErrorInfoImpl_GetSource,
@@ -301 +300 @@
 
 static HRESULT WINAPI ICreateErrorInfoImpl_QueryInterface(
-    ICreateErrorInfo* iface,
-    REFIID     riid,
-    VOID**     ppvoid)
-{
-    _ICOM_THIS_From_ICreateErrorInfo(ErrorInfoImpl, iface);
-    TRACE("(%p)\n", This);
-    return IErrorInfo_QueryInterface(_IErrorInfo_(This), riid, ppvoid);
+        ICreateErrorInfo* iface,
+        REFIID     riid,
+        VOID**     ppvoid)
+{
+        _ICOM_THIS_From_ICreateErrorInfo(ErrorInfoImpl, iface);
+        TRACE("(%p)\n", This);
+        return IErrorInfo_QueryInterface(_IErrorInfo_(This), riid, ppvoid);
 }
 
 static ULONG WINAPI ICreateErrorInfoImpl_AddRef(
-    ICreateErrorInfo* iface)
-{
-    _ICOM_THIS_From_ICreateErrorInfo(ErrorInfoImpl, iface);
-    TRACE("(%p)\n", This);
-    return IErrorInfo_AddRef(_IErrorInfo_(This));
+        ICreateErrorInfo* iface)
+{
+        _ICOM_THIS_From_ICreateErrorInfo(ErrorInfoImpl, iface);
+        TRACE("(%p)\n", This);
+        return IErrorInfo_AddRef(_IErrorInfo_(This));
 }
 
 static ULONG WINAPI ICreateErrorInfoImpl_Release(
-    ICreateErrorInfo* iface)
-{
-    _ICOM_THIS_From_ICreateErrorInfo(ErrorInfoImpl, iface);
-    TRACE("(%p)\n", This);
-    return IErrorInfo_Release(_IErrorInfo_(This));
+        ICreateErrorInfo* iface)
+{
+        _ICOM_THIS_From_ICreateErrorInfo(ErrorInfoImpl, iface);
+        TRACE("(%p)\n", This);
+        return IErrorInfo_Release(_IErrorInfo_(This));
 }
 
 
 static HRESULT WINAPI ICreateErrorInfoImpl_SetGUID(
-    ICreateErrorInfo* iface,
-    REFGUID rguid)
-{
-    _ICOM_THIS_From_ICreateErrorInfo(ErrorInfoImpl, iface);
-    TRACE("(%p)->(%s)\n", This, debugstr_guid(rguid));
-    memcpy(&This->m_Guid,  rguid, sizeof(GUID));
-    return S_OK;
+        ICreateErrorInfo* iface,
+        REFGUID rguid)
+{
+        _ICOM_THIS_From_ICreateErrorInfo(ErrorInfoImpl, iface);
+        TRACE("(%p)->(%s)\n", This, debugstr_guid(rguid));
+        memcpy(&This->m_Guid,  rguid, sizeof(GUID));
+        return S_OK;
 }
 
 static HRESULT WINAPI ICreateErrorInfoImpl_SetSource(
-    ICreateErrorInfo* iface,
-    LPOLESTR szSource)
-{
-    _ICOM_THIS_From_ICreateErrorInfo(ErrorInfoImpl, iface);
-    TRACE("(%p)\n",This);
-    if (This->bstrSource != NULL)
-        ERRORINFO_SysFreeString(This->bstrSource);
-    This->bstrSource = ERRORINFO_SysAllocString(szSource);
-
-    return S_OK;
+        ICreateErrorInfo* iface,
+        LPOLESTR szSource)
+{
+        _ICOM_THIS_From_ICreateErrorInfo(ErrorInfoImpl, iface);
+        TRACE("(%p)\n",This);
+        if (This->bstrSource != NULL)
+            ERRORINFO_SysFreeString(This->bstrSource);
+        This->bstrSource = ERRORINFO_SysAllocString(szSource);
+        
+        return S_OK;
 }
 
 static HRESULT WINAPI ICreateErrorInfoImpl_SetDescription(
-    ICreateErrorInfo* iface,
-    LPOLESTR szDescription)
-{
-    _ICOM_THIS_From_ICreateErrorInfo(ErrorInfoImpl, iface);
-    TRACE("(%p)\n",This);
-    if (This->bstrDescription != NULL)
-        ERRORINFO_SysFreeString(This->bstrDescription);
-    This->bstrDescription = ERRORINFO_SysAllocString(szDescription);
-
-    return S_OK;
+        ICreateErrorInfo* iface,
+        LPOLESTR szDescription)
+{
+        _ICOM_THIS_From_ICreateErrorInfo(ErrorInfoImpl, iface);
+        TRACE("(%p)\n",This);
+        if (This->bstrDescription != NULL)
+            ERRORINFO_SysFreeString(This->bstrDescription);
+        This->bstrDescription = ERRORINFO_SysAllocString(szDescription);
+        
+        return S_OK;
 }
 
 static HRESULT WINAPI ICreateErrorInfoImpl_SetHelpFile(
-    ICreateErrorInfo* iface,
-    LPOLESTR szHelpFile)
-{
-    _ICOM_THIS_From_ICreateErrorInfo(ErrorInfoImpl, iface);
-    TRACE("(%p)\n",This);
-    if (This->bstrHelpFile != NULL)
-        ERRORINFO_SysFreeString(This->bstrHelpFile);
-    This->bstrHelpFile = ERRORINFO_SysAllocString(szHelpFile);
-
-    return S_OK;
+        ICreateErrorInfo* iface,
+        LPOLESTR szHelpFile)
+{
+        _ICOM_THIS_From_ICreateErrorInfo(ErrorInfoImpl, iface);
+        TRACE("(%p)\n",This);
+        if (This->bstrHelpFile != NULL)
+            ERRORINFO_SysFreeString(This->bstrHelpFile);
+        This->bstrHelpFile = ERRORINFO_SysAllocString(szHelpFile);
+
+        return S_OK;
 }
 
 static HRESULT WINAPI ICreateErrorInfoImpl_SetHelpContext(
-    ICreateErrorInfo* iface,
-    DWORD dwHelpContext)
-{
-    _ICOM_THIS_From_ICreateErrorInfo(ErrorInfoImpl, iface);
-    TRACE("(%p)\n",This);
-    This->m_dwHelpContext = dwHelpContext;
-
-    return S_OK;
+        ICreateErrorInfo* iface,
+        DWORD dwHelpContext)
+{
+        _ICOM_THIS_From_ICreateErrorInfo(ErrorInfoImpl, iface);
+        TRACE("(%p)\n",This);
+        This->m_dwHelpContext = dwHelpContext;
+        
+        return S_OK;
 }
 
@@ -402 +401 @@
 
 static HRESULT WINAPI ISupportErrorInfoImpl_QueryInterface(
-    ISupportErrorInfo* iface,
-    REFIID     riid,
-    VOID**     ppvoid)
-{
-    _ICOM_THIS_From_ISupportErrorInfo(ErrorInfoImpl, iface);
-    TRACE("(%p)\n", This);
-
-    return IErrorInfo_QueryInterface(_IErrorInfo_(This), riid, ppvoid);
+        ISupportErrorInfo* iface,
+        REFIID     riid,
+        VOID**     ppvoid)
+{
+        _ICOM_THIS_From_ISupportErrorInfo(ErrorInfoImpl, iface);
+        TRACE("(%p)\n", This);
+        
+        return IErrorInfo_QueryInterface(_IErrorInfo_(This), riid, ppvoid);
 }
 
 static ULONG WINAPI ISupportErrorInfoImpl_AddRef(
-    ISupportErrorInfo* iface)
-{
-    _ICOM_THIS_From_ISupportErrorInfo(ErrorInfoImpl, iface);
-    TRACE("(%p)\n", This);
-    return IErrorInfo_AddRef(_IErrorInfo_(This));
+        ISupportErrorInfo* iface)
+{
+        _ICOM_THIS_From_ISupportErrorInfo(ErrorInfoImpl, iface);
+        TRACE("(%p)\n", This);
+        return IErrorInfo_AddRef(_IErrorInfo_(This));
 }
 
 static ULONG WINAPI ISupportErrorInfoImpl_Release(
-    ISupportErrorInfo* iface)
-{
-    _ICOM_THIS_From_ISupportErrorInfo(ErrorInfoImpl, iface);
-    TRACE("(%p)\n", This);
-    return IErrorInfo_Release(_IErrorInfo_(This));
+        ISupportErrorInfo* iface)
+{
+        _ICOM_THIS_From_ISupportErrorInfo(ErrorInfoImpl, iface);
+        TRACE("(%p)\n", This);
+        return IErrorInfo_Release(_IErrorInfo_(This));
 }
 
 
 static HRESULT WINAPI ISupportErrorInfoImpl_InterfaceSupportsErrorInfo(
-    ISupportErrorInfo* iface,
-    REFIID riid)
-{
-    _ICOM_THIS_From_ISupportErrorInfo(ErrorInfoImpl, iface);
-    TRACE("(%p)->(%s)\n", This, debugstr_guid(riid));
-    return (IsEqualIID(riid, &This->m_Guid)) ? S_OK : S_FALSE;
+        ISupportErrorInfo* iface,
+        REFIID riid)
+{
+        _ICOM_THIS_From_ISupportErrorInfo(ErrorInfoImpl, iface);
+        TRACE("(%p)->(%s)\n", This, debugstr_guid(riid));
+        return (IsEqualIID(riid, &This->m_Guid)) ? S_OK : S_FALSE;
 }
 
@@ -449 +448 @@
 };
 /***********************************************************************
- *      CreateErrorInfo
+ *              CreateErrorInfo
  */
 HRESULT WINAPI CreateErrorInfo(ICreateErrorInfo **pperrinfo)
 {
-    IErrorInfo * pei;
-    HRESULT res;
-    TRACE("(%p): stub:\n", pperrinfo);
-    if(! pperrinfo ) return E_INVALIDARG;
-    if(!(pei=IErrorInfoImpl_Constructor()))return E_OUTOFMEMORY;
-
-    res = IErrorInfo_QueryInterface(pei, &IID_ICreateErrorInfo, (LPVOID*)pperrinfo);
-    IErrorInfo_Release(pei);
-    return res;
+        IErrorInfo * pei;
+        HRESULT res;
+        TRACE("(%p): stub:\n", pperrinfo);
+        if(! pperrinfo ) return E_INVALIDARG;
+        if(!(pei=IErrorInfoImpl_Constructor()))return E_OUTOFMEMORY;
+        
+        res = IErrorInfo_QueryInterface(pei, &IID_ICreateErrorInfo, (LPVOID*)pperrinfo);
+        IErrorInfo_Release(pei);
+        return res;
 }
 
 /***********************************************************************
- *      GetErrorInfo
+ *              GetErrorInfo
  */
 HRESULT WINAPI GetErrorInfo(ULONG dwReserved, IErrorInfo **pperrinfo)
 {
-    TRACE("(%ld, %p, %p): stub:\n", dwReserved, pperrinfo, NtCurrentTeb()->ErrorInfo);
-
-    if(! pperrinfo ) return E_INVALIDARG;
-    if(!(*pperrinfo = (IErrorInfo*)(NtCurrentTeb()->ErrorInfo))) return S_FALSE;
-
-    /* clear thread error state */
-    NtCurrentTeb()->ErrorInfo = NULL;
-    return S_OK;
+        TRACE("(%ld, %p, %p): stub:\n", dwReserved, pperrinfo, NtCurrentTeb()->ErrorInfo);
+
+        if(! pperrinfo ) return E_INVALIDARG;
+        if(!(*pperrinfo = (IErrorInfo*)(NtCurrentTeb()->ErrorInfo))) return S_FALSE;
+
+        /* clear thread error state */
+        NtCurrentTeb()->ErrorInfo = NULL;
+        return S_OK;
 }
 
 /***********************************************************************
- *      SetErrorInfo
+ *              SetErrorInfo
  */
 HRESULT WINAPI SetErrorInfo(ULONG dwReserved, IErrorInfo *perrinfo)
 {
-    IErrorInfo * pei;
-    TRACE("(%ld, %p): stub:\n", dwReserved, perrinfo);
-
-    /* release old errorinfo */
-    pei = (IErrorInfo*)NtCurrentTeb()->ErrorInfo;
-    if(pei) IErrorInfo_Release(pei);
-
-    /* set to new value */
-    NtCurrentTeb()->ErrorInfo = perrinfo;
-    if(perrinfo) IErrorInfo_AddRef(perrinfo);
-    return S_OK;
-}
+        IErrorInfo * pei;
+        TRACE("(%ld, %p): stub:\n", dwReserved, perrinfo);
+
+        /* release old errorinfo */
+        pei = (IErrorInfo*)NtCurrentTeb()->ErrorInfo;
+        if(pei) IErrorInfo_Release(pei);
+
+        /* set to new value */
+        NtCurrentTeb()->ErrorInfo = perrinfo;
+        if(perrinfo) IErrorInfo_AddRef(perrinfo);
+        return S_OK;
+}

trunk/src/ole32/filemoniker.c

@@ -1 @@
-/* $Id: filemoniker.c,v 1.2 2001-09-05 13:17:09 bird Exp $ */
 /***************************************************************************************
- *                        FileMonikers implementation
+ *                            FileMonikers implementation
  *
  *               Copyright 1999  Noomen Hamza
@@ -27 +26 @@
     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.
      */
@@ -137 +136 @@
 {
     ICOM_THIS(FileMonikerImpl,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;
@@ -154 +153 @@
        )
         *ppvObject = iface;
-
+    
     else if (IsEqualIID(&IID_IROTData, riid))
         *ppvObject = (IROTData*)&(This->lpvtbl2);
@@ -161 +160 @@
     if ((*ppvObject)==0)
         return E_NOINTERFACE;
-
+  
     /* Query Interface always increases the reference count by one when it is successful */
   FileMonikerImpl_AddRef(iface);
@@ -213 +212 @@
 
     *pClassID = CLSID_FileMoniker;
-
+        
     return S_OK;
 }
@@ -253 +252 @@
     if (bread!=sizeof(WORD) || wbuffer!=0)
         return E_FAIL;
-
+    
     /* read filePath string length (plus one) */
     res=IStream_Read(pStm,&length,sizeof(DWORD),&bread);
@@ -269 +268 @@
     if (bread != sizeof(DWORD) || dwbuffer != 0xDEADFFFF)
         return E_FAIL;
-
+        
     length--;
-
+        
     for(i=0;i<10;i++){
         res=IStream_Read(pStm,&wbuffer,sizeof(WORD),&bread);
@@ -277 +276 @@
             return E_FAIL;
     }
-
+    
     if (length>8)
         length=0;
-
+        
     doubleLenHex=doubleLenDec=2*length;
     if (length > 5)
@@ -291 +290 @@
     if (length==0)
         return res;
-
+        
     res=IStream_Read(pStm,&dwbuffer,sizeof(DWORD),&bread);
     if (bread!=sizeof(DWORD) || dwbuffer!=doubleLenHex)
@@ -312 +311 @@
 
     HeapFree(GetProcessHeap(),0,filePathA);
-
+    
     return res;
 }
@@ -325 +324 @@
     /* this function saves data of this object. In the begining I thougth that I have just to write
      * the filePath string on Stream. But, when I tested this function whith windows programs samples !
-     * I noted that it was not the case. So I analysed data written by this function on Windows system and
+     * I noted that it was not the case. So I analysed data written by this function on Windows system and 
      * what did this function do exactly ! but I have no idear a bout its logic !
      * I guessed data who must be written on stream wich is:
@@ -334 +333 @@
      */
 
-    ICOM_THIS(FileMonikerImpl,iface);
+    ICOM_THIS(FileMonikerImpl,iface);        
 
     HRESULT res;
@@ -369 +368 @@
     /* write a DWORD set to 0xDEADFFFF: constant */
     res=IStream_Write(pStm,&constant1,sizeof(DWORD),NULL);
-
+        
     len--;
     /* write 10 times a DWORD set to 0 : constants */
     for(i=0;i<10;i++)
         res=IStream_Write(pStm,&zero,sizeof(WORD),NULL);
-
+        
     if (len>8)
         len=0;
-
+        
     doubleLenHex=doubleLenDec=2*len;
     if (len > 5)
@@ -416 +415 @@
 
     /* for more details see FileMonikerImpl_Save coments */
-
+    
     sizeMAx =  sizeof(WORD) +           /* first WORD is 0 */
                sizeof(DWORD)+           /* length of filePath including "\0" in the end of the string */
@@ -426 +425 @@
     if (len==0 || len > 8)
         return S_OK;
-
+    
     sizeMAx += sizeof(DWORD)+           /* size of the unicode filePath: "\0" not included */
                sizeof(WORD)+            /* constant : 0x3 */
                len*sizeof(WCHAR);       /* unicde filePath string */
-
+    
     pcbSize->s.LowPart=sizeMAx;
     pcbSize->s.HighPart=0;
@@ -448 +447 @@
     WCHAR bkSlash[]={'\\',0};
     BYTE addBkSlash;
-
+    
     TRACE("(%p,%p)\n",This,lpszPathName);
 
@@ -493 +492 @@
 
         *This->filePathName=0;
-
+    
         for(i=0;tabStr[i]!=NULL;i++)
             strcatW(This->filePathName,tabStr[i]);
-
+    
         if (addBkSlash)
             strcatW(This->filePathName,bkSlash);
@@ -539 +538 @@
     IClassFactory *pcf=0;
     IClassActivator *pca=0;
-
-    ICOM_THIS(FileMonikerImpl,iface);
+    
+    ICOM_THIS(FileMonikerImpl,iface);    
 
     *ppvResult=0;
@@ -547 +546 @@
 
     if(pmkToLeft==NULL){
-
+        
         res=IBindCtx_GetRunningObjectTable(pbc,&prot);
 
@@ -579 +578 @@
 
             res=IMoniker_BindToObject(pmkToLeft,pbc,NULL,&IID_IClassActivator,(void**)&pca);
-
+        
             if (res==E_NOINTERFACE)
                 return MK_E_INTERMEDIATEINTERFACENOTSUPPORTED;
@@ -598 +597 @@
 
             FIXME("()");
-
+            
             /*res=GetClassFile(This->filePathName,&clsID);
 
@@ -634 +633 @@
     if (pcf!=NULL)
         IClassFactory_Release(pcf);
-
+    
     return res;
 }
@@ -737 +736 @@
 
     if (pmkRight==NULL)
-    return E_INVALIDARG;
+        return E_INVALIDARG;
 
     *ppmkComposite=0;
-
+    
     IMoniker_IsSystemMoniker(pmkRight,&mkSys);
 
@@ -769 +768 @@
         /* the length of the composed path string  is raised by the sum of the two paths lengths  */
         newStr=HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*(lstrlenW(str1)+lstrlenW(str2)+1));
-
-      if (newStr==NULL)
-        return E_OUTOFMEMORY;
+        
+          if (newStr==NULL)
+                return E_OUTOFMEMORY;
 
         /* new path is the concatenation of the rest of str1 and str2 */
@@ -779 +778 @@
         if ((strDec2[i]==NULL && lastIdx1>-1 && lastIdx2>-1) || lstrcmpW(strDec2[i],bkSlash)!=0)
             strcatW(newStr,bkSlash);
-
+            
         for(j=i;j<=lastIdx2;j++)
             strcatW(newStr,strDec2[j]);
-
+        
         /* create a new moniker with the new string */
         res=CreateFileMoniker(newStr,ppmkComposite);
@@ -858 +857 @@
 
     IMoniker_GetDisplayName(pmkOtherMoniker,bind,NULL,&filePath);
-
+    
     if (lstrcmpiW(filePath,
                   This->filePathName)!=0)
 
         return S_FALSE;
-
+    
     return S_OK;
 }
@@ -880 +879 @@
     if (pdwHash==NULL)
         return E_POINTER;
-
+    
     val =  This->filePathName;
     len = lstrlenW(val);
@@ -887 +886 @@
         for (i = len ; i > 0; i--) {
             h = (h * 37) + val[off++];
-    }
+        }
     } else {
         /* only sample some characters */
-    skip = len / 8;
-    for (i = len ; i > 0; i -= skip, off += skip) {
+        skip = len / 8;
+        for (i = len ; i > 0; i -= skip, off += skip) {
             h = (h * 39) + val[off];
-    }
+        }
 }
 
@@ -964 +963 @@
         if (!GetFileAttributesExW(This->filePathName,GetFileExInfoStandard,&info))
             return MK_E_NOOBJECT;
-
+        
         *pFileTime=info.ftLastWriteTime;
 }
@@ -999 +998 @@
     if (pmkOther==NULL)
         return E_INVALIDARG;
-
+    
     *ppmkPrefix=0;
-
+    
     /* check if we have the same type of moniker */
     IMoniker_IsSystemMoniker(pmkOther,&mkSys);
@@ -1023 +1022 @@
 
         *commonPath=0;
-
+        
         for(sameIdx=0; ( (stringTable1[sameIdx]!=NULL) &&
                          (stringTable2[sameIdx]!=NULL) &&
@@ -1042 +1041 @@
         if (machimeNameCase && *stringTable1[sameIdx-1]=='\\')
             sameIdx--;
-
+        
         if (machimeNameCase && (sameIdx<=3) && (nb1 > 3 || nb2 > 3) )
             return MK_E_NOPREFIX;
@@ -1048 +1047 @@
         for(i=0;i<sameIdx;i++)
             strcatW(commonPath,stringTable1[i]);
-
+        
         for(i=0;i<nb1;i++)
             CoTaskMemFree(stringTable1[i]);
@@ -1060 +1059 @@
 
         HeapFree(GetProcessHeap(),0,commonPath);
-
+        
         return CreateFileMoniker(commonPath,ppmkPrefix);
     }
@@ -1080 +1079 @@
 
     strgtable =CoTaskMemAlloc(len*sizeof(LPOLESTR));
-
+    
     if (strgtable==NULL)
-    return E_OUTOFMEMORY;
-
+        return E_OUTOFMEMORY;
+    
     while(str[i]!=0){
 
@@ -1091 +1090 @@
 
             if (strgtable[tabIndex]==NULL)
-            return E_OUTOFMEMORY;
+                return E_OUTOFMEMORY;
 
             strcpyW(strgtable[tabIndex++],bSlash);
@@ -1114 +1113 @@
     }
     strgtable[tabIndex]=NULL;
-
+    
     *stringTable=strgtable;
-
+    
     return tabIndex;
 }
@@ -1130 +1129 @@
     DWORD len1=0,len2=0,sameIdx=0,j=0;
     WCHAR back[] ={'.','.','\\',0};
-
+    
     TRACE("(%p,%p,%p)\n",iface,pmOther,ppmkRelPath);
 
@@ -1138 +1137 @@
     if (pmOther==NULL)
         return E_INVALIDARG;
-
+    
     res=CreateBindCtx(0,&bind);
     if (FAILED(res))
-    return res;
+        return res;
 
     res=IMoniker_GetDisplayName(iface,bind,NULL,&str1);
     if (FAILED(res))
-    return res;
+        return res;
     res=IMoniker_GetDisplayName(pmOther,bind,NULL,&str2);
     if (FAILED(res))
-    return res;
+        return res;
 
     len1=FileMonikerImpl_DecomposePath(str1,&tabStr1);
@@ -1154 +1153 @@
 
     if (FAILED(len1) || FAILED(len2))
-    return E_OUTOFMEMORY;
-
+        return E_OUTOFMEMORY;
+        
     /* count the number of similar items from the begin of the two paths */
     for(sameIdx=0; ( (tabStr1[sameIdx]!=NULL) &&
-           (tabStr2[sameIdx]!=NULL) &&
+                   (tabStr2[sameIdx]!=NULL) &&
                (lstrcmpiW(tabStr1[sameIdx],tabStr2[sameIdx])==0)); sameIdx++);
 
@@ -1176 +1175 @@
     for(j=sameIdx;tabStr2[j]!=NULL;j++)
         strcatW(relPath,tabStr2[j]);
-
+    
     res=CreateFileMoniker(relPath,ppmkRelPath);
-
+    
     for(j=0; tabStr1[j]!=NULL;j++)
         CoTaskMemFree(tabStr1[j]);
@@ -1220 +1219 @@
 
     strcpyW(*ppszDisplayName,This->filePathName);
-
+    
     return S_OK;
 }
@@ -1247 +1246 @@
     if (!pwdMksys)
         return E_POINTER;
-
+    
     (*pwdMksys)=MKSYS_FILEMONIKER;
 
@@ -1284 +1283 @@
 {
     ICOM_THIS_From_IROTData(IMoniker, iface);
-
+    
     TRACE("(%p)\n",This);
 
@@ -1328 +1327 @@
     if(lpszPathName==NULL)
         return MK_E_SYNTAX;
-
+            
     *ppmk=0;
-
+        
     newFileMoniker = HeapAlloc(GetProcessHeap(), 0, sizeof(FileMonikerImpl));
 
@@ -1339 +1338 @@
 
     if (SUCCEEDED(hr))
-    hr = FileMonikerImpl_QueryInterface((IMoniker*)newFileMoniker,&riid,(void**)ppmk);
+        hr = FileMonikerImpl_QueryInterface((IMoniker*)newFileMoniker,&riid,(void**)ppmk);
     else
         HeapFree(GetProcessHeap(),0,newFileMoniker);

trunk/src/ole32/hglobalstream.c

@@ -1 @@
-/* $Id: hglobalstream.c,v 1.2 2001-09-05 13:17:09 bird Exp $ */
 /*
  * HGLOBAL Stream implementation
@@ -30 +29 @@
 {
   ICOM_VFIELD(IStream);  /* Needs to be the first item in the stuct
-              * since we want to cast this in a IStream pointer */
-
+                          * since we want to cast this in a IStream pointer */
+  
   /*
    * Reference count
    */
-  ULONG          ref;
+  ULONG              ref;
 
   /*
@@ -65 +64 @@
  */
 HGLOBALStreamImpl* HGLOBALStreamImpl_Construct(
-        HGLOBAL  hGlobal,
-        BOOL     fDeleteOnRelease);
+                HGLOBAL  hGlobal,
+                BOOL     fDeleteOnRelease);
 
 void HGLOBALStreamImpl_Destroy(
@@ -75 +74 @@
 
 HRESULT WINAPI HGLOBALStreamImpl_QueryInterface(
-        IStream*      iface,
-        REFIID         riid,        /* [in] */
-        void**         ppvObject);  /* [iid_is][out] */
-
+                IStream*      iface,
+                REFIID         riid,            /* [in] */          
+                void**         ppvObject);  /* [iid_is][out] */ 
+        
 ULONG WINAPI HGLOBALStreamImpl_AddRef(
-        IStream*      iface);
-
+                IStream*      iface);
+        
 ULONG WINAPI HGLOBALStreamImpl_Release(
-        IStream*      iface);
-
-HRESULT WINAPI HGLOBALStreamImpl_Read(
-            IStream*      iface,
-        void*          pv,        /* [length_is][size_is][out] */
-        ULONG          cb,        /* [in] */
-        ULONG*         pcbRead);  /* [out] */
-
+                IStream*      iface);
+        
+HRESULT WINAPI HGLOBALStreamImpl_Read( 
+                IStream*      iface,
+                void*          pv,        /* [length_is][size_is][out] */
+                ULONG          cb,        /* [in] */                     
+                ULONG*         pcbRead);  /* [out] */                    
+        
 HRESULT WINAPI HGLOBALStreamImpl_Write(
-        IStream*      iface,
-        const void*    pv,          /* [size_is][in] */
-        ULONG          cb,          /* [in] */
-        ULONG*         pcbWritten); /* [out] */
-
-HRESULT WINAPI HGLOBALStreamImpl_Seek(
-        IStream*      iface,
-        LARGE_INTEGER   dlibMove,         /* [in] */
-        DWORD           dwOrigin,         /* [in] */
-        ULARGE_INTEGER* plibNewPosition); /* [out] */
-
-HRESULT WINAPI HGLOBALStreamImpl_SetSize(
-            IStream*      iface,
-        ULARGE_INTEGER  libNewSize);  /* [in] */
-
-HRESULT WINAPI HGLOBALStreamImpl_CopyTo(
-        IStream*      iface,
-        IStream*      pstm,         /* [unique][in] */
-        ULARGE_INTEGER  cb,           /* [in] */
-        ULARGE_INTEGER* pcbRead,      /* [out] */
-        ULARGE_INTEGER* pcbWritten);  /* [out] */
-
-HRESULT WINAPI HGLOBALStreamImpl_Commit(
-            IStream*      iface,
-        DWORD           grfCommitFlags); /* [in] */
-
-HRESULT WINAPI HGLOBALStreamImpl_Revert(
-        IStream*  iface);
-
-HRESULT WINAPI HGLOBALStreamImpl_LockRegion(
-        IStream*     iface,
-        ULARGE_INTEGER libOffset,   /* [in] */
-        ULARGE_INTEGER cb,          /* [in] */
-        DWORD          dwLockType); /* [in] */
-
-HRESULT WINAPI HGLOBALStreamImpl_UnlockRegion(
-        IStream*     iface,
-        ULARGE_INTEGER libOffset,   /* [in] */
-            ULARGE_INTEGER cb,          /* [in] */
-        DWORD          dwLockType); /* [in] */
-
-HRESULT WINAPI HGLOBALStreamImpl_Stat(
-        IStream*     iface,
-            STATSTG*       pstatstg,     /* [out] */
-            DWORD          grfStatFlag); /* [in] */
-
-HRESULT WINAPI HGLOBALStreamImpl_Clone(
-        IStream*     iface,
-        IStream**    ppstm);       /* [out] */
+                IStream*      iface,
+                const void*    pv,          /* [size_is][in] */ 
+                ULONG          cb,          /* [in] */          
+                ULONG*         pcbWritten); /* [out] */         
+        
+HRESULT WINAPI HGLOBALStreamImpl_Seek( 
+                IStream*      iface,
+                LARGE_INTEGER   dlibMove,         /* [in] */ 
+                DWORD           dwOrigin,         /* [in] */ 
+                ULARGE_INTEGER* plibNewPosition); /* [out] */
+        
+HRESULT WINAPI HGLOBALStreamImpl_SetSize( 
+                IStream*      iface,
+                ULARGE_INTEGER  libNewSize);  /* [in] */ 
+        
+HRESULT WINAPI HGLOBALStreamImpl_CopyTo( 
+                IStream*      iface,
+                IStream*      pstm,         /* [unique][in] */ 
+                ULARGE_INTEGER  cb,           /* [in] */         
+                ULARGE_INTEGER* pcbRead,      /* [out] */        
+                ULARGE_INTEGER* pcbWritten);  /* [out] */        
+
+HRESULT WINAPI HGLOBALStreamImpl_Commit( 
+                IStream*      iface,
+                DWORD           grfCommitFlags); /* [in] */ 
+        
+HRESULT WINAPI HGLOBALStreamImpl_Revert( 
+                IStream*  iface);
+        
+HRESULT WINAPI HGLOBALStreamImpl_LockRegion( 
+                IStream*     iface,
+                ULARGE_INTEGER libOffset,   /* [in] */ 
+                ULARGE_INTEGER cb,          /* [in] */ 
+                DWORD          dwLockType); /* [in] */ 
+        
+HRESULT WINAPI HGLOBALStreamImpl_UnlockRegion( 
+                IStream*     iface,
+                ULARGE_INTEGER libOffset,   /* [in] */ 
+                ULARGE_INTEGER cb,          /* [in] */ 
+                DWORD          dwLockType); /* [in] */ 
+        
+HRESULT WINAPI HGLOBALStreamImpl_Stat( 
+                IStream*     iface,
+                STATSTG*       pstatstg,     /* [out] */
+                DWORD          grfStatFlag); /* [in] */ 
+        
+HRESULT WINAPI HGLOBALStreamImpl_Clone( 
+                IStream*     iface,
+                IStream**    ppstm);       /* [out] */ 
 
 
@@ -169 +168 @@
  */
 HRESULT WINAPI CreateStreamOnHGlobal(
-        HGLOBAL   hGlobal,
-        BOOL      fDeleteOnRelease,
-        LPSTREAM* ppstm)
+                HGLOBAL   hGlobal, 
+                BOOL      fDeleteOnRelease, 
+                LPSTREAM* ppstm)
 {
   HGLOBALStreamImpl* newStream;
 
   newStream = HGLOBALStreamImpl_Construct(hGlobal,
-                      fDeleteOnRelease);
+                                          fDeleteOnRelease);
 
   if (newStream!=NULL)
   {
-    return IUnknown_QueryInterface((IUnknown*)newStream,
-                   &IID_IStream,
-                   (void**)ppstm);
+    return IUnknown_QueryInterface((IUnknown*)newStream, 
+                                   &IID_IStream,
+                                   (void**)ppstm);
   }
 
@@ -223 +222 @@
  * Params:
  *    hGlobal          - Handle that will support the stream. can be NULL.
- *    fDeleteOnRelease - Flag set to TRUE if the HGLOBAL will be released
+ *    fDeleteOnRelease - Flag set to TRUE if the HGLOBAL will be released 
  *                       when the IStream object is destroyed.
  */
 HGLOBALStreamImpl* HGLOBALStreamImpl_Construct(
-        HGLOBAL  hGlobal,
-        BOOL     fDeleteOnRelease)
+                HGLOBAL  hGlobal,
+                BOOL     fDeleteOnRelease)
 {
   HGLOBALStreamImpl* newStream;
 
   newStream = HeapAlloc(GetProcessHeap(), 0, sizeof(HGLOBALStreamImpl));
-
+  
   if (newStream!=0)
   {
@@ -241 +240 @@
     ICOM_VTBL(newStream) = &HGLOBALStreamImpl_Vtbl;
     newStream->ref    = 0;
-
+    
     /*
      * Initialize the support.
@@ -254 +253 @@
     {
       newStream->supportHandle = GlobalAlloc(GMEM_MOVEABLE | GMEM_NODISCARD |
-                         GMEM_SHARE, 0);
+                                             GMEM_SHARE, 0);
     }
-
+    
     /*
      * Start the stream at the begining.
@@ -262 +261 @@
     newStream->currentPosition.s.HighPart = 0;
     newStream->currentPosition.s.LowPart = 0;
-
+    
     /*
      * Initialize the size of the stream to the size of the handle.
@@ -269 +268 @@
     newStream->streamSize.s.LowPart  = GlobalSize(newStream->supportHandle);
   }
-
+  
   return newStream;
 }
@@ -276 +275 @@
  * This is the destructor of the HGLOBALStreamImpl class.
  *
- * This method will clean-up all the resources used-up by the given HGLOBALStreamImpl
+ * This method will clean-up all the resources used-up by the given HGLOBALStreamImpl 
  * class. The pointer passed-in to this function will be freed and will not
  * be valid anymore.
@@ -296 +295 @@
    * Finally, free the memory used-up by the class.
    */
-  HeapFree(GetProcessHeap(), 0, This);
+  HeapFree(GetProcessHeap(), 0, This);  
 }
 
@@ -304 +303 @@
  */
 HRESULT WINAPI HGLOBALStreamImpl_QueryInterface(
-          IStream*     iface,
-          REFIID         riid,        /* [in] */
-          void**         ppvObject)   /* [iid_is][out] */
+                  IStream*     iface,
+                  REFIID         riid,        /* [in] */          
+                  void**         ppvObject)   /* [iid_is][out] */ 
 {
   HGLOBALStreamImpl* const This=(HGLOBALStreamImpl*)iface;
@@ -315 +314 @@
   if (ppvObject==0)
     return E_INVALIDARG;
-
+  
   /*
    * Initialize the return parameter.
    */
   *ppvObject = 0;
-
+  
   /*
    * Compare the riid with the interface IDs implemented by this object.
    */
-  if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0)
+  if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) 
   {
     *ppvObject = (IStream*)This;
   }
-  else if (memcmp(&IID_IStream, riid, sizeof(IID_IStream)) == 0)
+  else if (memcmp(&IID_IStream, riid, sizeof(IID_IStream)) == 0) 
   {
     *ppvObject = (IStream*)This;
   }
-
+  
   /*
    * Check that we obtained an interface.
@@ -338 +337 @@
   if ((*ppvObject)==0)
     return E_NOINTERFACE;
-
+  
   /*
    * Query Interface always increases the reference count by one when it is
@@ -344 +343 @@
    */
   HGLOBALStreamImpl_AddRef(iface);
-
+  
   return S_OK;;
 }
@@ -353 +352 @@
  */
 ULONG WINAPI HGLOBALStreamImpl_AddRef(
-        IStream* iface)
+                IStream* iface)
 {
   HGLOBALStreamImpl* const This=(HGLOBALStreamImpl*)iface;
 
   This->ref++;
-
+  
   return This->ref;
 }
@@ -367 +366 @@
  */
 ULONG WINAPI HGLOBALStreamImpl_Release(
-        IStream* iface)
+                IStream* iface)
 {
   HGLOBALStreamImpl* const This=(HGLOBALStreamImpl*)iface;
 
   ULONG newRef;
-
+  
   This->ref--;
-
+  
   newRef = This->ref;
-
+  
   /*
    * If the reference count goes down to 0, perform suicide.
@@ -384 +383 @@
     HGLOBALStreamImpl_Destroy(This);
   }
-
+  
   return newRef;
 }
@@ -397 +396 @@
  * See the documentation of ISequentialStream for more info.
  */
-HRESULT WINAPI HGLOBALStreamImpl_Read(
-          IStream*     iface,
-          void*          pv,        /* [length_is][size_is][out] */
-          ULONG          cb,        /* [in] */
-          ULONG*         pcbRead)   /* [out] */
+HRESULT WINAPI HGLOBALStreamImpl_Read( 
+                  IStream*     iface,
+                  void*          pv,        /* [length_is][size_is][out] */
+                  ULONG          cb,        /* [in] */                     
+                  ULONG*         pcbRead)   /* [out] */                    
 {
   HGLOBALStreamImpl* const This=(HGLOBALStreamImpl*)iface;
@@ -410 +409 @@
 
   TRACE("(%p, %p, %ld, %p)\n", iface,
-    pv, cb, pcbRead);
-
-  /*
+        pv, cb, pcbRead);
+  
+  /* 
    * If the caller is not interested in the nubmer of bytes read,
    * we use another buffer to avoid "if" statements in the code.
@@ -418 +417 @@
   if (pcbRead==0)
     pcbRead = &bytesReadBuffer;
-
+  
   /*
    * Using the known size of the stream, calculate the number of bytes
@@ -446 +445 @@
    */
   GlobalUnlock(This->supportHandle);
-
+  
   /*
    * The function returns S_OK if the buffer was filled completely
@@ -454 +453 @@
   if(*pcbRead == cb)
     return S_OK;
-
+  
   return S_FALSE;
 }
-
+        
 /***
  * This method is part of the ISequentialStream interface.
@@ -469 +468 @@
  */
 HRESULT WINAPI HGLOBALStreamImpl_Write(
-              IStream*     iface,
-          const void*    pv,          /* [size_is][in] */
-          ULONG          cb,          /* [in] */
-          ULONG*         pcbWritten)  /* [out] */
+                  IStream*     iface,
+                  const void*    pv,          /* [size_is][in] */ 
+                  ULONG          cb,          /* [in] */          
+                  ULONG*         pcbWritten)  /* [out] */         
 {
   HGLOBALStreamImpl* const This=(HGLOBALStreamImpl*)iface;
@@ -481 +480 @@
 
   TRACE("(%p, %p, %ld, %p)\n", iface,
-    pv, cb, pcbWritten);
-
+        pv, cb, pcbWritten);
+  
   /*
    * If the caller is not interested in the number of bytes written,
@@ -489 +488 @@
   if (pcbWritten == 0)
     pcbWritten = &bytesWritten;
-
+  
   if (cb == 0)
   {
@@ -499 +498 @@
     newSize.s.LowPart = This->currentPosition.s.LowPart + cb;
   }
-
+  
   /*
    * Verify if we need to grow the stream
@@ -508 +507 @@
    IStream_SetSize(iface, newSize);
   }
-
+  
   /*
    * Lock the buffer in position and copy the data.
@@ -514 +513 @@
   supportBuffer = GlobalLock(This->supportHandle);
 
-  memcpy((char *) supportBuffer+This->currentPosition.s.LowPart, pv, cb);
+  memcpy((char *) supportBuffer+This->currentPosition.s.LowPart, pv, cb);  
 
   /*
@@ -530 +529 @@
    */
   GlobalUnlock(This->supportHandle);
-
+  
   return S_OK;
 }
@@ -541 +540 @@
  *
  * See the documentation of IStream for more info.
- */
-HRESULT WINAPI HGLOBALStreamImpl_Seek(
-          IStream*      iface,
-          LARGE_INTEGER   dlibMove,         /* [in] */
-          DWORD           dwOrigin,         /* [in] */
-          ULARGE_INTEGER* plibNewPosition) /* [out] */
+ */        
+HRESULT WINAPI HGLOBALStreamImpl_Seek( 
+                  IStream*      iface,
+                  LARGE_INTEGER   dlibMove,         /* [in] */ 
+                  DWORD           dwOrigin,         /* [in] */ 
+                  ULARGE_INTEGER* plibNewPosition) /* [out] */
 {
   HGLOBALStreamImpl* const This=(HGLOBALStreamImpl*)iface;
@@ -553 +552 @@
 
   TRACE("(%p, %ld, %ld, %p)\n", iface,
-    dlibMove.s.LowPart, dwOrigin, plibNewPosition);
-
-  /*
+        dlibMove.s.LowPart, dwOrigin, plibNewPosition);
+
+  /* 
    * The caller is allowed to pass in NULL as the new position return value.
    * If it happens, we assign it to a dynamic variable to avoid special cases
@@ -609 +608 @@
   plibNewPosition->s.LowPart += dlibMove.s.LowPart;
   This->currentPosition = *plibNewPosition;
-
+ 
   return S_OK;
 }
@@ -622 +621 @@
  * See the documentation of IStream for more info.
  */
-HRESULT WINAPI HGLOBALStreamImpl_SetSize(
-                     IStream*      iface,
-                     ULARGE_INTEGER  libNewSize)   /* [in] */
+HRESULT WINAPI HGLOBALStreamImpl_SetSize( 
+                                     IStream*      iface,
+                                     ULARGE_INTEGER  libNewSize)   /* [in] */ 
 {
   HGLOBALStreamImpl* const This=(HGLOBALStreamImpl*)iface;
@@ -635 +634 @@
   if (libNewSize.s.HighPart != 0)
     return STG_E_INVALIDFUNCTION;
-
+  
   if (This->streamSize.s.LowPart == libNewSize.s.LowPart)
     return S_OK;
@@ -642 +641 @@
    * Re allocate the HGlobal to fit the new size of the stream.
    */
-  This->supportHandle = GlobalReAlloc(This->supportHandle,
-                      libNewSize.s.LowPart,
-                      0);
+  This->supportHandle = GlobalReAlloc(This->supportHandle, 
+                                      libNewSize.s.LowPart,
+                                      0);
 
   This->streamSize.s.LowPart = libNewSize.s.LowPart;
-
+  
   return S_OK;
 }
-
+        
 /***
  * This method is part of the IStream interface.
@@ -658 +657 @@
  * See the documentation of IStream for more info.
  */
-HRESULT WINAPI HGLOBALStreamImpl_CopyTo(
-                    IStream*      iface,
-                    IStream*      pstm,         /* [unique][in] */
-                    ULARGE_INTEGER  cb,           /* [in] */
-                    ULARGE_INTEGER* pcbRead,      /* [out] */
-                    ULARGE_INTEGER* pcbWritten)   /* [out] */
+HRESULT WINAPI HGLOBALStreamImpl_CopyTo( 
+                                    IStream*      iface,
+                                    IStream*      pstm,         /* [unique][in] */ 
+                                    ULARGE_INTEGER  cb,           /* [in] */         
+                                    ULARGE_INTEGER* pcbRead,      /* [out] */        
+                                    ULARGE_INTEGER* pcbWritten)   /* [out] */        
 {
   HRESULT        hr = S_OK;
@@ -671 +670 @@
   ULARGE_INTEGER totalBytesWritten;
 
-  TRACE("(%p, %p, %ld, %p, %p)\n", iface, pstm,
-    cb.s.LowPart, pcbRead, pcbWritten);
+  TRACE("(%p, %p, %ld, %p, %p)\n", iface, pstm, 
+        cb.s.LowPart, pcbRead, pcbWritten);
 
   /*
@@ -694 +693 @@
     else
       copySize = cb.s.LowPart;
-
+    
     IStream_Read(iface, tmpBuffer, copySize, &bytesRead);
 
     totalBytesRead.s.LowPart += bytesRead;
-
+    
     IStream_Write(pstm, tmpBuffer, bytesRead, &bytesWritten);
 
@@ -711 +710 @@
       break;
     }
-
+    
     if (bytesRead!=copySize)
       cb.s.LowPart = 0;
@@ -738 +737 @@
  * This method is part of the IStream interface.
  *
- * For streams supported by HGLOBALS, this function does nothing.
+ * For streams supported by HGLOBALS, this function does nothing. 
  * This is what the documentation tells us.
  *
  * See the documentation of IStream for more info.
- */
-HRESULT WINAPI HGLOBALStreamImpl_Commit(
-          IStream*      iface,
-          DWORD         grfCommitFlags)  /* [in] */
+ */        
+HRESULT WINAPI HGLOBALStreamImpl_Commit( 
+                  IStream*      iface,
+                  DWORD         grfCommitFlags)  /* [in] */ 
 {
   return S_OK;
@@ -753 +752 @@
  * This method is part of the IStream interface.
  *
- * For streams supported by HGLOBALS, this function does nothing.
+ * For streams supported by HGLOBALS, this function does nothing. 
  * This is what the documentation tells us.
  *
  * See the documentation of IStream for more info.
- */
-HRESULT WINAPI HGLOBALStreamImpl_Revert(
-          IStream* iface)
+ */        
+HRESULT WINAPI HGLOBALStreamImpl_Revert( 
+                  IStream* iface)
 {
   return S_OK;
@@ -767 +766 @@
  * This method is part of the IStream interface.
  *
- * For streams supported by HGLOBALS, this function does nothing.
+ * For streams supported by HGLOBALS, this function does nothing. 
  * This is what the documentation tells us.
  *
  * See the documentation of IStream for more info.
- */
-HRESULT WINAPI HGLOBALStreamImpl_LockRegion(
-          IStream*       iface,
-          ULARGE_INTEGER libOffset,   /* [in] */
-          ULARGE_INTEGER cb,          /* [in] */
-          DWORD          dwLockType)  /* [in] */
+ */        
+HRESULT WINAPI HGLOBALStreamImpl_LockRegion( 
+                  IStream*       iface,
+                  ULARGE_INTEGER libOffset,   /* [in] */ 
+                  ULARGE_INTEGER cb,          /* [in] */ 
+                  DWORD          dwLockType)  /* [in] */ 
 {
   return S_OK;
@@ -784 +783 @@
  * This method is part of the IStream interface.
  *
- * For streams supported by HGLOBALS, this function does nothing.
+ * For streams supported by HGLOBALS, this function does nothing. 
  * This is what the documentation tells us.
  *
  * See the documentation of IStream for more info.
- */
-HRESULT WINAPI HGLOBALStreamImpl_UnlockRegion(
-          IStream*       iface,
-          ULARGE_INTEGER libOffset,   /* [in] */
-          ULARGE_INTEGER cb,          /* [in] */
-          DWORD          dwLockType)  /* [in] */
+ */        
+HRESULT WINAPI HGLOBALStreamImpl_UnlockRegion( 
+                  IStream*       iface,
+                  ULARGE_INTEGER libOffset,   /* [in] */ 
+                  ULARGE_INTEGER cb,          /* [in] */ 
+                  DWORD          dwLockType)  /* [in] */ 
 {
   return S_OK;
@@ -805 +804 @@
  *
  * See the documentation of IStream for more info.
- */
-HRESULT WINAPI HGLOBALStreamImpl_Stat(
-          IStream*     iface,
-          STATSTG*     pstatstg,     /* [out] */
-          DWORD        grfStatFlag)  /* [in] */
+ */        
+HRESULT WINAPI HGLOBALStreamImpl_Stat( 
+                  IStream*     iface,
+                  STATSTG*     pstatstg,     /* [out] */
+                  DWORD        grfStatFlag)  /* [in] */ 
 {
   HGLOBALStreamImpl* const This=(HGLOBALStreamImpl*)iface;
@@ -821 +820 @@
   return S_OK;
 }
-
-HRESULT WINAPI HGLOBALStreamImpl_Clone(
-          IStream*     iface,
-          IStream**    ppstm) /* [out] */
+        
+HRESULT WINAPI HGLOBALStreamImpl_Clone( 
+                  IStream*     iface,
+                  IStream**    ppstm) /* [out] */ 
 {
   FIXME("not implemented!\n");

trunk/src/ole32/ifs.c

@@ -1 @@
-/* $Id: ifs.c,v 1.2 2001-09-05 13:17:09 bird Exp $ */
 /*
- *  basic interfaces
+ *      basic interfaces
  *
- *  Copyright 1997  Marcus Meissner
+ *      Copyright 1997  Marcus Meissner
  */
 
@@ -31 +30 @@
 
 /******************************************************************************
- *      IUnknown_AddRef [VTABLE:IUNKNOWN.1]
- */
-static ULONG WINAPI IUnknown_fnAddRef(LPUNKNOWN iface) {
-    ICOM_THIS(IUnknownImpl,iface);
-    TRACE("(%p)->AddRef()\n",This);
-    return ++(This->ref);
+ *              IUnknown_AddRef [VTABLE:IUNKNOWN.1]
+ */
+static ULONG WINAPI IUnknown_fnAddRef(LPUNKNOWN iface) { 
+        ICOM_THIS(IUnknownImpl,iface);
+        TRACE("(%p)->AddRef()\n",This);
+        return ++(This->ref);
 }
 
@@ -43 +42 @@
  */
 static ULONG WINAPI IUnknown_fnRelease(LPUNKNOWN iface) {
-    ICOM_THIS(IUnknownImpl,iface);
-    TRACE("(%p)->Release()\n",This);
-    if (!--(This->ref)) {
-        HeapFree(GetProcessHeap(),0,This);
-        return 0;
-    }
-    return This->ref;
+        ICOM_THIS(IUnknownImpl,iface);
+        TRACE("(%p)->Release()\n",This);
+        if (!--(This->ref)) {
+                HeapFree(GetProcessHeap(),0,This);
+                return 0;
+        }
+        return This->ref;
 }
 
@@ -56 +55 @@
  */
 static HRESULT WINAPI IUnknown_fnQueryInterface(LPUNKNOWN iface,REFIID refiid,LPVOID *obj) {
-    ICOM_THIS(IUnknownImpl,iface);
-
-    TRACE("(%p)->QueryInterface(%s,%p)\n",This,debugstr_guid(refiid),obj);
-
-    if (!memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown))) {
-        *obj = This;
-        return 0;
-    }
-    return OLE_E_ENUM_NOMORE;
-}
-
-static ICOM_VTABLE(IUnknown) uvt =
-{
-    ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
-    IUnknown_fnQueryInterface,
-    IUnknown_fnAddRef,
-    IUnknown_fnRelease
+        ICOM_THIS(IUnknownImpl,iface);
+
+        TRACE("(%p)->QueryInterface(%s,%p)\n",This,debugstr_guid(refiid),obj);
+
+        if (!memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown))) {
+                *obj = This;
+                return 0; 
+        }
+        return OLE_E_ENUM_NOMORE; 
+}
+
+static ICOM_VTABLE(IUnknown) uvt = 
+{
+        ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+        IUnknown_fnQueryInterface,
+        IUnknown_fnAddRef,
+        IUnknown_fnRelease
 };
 
@@ -80 +79 @@
 LPUNKNOWN
 IUnknown_Constructor() {
-    IUnknownImpl*   unk;
-
-    unk = (IUnknownImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(IUnknownImpl));
-    ICOM_VTBL(unk)  = &uvt;
-    unk->ref    = 1;
-    return (LPUNKNOWN)unk;
+        IUnknownImpl*   unk;
+
+        unk = (IUnknownImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(IUnknownImpl));
+        ICOM_VTBL(unk)  = &uvt;
+        unk->ref        = 1;
+        return (LPUNKNOWN)unk;
 }
 
@@ -101 +100 @@
 
 /******************************************************************************
- *      IMalloc16_QueryInterface    [COMPOBJ.500]
+ *              IMalloc16_QueryInterface        [COMPOBJ.500]
  */
 HRESULT WINAPI IMalloc16_fnQueryInterface(IMalloc16* iface,REFIID refiid,LPVOID *obj) {
         ICOM_THIS(IMalloc16Impl,iface);
 
-    TRACE("(%p)->QueryInterface(%s,%p)\n",This,debugstr_guid(refiid),obj);
-    if (    !memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown)) ||
-        !memcmp(&IID_IMalloc,refiid,sizeof(IID_IMalloc))
-    ) {
-        *obj = This;
-        return 0;
-    }
-    return OLE_E_ENUM_NOMORE;
-}
-
-/******************************************************************************
- *      IMalloc16_AddRef    [COMPOBJ.501]
+        TRACE("(%p)->QueryInterface(%s,%p)\n",This,debugstr_guid(refiid),obj);
+        if (    !memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown)) ||
+                !memcmp(&IID_IMalloc,refiid,sizeof(IID_IMalloc))
+        ) {
+                *obj = This;
+                return 0;
+        }
+        return OLE_E_ENUM_NOMORE; 
+}
+
+/******************************************************************************
+ *              IMalloc16_AddRef        [COMPOBJ.501]
  */
 ULONG WINAPI IMalloc16_fnAddRef(IMalloc16* iface) {
         ICOM_THIS(IMalloc16Impl,iface);
-    TRACE("(%p)->AddRef()\n",This);
-    return 1; /* cannot be freed */
-}
-
-/******************************************************************************
- *      IMalloc16_Release   [COMPOBJ.502]
+        TRACE("(%p)->AddRef()\n",This);
+        return 1; /* cannot be freed */
+}
+
+/******************************************************************************
+ *              IMalloc16_Release       [COMPOBJ.502]
  */
 ULONG WINAPI IMalloc16_fnRelease(IMalloc16* iface) {
         ICOM_THIS(IMalloc16Impl,iface);
-    TRACE("(%p)->Release()\n",This);
-    return 1; /* cannot be freed */
+        TRACE("(%p)->Release()\n",This);
+        return 1; /* cannot be freed */
 }
 
@@ -139 +138 @@
 SEGPTR WINAPI IMalloc16_fnAlloc(IMalloc16* iface,DWORD cb) {
         ICOM_THIS(IMalloc16Impl,iface);
-    TRACE("(%p)->Alloc(%ld)\n",This,cb);
+        TRACE("(%p)->Alloc(%ld)\n",This,cb);
         return MapLS( HeapAlloc( GetProcessHeap(), HEAP_WINE_SEGPTR, cb ) );
 }
@@ -166 +165 @@
 DWORD WINAPI IMalloc16_fnGetSize(const IMalloc16* iface,SEGPTR pv)
 {
-    ICOM_CTHIS(IMalloc16Impl,iface);
+        ICOM_CTHIS(IMalloc16Impl,iface);
         TRACE("(%p)->GetSize(%08lx)\n",This,pv);
         return HeapSize( GetProcessHeap(), HEAP_WINE_SEGPTR, MapSL(pv) );
@@ -176 +175 @@
 INT16 WINAPI IMalloc16_fnDidAlloc(const IMalloc16* iface,LPVOID pv) {
         ICOM_CTHIS(IMalloc16,iface);
-    TRACE("(%p)->DidAlloc(%p)\n",This,pv);
-    return (INT16)-1;
+        TRACE("(%p)->DidAlloc(%p)\n",This,pv);
+        return (INT16)-1;
 }
 
@@ -185 +184 @@
 LPVOID WINAPI IMalloc16_fnHeapMinimize(IMalloc16* iface) {
         ICOM_THIS(IMalloc16Impl,iface);
-    TRACE("(%p)->HeapMinimize()\n",This);
-    return NULL;
+        TRACE("(%p)->HeapMinimize()\n",This);
+        return NULL;
 }
 
@@ -196 +195 @@
 LPMALLOC16
 IMalloc16_Constructor() {
-    IMalloc16Impl*  This;
-        HMODULE16   hcomp = GetModuleHandle16("COMPOBJ");
-
-    This = (IMalloc16Impl*)SEGPTR_NEW(IMalloc16Impl);
+        IMalloc16Impl*  This;
+        HMODULE16       hcomp = GetModuleHandle16("COMPOBJ");
+
+        This = (IMalloc16Impl*)SEGPTR_NEW(IMalloc16Impl);
         if (!msegvt16) {
             msegvt16 = SEGPTR_NEW(ICOM_VTABLE(IMalloc16));
@@ -214 +213 @@
             VTENT(HeapMinimize);
 #undef VTENT
-    }
+        }
         ICOM_VTBL(This) = (ICOM_VTABLE(IMalloc16)*)SEGPTR_GET(msegvt16);
-    This->ref = 1;
-    return (LPMALLOC16)SEGPTR_GET(This);
+        This->ref = 1;
+        return (LPMALLOC16)SEGPTR_GET(This);
 }
 #endif
@@ -231 +230 @@
 
 /******************************************************************************
- *      IMalloc32_QueryInterface    [VTABLE]
+ *              IMalloc32_QueryInterface        [VTABLE]
  */
 static HRESULT WINAPI IMalloc_fnQueryInterface(LPMALLOC iface,REFIID refiid,LPVOID *obj) {
-    ICOM_THIS(IMalloc32Impl,iface);
-
-    TRACE("(%p)->QueryInterface(%s,%p)\n",This,debugstr_guid(refiid),obj);
-    if (    !memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown)) ||
-        !memcmp(&IID_IMalloc,refiid,sizeof(IID_IMalloc))
-    ) {
-        *obj = This;
-        return S_OK;
-    }
-    return OLE_E_ENUM_NOMORE;
-}
-
-/******************************************************************************
- *      IMalloc32_AddRef    [VTABLE]
+        ICOM_THIS(IMalloc32Impl,iface);
+
+        TRACE("(%p)->QueryInterface(%s,%p)\n",This,debugstr_guid(refiid),obj);
+        if (    !memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown)) ||
+                !memcmp(&IID_IMalloc,refiid,sizeof(IID_IMalloc))
+        ) {
+                *obj = This;
+                return S_OK;
+        }
+        return OLE_E_ENUM_NOMORE; 
+}
+
+/******************************************************************************
+ *              IMalloc32_AddRef        [VTABLE]
  */
 static ULONG WINAPI IMalloc_fnAddRef(LPMALLOC iface) {
-    ICOM_THIS(IMalloc32Impl,iface);
-    TRACE("(%p)->AddRef()\n",This);
-    return 1; /* cannot be freed */
-}
-
-/******************************************************************************
- *      IMalloc32_Release   [VTABLE]
+        ICOM_THIS(IMalloc32Impl,iface);
+        TRACE("(%p)->AddRef()\n",This);
+        return 1; /* cannot be freed */
+}
+
+/******************************************************************************
+ *              IMalloc32_Release       [VTABLE]
  */
 static ULONG WINAPI IMalloc_fnRelease(LPMALLOC iface) {
-    ICOM_THIS(IMalloc32Impl,iface);
-    TRACE("(%p)->Release()\n",This);
-    return 1; /* cannot be freed */
+        ICOM_THIS(IMalloc32Impl,iface);
+        TRACE("(%p)->Release()\n",This);
+        return 1; /* cannot be freed */
 }
 
@@ -268 +267 @@
  */
 static LPVOID WINAPI IMalloc_fnAlloc(LPMALLOC iface,DWORD cb) {
-    LPVOID addr;
-    ICOM_THIS(IMalloc32Impl,iface);
-    addr = HeapAlloc(GetProcessHeap(),0,cb);
-    TRACE("(%p)->Alloc(%ld) -> %p\n",This,cb,addr);
-    return addr;
+        LPVOID addr;
+        ICOM_THIS(IMalloc32Impl,iface);
+        addr = HeapAlloc(GetProcessHeap(),0,cb);
+        TRACE("(%p)->Alloc(%ld) -> %p\n",This,cb,addr);
+        return addr;
 }
 
@@ -279 +278 @@
  */
 static LPVOID WINAPI IMalloc_fnRealloc(LPMALLOC iface,LPVOID pv,DWORD cb) {
-    ICOM_THIS(IMalloc32Impl,iface);
-    TRACE("(%p)->Realloc(%p,%ld)\n",This,pv,cb);
-    return HeapReAlloc(GetProcessHeap(),0,pv,cb);
+        ICOM_THIS(IMalloc32Impl,iface);
+        TRACE("(%p)->Realloc(%p,%ld)\n",This,pv,cb);
+        return HeapReAlloc(GetProcessHeap(),0,pv,cb);
 }
 
@@ -288 +287 @@
  */
 static VOID WINAPI IMalloc_fnFree(LPMALLOC iface,LPVOID pv) {
-    ICOM_THIS(IMalloc32Impl,iface);
-    TRACE("(%p)->Free(%p)\n",This,pv);
-    HeapFree(GetProcessHeap(),0,pv);
+        ICOM_THIS(IMalloc32Impl,iface);
+        TRACE("(%p)->Free(%p)\n",This,pv);
+        HeapFree(GetProcessHeap(),0,pv);
 }
 
@@ -297 +296 @@
  */
 static DWORD WINAPI IMalloc_fnGetSize(LPMALLOC iface,LPVOID pv) {
-    ICOM_CTHIS(IMalloc,iface);
-    TRACE("(%p)->GetSize(%p)\n",This,pv);
-    return HeapSize(GetProcessHeap(),0,pv);
+        ICOM_CTHIS(IMalloc,iface);
+        TRACE("(%p)->GetSize(%p)\n",This,pv);
+        return HeapSize(GetProcessHeap(),0,pv);
 }
 
@@ -306 +305 @@
  */
 static INT WINAPI IMalloc_fnDidAlloc(LPMALLOC iface,LPVOID pv) {
-    ICOM_CTHIS(IMalloc32Impl,iface);
-    TRACE("(%p)->DidAlloc(%p)\n",This,pv);
-    return -1;
+        ICOM_CTHIS(IMalloc32Impl,iface);
+        TRACE("(%p)->DidAlloc(%p)\n",This,pv);
+        return -1;
 }
 
@@ -315 +314 @@
  */
 static VOID WINAPI IMalloc_fnHeapMinimize(LPMALLOC iface) {
-    ICOM_THIS(IMalloc32Impl,iface);
-    TRACE("(%p)->HeapMinimize()\n",This);
-}
-
-static ICOM_VTABLE(IMalloc) VT_IMalloc32 =
+        ICOM_THIS(IMalloc32Impl,iface);
+        TRACE("(%p)->HeapMinimize()\n",This);
+}
+
+static ICOM_VTABLE(IMalloc) VT_IMalloc32 = 
 {
     ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
@@ -338 +337 @@
 LPMALLOC
 IMalloc_Constructor() {
-    IMalloc32Impl* This;
-
-    This = (IMalloc32Impl*)HeapAlloc(GetProcessHeap(),0,sizeof(IMalloc32Impl));
-    ICOM_VTBL(This) = &VT_IMalloc32;
-    This->ref = 1;
-    return (LPMALLOC)This;
+        IMalloc32Impl* This;
+
+        This = (IMalloc32Impl*)HeapAlloc(GetProcessHeap(),0,sizeof(IMalloc32Impl));
+        ICOM_VTBL(This) = &VT_IMalloc32;
+        This->ref = 1;
+        return (LPMALLOC)This;
 }
 
@@ -351 +350 @@
 
 /******************************************************************************
- *      IsValidInterface    [OLE32.78]
+ *              IsValidInterface        [OLE32.78]
  *
  * RETURNS
@@ -357 +356 @@
  */
 BOOL WINAPI IsValidInterface(
-    LPUNKNOWN punk  /* [in] interface to be tested */
+        LPUNKNOWN punk  /* [in] interface to be tested */
 ) {
-    return !(
-        IsBadReadPtr(punk,4)                    ||
-        IsBadReadPtr(ICOM_VTBL(punk),4)             ||
+        return !(
+                IsBadReadPtr(punk,4)                                    ||
+                IsBadReadPtr(ICOM_VTBL(punk),4)                         ||
 #ifdef __WIN32OS2__
-        IsBadReadPtr(ICOM_VTBL(punk)->fnQueryInterface,9)   ||
-        IsBadCodePtr((FARPROC)ICOM_VTBL(punk)->fnQueryInterface)
+                IsBadReadPtr(ICOM_VTBL(punk)->fnQueryInterface,9)       ||
+                IsBadCodePtr((FARPROC)ICOM_VTBL(punk)->fnQueryInterface)
 #else
-        IsBadReadPtr(ICOM_VTBL(punk)->QueryInterface,9) ||
-        IsBadCodePtr((FARPROC)ICOM_VTBL(punk)->QueryInterface)
+                IsBadReadPtr(ICOM_VTBL(punk)->QueryInterface,9) ||
+                IsBadCodePtr((FARPROC)ICOM_VTBL(punk)->QueryInterface)
 #endif
-    );
-}
+        );
+}

trunk/src/ole32/initole32.cpp

@@ -1 @@
-/* $Id: initole32.cpp,v 1.3 2001-09-05 13:17:10 bird Exp $
+/*
  * DLL entry point
  *
@@ -52 +52 @@
    case DLL_THREAD_ATTACH:
    case DLL_THREAD_DETACH:
-    return OLE32_DllEntryPoint(hinstDLL, fdwReason, fImpLoad);
+        return OLE32_DllEntryPoint(hinstDLL, fdwReason, fImpLoad);
 
    case DLL_PROCESS_DETACH:
         OLE32_DllEntryPoint(hinstDLL, fdwReason, fImpLoad);
-    return TRUE;
+        return TRUE;
    }
    return FALSE;
@@ -82 +82 @@
       case 0 :
       {
-     dllHandle = RegisterLxDll(hModule, LibMainOLE32, (PVOID)&ole32os2_PEResTab);
-         if(dllHandle == 0)
-        return 0UL;
+         dllHandle = RegisterLxDll(hModule, LibMainOLE32, (PVOID)&ole32os2_PEResTab);
+         if(dllHandle == 0) 
+                return 0UL;
 
          break;
@@ -90 +90 @@
       case 1 :
          if(dllHandle) {
-        UnregisterLxDll(dllHandle);
+                UnregisterLxDll(dllHandle);
          }
          break;

trunk/src/ole32/initterm.cpp

@@ -1 @@
-/* $Id: initterm.cpp,v 1.11 2001-09-05 13:17:10 bird Exp $
- *
+/*
  * DLL entry point
  *

trunk/src/ole32/itemmoniker.c

@@ -1 @@
-/* $Id: itemmoniker.c,v 1.2 2001-09-05 13:17:10 bird Exp $ */
 /***************************************************************************************
- *                        ItemMonikers implementation
+ *                            ItemMonikers implementation
  *
  *           Copyright 1999  Noomen Hamza
@@ -26 +25 @@
     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.
      */
@@ -36 +35 @@
 
     LPOLESTR itemDelimiter; /* Delimiter string */
-
+    
 } ItemMonikerImpl;
 
@@ -141 +140 @@
   /* Perform a sanity check on the parameters.*/
     if ( (This==0) || (ppvObject==0) )
-    return E_INVALIDARG;
-
+        return E_INVALIDARG;
+  
   /* Initialize the return parameter */
   *ppvObject = 0;
@@ -153 +152 @@
      )
       *ppvObject = iface;
-
+  
     else if (IsEqualIID(&IID_IROTData, riid))
         *ppvObject = (IROTData*)&(This->lpvtbl2);
@@ -160 +159 @@
     if ((*ppvObject)==0)
         return E_NOINTERFACE;
-
+  
    /* Query Interface always increases the reference count by one when it is successful */
   ItemMonikerImpl_AddRef(iface);
@@ -209 +208 @@
     if (pClassID==NULL)
         return E_POINTER;
-
+            
     *pClassID = CLSID_ItemMoniker;
-
+        
     return S_OK;
 }
@@ -343 +342 @@
 
     /* for more details see ItemMonikerImpl_Save coments */
-
+    
     pcbSize->s.LowPart =  sizeof(DWORD) + /* DWORD which contains delimiter length */
                         delimiterLength + /* item delimiter string */
@@ -363 +362 @@
     int sizeStr1=lstrlenW(lpszItem), sizeStr2;
     static const OLECHAR emptystr[1];
-    LPCOLESTR   delim;
+    LPCOLESTR   delim;
 
     TRACE("(%p,%p)\n",This,lpszItem);
@@ -374 +373 @@
     This->itemName=HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*(sizeStr1+1));
     if (!This->itemName)
-    return E_OUTOFMEMORY;
+        return E_OUTOFMEMORY;
     strcpyW(This->itemName,lpszItem);
 
     if (!lpszDelim)
-    FIXME("lpszDelim is NULL. Using empty string which is possibly wrong.\n");
+        FIXME("lpszDelim is NULL. Using empty string which is possibly wrong.\n");
 
     delim = lpszDelim ? lpszDelim : emptystr;
@@ -385 +384 @@
     This->itemDelimiter=HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*(sizeStr2+1));
     if (!This->itemDelimiter) {
-    HeapFree(GetProcessHeap(),0,This->itemName);
-    return E_OUTOFMEMORY;
+        HeapFree(GetProcessHeap(),0,This->itemName);
+        return E_OUTOFMEMORY;
     }
     strcpyW(This->itemDelimiter,delim);
@@ -420 +419 @@
 {
     ICOM_THIS(ItemMonikerImpl,iface);
-
+    
     HRESULT   res;
     IID    refid=IID_IOleItemContainer;
@@ -467 +466 @@
     if(pmkToLeft==NULL)
         return E_INVALIDARG;
-
+        
     res=IMoniker_BindToObject(pmkToLeft,pbc,NULL,&IID_IOleItemContainer,(void**)&poic);
 
@@ -497 +496 @@
 
     *ppmkReduced=iface;
-
+    
     return MK_S_REDUCED_TO_SELF;
 }
@@ -517 +516 @@
 
     if ((ppmkComposite==NULL)||(pmkRight==NULL))
-    return E_POINTER;
+        return E_POINTER;
 
     *ppmkComposite=0;
-
+    
     IMoniker_IsSystemMoniker(pmkRight,&mkSys);
 
@@ -530 +529 @@
         /* 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){
 
@@ -548 +547 @@
                 tempMkComposite=iface;
                 IMoniker_AddRef(iface);
-
+                
                 while(IEnumMoniker_Next(penumMk,1,&pmostLeftMk,NULL)==S_OK){
 
@@ -605 +604 @@
     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. */
@@ -620 +619 @@
     IMoniker_GetDisplayName(iface,bind,NULL,&dispName1);
     IMoniker_GetDisplayName(pmkOtherMoniker,bind,NULL,&dispName2);
-
+    
     if (lstrcmpW(dispName1,dispName2)!=0)
         return S_FALSE;
-
+    
     return S_OK;
 }
@@ -640 +639 @@
     if (pdwHash==NULL)
         return E_POINTER;
-
+    
     val =  This->itemName;
     len = lstrlenW(val);
@@ -650 +649 @@
     } else {
         /* only sample some characters */
-    skip = len / 8;
-    for (i = len ; i > 0; i -= skip, off += skip) {
+        skip = len / 8;
+        for (i = len ; i > 0; i -= skip, off += skip) {
             h = (h * 39) + val[off];
-    }
+        }
     }
 
@@ -699 +698 @@
         /* 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);
 
@@ -780 +779 @@
 
         *ppmkPrefix=iface;
-
+        
         IMoniker_AddRef(iface);
-
+        
         return MK_S_US;
     }
@@ -802 +801 @@
 
     *ppmkRelPath=0;
-
+    
     return MK_E_NOTBINDABLE;
 }
@@ -832 +831 @@
     strcpyW(*ppszDisplayName,This->itemDelimiter);
     strcatW(*ppszDisplayName,This->itemName);
-
+    
     return S_OK;
 }
@@ -886 +885 @@
     if (!pwdMksys)
         return E_POINTER;
-
+    
     (*pwdMksys)=MKSYS_ITEMMONIKER;
 
@@ -923 +922 @@
 {
     ICOM_THIS_From_IROTData(IMoniker, iface);
-
+    
     TRACE("(%p)\n",iface);
 
@@ -942 +941 @@
 
 /******************************************************************************
- *        CreateItemMoniker16   [OLE2.28]
+ *        CreateItemMoniker16   [OLE2.28]
  ******************************************************************************/
 HRESULT WINAPI CreateItemMoniker16(LPCOLESTR16 lpszDelim,LPCOLESTR  lpszItem,LPMONIKER* ppmk)
@@ -953 +952 @@
 
 /******************************************************************************
- *        CreateItemMoniker [OLE.55]
+ *        CreateItemMoniker     [OLE.55]
  ******************************************************************************/
 HRESULT WINAPI CreateItemMoniker(LPCOLESTR lpszDelim,LPCOLESTR  lpszItem, LPMONIKER * ppmk)

trunk/src/ole32/memlockbytes.c

@@ -1 @@
-/* $Id: memlockbytes.c,v 1.2 2001-09-05 13:17:10 bird Exp $ */
 /******************************************************************************
  *
@@ -26 +25 @@
 {
   /*
-   * Needs to be the first item in the stuct
+   * Needs to be the first item in the stuct 
    * since we want to cast this in an ILockBytes pointer
    */
@@ -189 +188 @@
   HGLOBALLockBytesImpl* newLockBytes;
   newLockBytes = HeapAlloc(GetProcessHeap(), 0, sizeof(HGLOBALLockBytesImpl));
-
+ 
   if (newLockBytes!=0)
   {
@@ -197 +196 @@
     ICOM_VTBL(newLockBytes) = &HGLOBALLockBytesImpl_Vtbl;
     newLockBytes->ref    = 0;
-
+  
     /*
      * Initialize the support.
@@ -399 +398 @@
    * The function returns S_OK if the specified number of bytes were read
    * or the end of the array was reached.
-   * It returns STG_E_READFAULT if the number of bytes to read does not equal
+   * It returns STG_E_READFAULT if the number of bytes to read does not equal 
    * the number of bytes actually read.
    */
@@ -504 +503 @@
   if (libNewSize.s.HighPart != 0)
     return STG_E_INVALIDFUNCTION;
-
+ 
   if (This->byteArraySize.s.LowPart == libNewSize.s.LowPart)
     return S_OK;
@@ -519 +518 @@
 
   This->byteArraySize.s.LowPart = libNewSize.s.LowPart;
-
+ 
   return S_OK;
 }

trunk/src/ole32/moniker.c

@@ -1 @@
-/* $Id: moniker.c,v 1.3 2001-09-05 13:17:10 bird Exp $ */
 /*
- *  Monikers
+ *      Monikers
  *
- *  Copyright 1998  Marcus Meissner
+ *      Copyright 1998  Marcus Meissner
  *      Copyright 1999  Noomen Hamza
  */
@@ -23 +22 @@
 #include "compobj_private.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);
 
@@ -47 +58 @@
     DWORD      runObjTabLastIndx;  /* first free index element in the table.        */
     DWORD      runObjTabRegister; /* registration key of the next registered object */
-
+    
 } RunningObjectTableImpl;
 
@@ -137 +148 @@
 {
     TRACE("()\n");
-
+    
     if (runningObjectTableInstance==NULL)
         return E_INVALIDARG;
@@ -170 +181 @@
             if (( This->runObjTab[i].regTypeObj &  ROTFLAGS_REGISTRATIONKEEPSALIVE) != 0)
                 IUnknown_Release(This->runObjTab[i].pObj);
-
+ 
             IMoniker_Release(This->runObjTab[i].pmkObj);
         }
@@ -230 +241 @@
     if (runningObjectTableInstance==NULL)
         return E_POINTER;
-
+    
     RunningObjectTableImpl_Release((IRunningObjectTable*)runningObjectTableInstance);
 
@@ -271 +282 @@
     This->runObjTab[This->runObjTabLastIndx].identRegObj = This->runObjTabRegister;
     CoFileTimeNow(&(This->runObjTab[This->runObjTabLastIndx].lastModifObj));
-
+    
     /* gives a registration identifier to the registered object*/
     (*pdwRegister)= This->runObjTabRegister;
@@ -278 +289 @@
 
         FIXME("runObjTabRegister: %ld is out of data limite \n",This->runObjTabRegister);
-    return E_FAIL;
+        return E_FAIL;
 }
     This->runObjTabRegister++;
     This->runObjTabLastIndx++;
-
+    
     if (This->runObjTabLastIndx == This->runObjTabSize){ /* table is full ! so it must be resized */
 
@@ -296 +307 @@
 
     IMoniker_AddRef(pmkObjectName);
-
+    
     return res;
 }
@@ -322 +333 @@
 
     IMoniker_Release(This->runObjTab[index].pmkObj);
-
+    
     /* remove the object from the table */
     for(j=index; j<This->runObjTabLastIndx-1; j++)
         This->runObjTab[j]= This->runObjTab[j+1];
-
+    
     This->runObjTabLastIndx--;
 
@@ -337 +348 @@
 HRESULT WINAPI RunningObjectTableImpl_IsRunning(  IRunningObjectTable* iface,
                                                   IMoniker *pmkObjectName)  /* Pointer to the moniker of the object whose status is desired */
-{
+{    
     ICOM_THIS(RunningObjectTableImpl,iface);
 
@@ -359 +370 @@
     if (ppunkObject==NULL)
         return E_POINTER;
-
+    
     *ppunkObject=0;
 
@@ -394 +405 @@
     return S_OK;
 }
-
+    
 /***********************************************************************
  *        RunningObjectTable_GetTimeOfLastChange
@@ -448 +459 @@
         /* search object identified by a register identifier */
         for(i=0;((i<This->runObjTabLastIndx)&&(This->runObjTab[i].identRegObj!=identReg));i++);
-
+    
     if (i==This->runObjTabLastIndx)  return S_FALSE;
 
@@ -457 +468 @@
 
 /******************************************************************************
- *      GetRunningObjectTable16 [OLE2.30]
+ *              GetRunningObjectTable16 [OLE2.30]
  */
 HRESULT WINAPI GetRunningObjectTable16(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot)
 {
-    FIXME("(%ld,%p),stub!\n",reserved,pprot);
+        FIXME("(%ld,%p),stub!\n",reserved,pprot);
     return E_NOTIMPL;
 }
@@ -491 +502 @@
 HRESULT WINAPI OleRun(LPUNKNOWN pUnknown)
 {
-  IRunnableObject   *runable;
+  IRunnableObject       *runable;
   ICOM_THIS(IRunnableObject,pUnknown);
-  LRESULT       ret;
+  LRESULT               ret;
 
 #ifdef __WIN32OS2__
@@ -502 +513 @@
 
   ret = IRunnableObject_QueryInterface(This,&IID_IRunnableObject,(LPVOID*)&runable);
-  if (ret)
-    return 0; /* Appears to return no error. */
+  if (ret) 
+        return 0; /* Appears to return no error. */
   ret  = IRunnableObject_Run(runable,NULL);
   IRunnableObject_Release(runable);
@@ -513 +524 @@
  */
 HRESULT WINAPI MkParseDisplayName(LPBC pbc, LPCOLESTR szUserName,
-                LPDWORD pchEaten, LPMONIKER *ppmk)
+                                LPDWORD pchEaten, LPMONIKER *ppmk)
 {
     FIXME("(%p, %s, %p, %p): stub.\n", pbc, debugstr_w(szUserName), pchEaten, *ppmk);
     if (!(IsValidInterface((LPUNKNOWN) pbc)))
-    return E_INVALIDARG;
+        return E_INVALIDARG;
 
     return MK_E_SYNTAX;

trunk/src/ole32/ole2.c

@@ -1 @@
-/* $Id: ole2.c,v 1.2 2001-09-05 13:17:11 bird Exp $ */
 /*
- *  OLE2 library
- *
- *  Copyright 1995  Martin von Loewis
+ *      OLE2 library
+ *
+ *      Copyright 1995  Martin von Loewis
  *      Copyright 1999  Francis Beaudet
- *      Copyright 1999  Noel Borthwick
+ *      Copyright 1999  Noel Borthwick 
  */
 
@@ -33 +32 @@
 
 /******************************************************************************
- * These are static/global variables and internal data structures that the
+ * These are static/global variables and internal data structures that the 
  * OLE module uses to maintain it's state.
  */
@@ -95 +94 @@
 
 /******************************************************************************
- * These are the prototypes of miscelaneous utility methods
+ * These are the prototypes of miscelaneous utility methods 
  */
 static void OLEUTL_ReadRegistryDWORDValue(HKEY regKey, DWORD* pdwValue);
@@ -124 +123 @@
 static void            OLEDD_UnInitialize();
 static void            OLEDD_InsertDropTarget(
-             DropTargetNode* nodeToAdd);
+                         DropTargetNode* nodeToAdd);
 static DropTargetNode* OLEDD_ExtractDropTarget(
                          HWND hwndOfTarget);
@@ -130 +129 @@
                          HWND hwndOfTarget);
 static LRESULT WINAPI  OLEDD_DragTrackerWindowProc(
-             HWND   hwnd,
-             UINT   uMsg,
-             WPARAM wParam,
-             LPARAM   lParam);
+                         HWND   hwnd, 
+                         UINT   uMsg,
+                         WPARAM wParam, 
+                         LPARAM   lParam);
 static void OLEDD_TrackMouseMove(
                          TrackerWindowInfo* trackerInfo,
-             POINT            mousePos,
-             DWORD              keyState);
+                         POINT            mousePos,
+                         DWORD              keyState);
 static void OLEDD_TrackStateChange(
                          TrackerWindowInfo* trackerInfo,
-             POINT            mousePos,
-             DWORD              keyState);
+                         POINT            mousePos,
+                         DWORD              keyState);
 static DWORD OLEDD_GetButtonState();
 
 
 /******************************************************************************
- *      OleBuildVersion [OLE2.1]
+ *              OleBuildVersion [OLE2.1]
  */
 DWORD WINAPI OleBuildVersion(void)
@@ -169 +168 @@
 
   /*
-   * If the CoInitializeEx call failed, the OLE libraries can't be
+   * If the CoInitializeEx call failed, the OLE libraries can't be 
    * initialized.
    */
   if (FAILED(hr))
-    return hr;
+    return hr;    
 
   /*
@@ -185 +184 @@
   if (OLE_moduleLockCount==0)
 {
-    /*
+    /* 
      * Initialize the libraries.
      */
@@ -209 +208 @@
    * Then, we increase the lock count on the OLE module.
    */
-  OLE_moduleLockCount++;
+  OLE_moduleLockCount++;  
 
   return hr;
@@ -215 +214 @@
 
 /******************************************************************************
- *      CoGetCurrentProcess [COMPOBJ.34] [OLE2.2][OLE32.108]
+ *              CoGetCurrentProcess     [COMPOBJ.34] [OLE2.2][OLE32.108]
  *
  * NOTES
@@ -222 +221 @@
 DWORD WINAPI CoGetCurrentProcess(void)
 {
-    return GetCurrentProcessId();
+        return GetCurrentProcessId();
 }
 
 /******************************************************************************
- *      OleUninitialize [OLE2.3] [OLE32.131]
+ *              OleUninitialize [OLE2.3] [OLE32.131]
  */
 void WINAPI OleUninitialize(void)
@@ -256 +255 @@
      */
     OLEDD_UnInitialize();
-
+    
     /*
      * OLE shared menu
@@ -262 +261 @@
     OLEMenu_UnInitialize();
   }
-
+  
   /*
    * Then, uninitialize the COM libraries.
@@ -272 +271 @@
 //imessagefilter.cpp
 /******************************************************************************
- *      CoRegisterMessageFilter [OLE32.38]
+ *              CoRegisterMessageFilter [OLE32.38]
  */
 HRESULT WINAPI CoRegisterMessageFilter(
-    LPMESSAGEFILTER lpMessageFilter,    /* [in] Pointer to interface */
-    LPMESSAGEFILTER *lplpMessageFilter  /* [out] Indirect pointer to prior instance if non-NULL */
+    LPMESSAGEFILTER lpMessageFilter,    /* [in] Pointer to interface */
+    LPMESSAGEFILTER *lplpMessageFilter  /* [out] Indirect pointer to prior instance if non-NULL */
 ) {
     FIXME("stub\n");
     if (lplpMessageFilter) {
-    *lplpMessageFilter = NULL;
+        *lplpMessageFilter = NULL;
     }
     return S_OK;
@@ -287 +286 @@
 
 /******************************************************************************
- *      OleInitializeWOW    [OLE32.109]
+ *              OleInitializeWOW        [OLE32.109]
  */
 HRESULT WINAPI OleInitializeWOW(DWORD x) {
@@ -298 +297 @@
  */
 HRESULT WINAPI RegisterDragDrop16(
-    HWND16 hwnd,
-    LPDROPTARGET pDropTarget
+        HWND16 hwnd,
+        LPDROPTARGET pDropTarget
 ) {
-    FIXME("(0x%04x,%p),stub!\n",hwnd,pDropTarget);
-    return S_OK;
+        FIXME("(0x%04x,%p),stub!\n",hwnd,pDropTarget);
+        return S_OK;
 }
 
@@ -309 +308 @@
  */
 HRESULT WINAPI RegisterDragDrop(
-    HWND hwnd,
-    LPDROPTARGET pDropTarget)
+        HWND hwnd,
+        LPDROPTARGET pDropTarget) 
 {
   DropTargetNode* dropTargetInfo;
@@ -342 +341 @@
   dropTargetInfo->dropTarget  = pDropTarget;
   IDropTarget_AddRef(dropTargetInfo->dropTarget);
-
+  
   OLEDD_InsertDropTarget(dropTargetInfo);
 
-    return S_OK;
+        return S_OK;
 }
 
@@ -352 +351 @@
  */
 HRESULT WINAPI RevokeDragDrop16(
-    HWND16 hwnd
+        HWND16 hwnd
 ) {
-    FIXME("(0x%04x),stub!\n",hwnd);
-    return S_OK;
+        FIXME("(0x%04x),stub!\n",hwnd);
+        return S_OK;
 }
 
@@ -362 +361 @@
  */
 HRESULT WINAPI RevokeDragDrop(
-    HWND hwnd)
+        HWND hwnd)
 {
   DropTargetNode* dropTargetInfo;
@@ -384 +383 @@
    */
   IDropTarget_Release(dropTargetInfo->dropTarget);
-  HeapFree(GetProcessHeap(), 0, dropTargetInfo);
-
-    return S_OK;
+  HeapFree(GetProcessHeap(), 0, dropTargetInfo);  
+
+        return S_OK;
 }
 
@@ -397 +396 @@
  * way they are registered.
  */
-HRESULT WINAPI OleRegGetUserType(
-    REFCLSID clsid,
-    DWORD dwFormOfType,
-    LPOLESTR* pszUserType)
+HRESULT WINAPI OleRegGetUserType( 
+        REFCLSID clsid, 
+        DWORD dwFormOfType,
+        LPOLESTR* pszUserType)
 {
   char    keyName[60];
@@ -428 +427 @@
    */
   hres = RegOpenKeyA(HKEY_CLASSES_ROOT,
-             keyName,
-             &clsidKey);
+                     keyName,
+                     &clsidKey);
 
   if (hres != ERROR_SUCCESS)
@@ -440 +439 @@
 
   hres = RegQueryValueExA(clsidKey,
-              "",
-              NULL,
-              &dwKeyType,
-              NULL,
-              &cbData);
+                          "",
+                          NULL,
+                          &dwKeyType,
+                          NULL,
+                          &cbData);
 
   if (hres!=ERROR_SUCCESS)
@@ -474 +473 @@
 
   hres = RegQueryValueExA(clsidKey,
-              "",
-              NULL,
-              &dwKeyType,
-              buffer,
-              &cbData);
+                          "",
+                          NULL,
+                          &dwKeyType,
+                          buffer,
+                          &cbData);
 
   RegCloseKey(clsidKey);
 
-
+  
   if (hres!=ERROR_SUCCESS)
   {
@@ -528 +527 @@
 
   hwndTrackWindow = CreateWindowA(OLEDD_DRAGTRACKERCLASS,
-                    "TrackerWindow",
-                    WS_POPUP,
-                    CW_USEDEFAULT, CW_USEDEFAULT,
-                    CW_USEDEFAULT, CW_USEDEFAULT,
-                    0,
-                    0,
-                    0,
-                    (LPVOID)&trackerInfo);
+                                    "TrackerWindow",
+                                    WS_POPUP,
+                                    CW_USEDEFAULT, CW_USEDEFAULT,
+                                    CW_USEDEFAULT, CW_USEDEFAULT,
+                                    0,
+                                    0,
+                                    0,
+                                    (LPVOID)&trackerInfo);
 
   if (hwndTrackWindow!=0)
@@ -549 +548 @@
     while (!trackerInfo.trackingDone && GetMessageA(&msg, 0, 0, 0) )
     {
-      if ( (msg.message >= WM_KEYFIRST) &&
-       (msg.message <= WM_KEYLAST) )
+      if ( (msg.message >= WM_KEYFIRST) && 
+           (msg.message <= WM_KEYLAST) )
       {
-    /*
-     * When keyboard messages are sent to windows on this thread, we
-     * want to ignore notify the drop source that the state changed.
-     * in the case of the Escape key, we also notify the drop source
-     * we give it a special meaning.
-     */
-    if ( (msg.message==WM_KEYDOWN) &&
-         (msg.wParam==VK_ESCAPE) )
-    {
-      trackerInfo.escPressed = TRUE;
-    }
-
-    /*
-     * Notify the drop source.
-     */
-    OLEDD_TrackStateChange(&trackerInfo,
-                   msg.pt,
-                   OLEDD_GetButtonState());
+        /*
+         * When keyboard messages are sent to windows on this thread, we
+         * want to ignore notify the drop source that the state changed.
+         * in the case of the Escape key, we also notify the drop source
+         * we give it a special meaning.
+         */
+        if ( (msg.message==WM_KEYDOWN) &&
+             (msg.wParam==VK_ESCAPE) )
+        {
+          trackerInfo.escPressed = TRUE;
+        }
+
+        /*
+         * Notify the drop source.
+         */       
+        OLEDD_TrackStateChange(&trackerInfo,
+                               msg.pt,
+                               OLEDD_GetButtonState());
       }
       else
       {
-    /*
-     * Dispatch the messages only when it's not a keyboard message.
-     */
-    DispatchMessageA(&msg);
+        /*
+         * Dispatch the messages only when it's not a keyboard message.
+         */
+        DispatchMessageA(&msg);
       }
     }
@@ -634 +633 @@
    */
   result = RegOpenKeyA(HKEY_CLASSES_ROOT,
-               keyName,
-               &clsidKey);
+                       keyName,
+                       &clsidKey);
 
   if (result != ERROR_SUCCESS)
@@ -644 +643 @@
    */
   result = RegOpenKeyA(clsidKey,
-               "MiscStatus",
-               &miscStatusKey);
-
-
+                       "MiscStatus",
+                       &miscStatusKey);
+
+  
   if (result != ERROR_SUCCESS)
   {
@@ -665 +664 @@
 
   result = RegOpenKeyA(miscStatusKey,
-               keyName,
-               &aspectKey);
-
+                       keyName,
+                       &aspectKey);
+  
   if (result == ERROR_SUCCESS)
   {
@@ -687 +686 @@
  */
 HRESULT WINAPI OleSetContainedObject(
-  LPUNKNOWN pUnknown,
+  LPUNKNOWN pUnknown, 
   BOOL      fContained)
 {
@@ -696 +695 @@
 
   hres = IUnknown_QueryInterface(pUnknown,
-                 &IID_IRunnableObject,
-                 (void**)&runnable);
+                                 &IID_IRunnableObject,
+                                 (void**)&runnable);
 
   if (SUCCEEDED(hres))
@@ -715 +714 @@
  */
 HRESULT WINAPI OleLoad(
-  LPSTORAGE       pStg,
-  REFIID          riid,
-  LPOLECLIENTSITE pClientSite,
+  LPSTORAGE       pStg, 
+  REFIID          riid, 
+  LPOLECLIENTSITE pClientSite, 
   LPVOID*         ppvObj)
 {
@@ -726 +725 @@
 
   TRACE("(%p,%p,%p,%p)\n", pStg, riid, pClientSite, ppvObj);
-
+  
   /*
    * TODO, Conversion ... OleDoAutoConvert
@@ -740 +739 @@
    */
   hres = CoCreateInstance(&storageInfo.clsid,
-              NULL,
-              CLSCTX_INPROC_HANDLER,
-              &IID_IOleObject,
-              (void**)&oleObject);
+                          NULL,
+                          CLSCTX_INPROC_HANDLER,
+                          &IID_IOleObject,
+                          (void**)&oleObject);
 
   /*
@@ -752 +751 @@
   {
     hres = OleCreateDefaultHandler(&storageInfo.clsid,
-                   NULL,
-                   &IID_IOleObject,
-                   (void**)&oleObject);
+                                   NULL,
+                                   &IID_IOleObject,
+                                   (void**)&oleObject);
   }
 
@@ -772 +771 @@
    */
   hres = IOleObject_QueryInterface(oleObject,
-                   &IID_IPersistStorage,
-                   (void**)&persistStorage);
-
-  if (SUCCEEDED(hres))
+                                   &IID_IPersistStorage,
+                                   (void**)&persistStorage);
+
+  if (SUCCEEDED(hres)) 
   {
     IPersistStorage_Load(persistStorage, pStg);
@@ -828 +827 @@
   {
     IStorage_Commit(pStg,
-            STGC_DEFAULT);
-  }
-
+                    STGC_DEFAULT);
+  }
+  
   return hres;
 }
@@ -838 +837 @@
  *              OleLockRunning        [OLE32.114]
  */
-HRESULT WINAPI OleLockRunning(LPUNKNOWN pUnknown, BOOL fLock, BOOL fLastUnlockCloses)
+HRESULT WINAPI OleLockRunning(LPUNKNOWN pUnknown, BOOL fLock, BOOL fLastUnlockCloses) 
 {
   IRunnableObject* runnable = NULL;
@@ -846 +845 @@
 
   hres = IUnknown_QueryInterface(pUnknown,
-                 &IID_IRunnableObject,
-                 (void**)&runnable);
+                                 &IID_IRunnableObject,
+                                 (void**)&runnable);
 
   if (SUCCEEDED(hres))
@@ -903 +902 @@
   pHookItem->tid = tid;
   pHookItem->hHeap = GetProcessHeap();
-
+  
   /* Install a thread scope message hook for WH_GETMESSAGE */
   pHookItem->GetMsg_hHook = SetWindowsHookExA( WH_GETMESSAGE, OLEMenu_GetMsgProc,
@@ -919 +918 @@
   pHookItem->next = hook_list;
   hook_list = pHookItem;
-
+  
   return TRUE;
-
+  
 CLEANUP:
   /* Unhook any hooks */
@@ -930 +929 @@
   /* Release the hook table entry */
   HeapFree(pHookItem->hHeap, 0, pHookItem );
-
+  
   return FALSE;
 }
@@ -995 +994 @@
       return pHookItem;
   }
-
+  
   return NULL;
 }
@@ -1016 +1015 @@
   {
     HMENU hsubmenu;
-
+      
     /*  Is the current item a submenu? */
     if ( (hsubmenu = GetSubMenu(hMainMenu, i)) )
@@ -1063 +1062 @@
   if ( !OLEMenu_FindMainMenuIndex( pOleMenuDescriptor->hmenuCombined, hmenu,  &nPos ) )
     return FALSE;
-
+  
   /* The group widths array has counts for the number of elements
    * in the groups File, Edit, Container, Object, Window, Help.
@@ -1096 +1095 @@
   OleMenuHookItem *pHookItem = NULL;
   WORD fuFlags;
-
+  
   TRACE("%i, %04x, %08x\n", code, wParam, (unsigned)lParam );
 
@@ -1102 +1101 @@
   if ( HC_ACTION != code )
     goto NEXTHOOK;
-
+      
   /* Retrieve the current message being dispatched from lParam */
   pMsg = (LPCWPSTRUCT)lParam;
@@ -1132 +1131 @@
       goto NEXTHOOK;
     }
-
+    
     case WM_INITMENUPOPUP:
     {
@@ -1139 +1138 @@
       break;
     }
-
+    
     case WM_MENUSELECT:
     {
@@ -1152 +1151 @@
       break;
     }
-
+    
     case WM_DRAWITEM:
     {
@@ -1172 +1171 @@
                   pMsg->message, pMsg->wParam, pMsg->lParam );
   }
-
+    
 NEXTHOOK:
   if ( pOleMenuDescriptor )
     GlobalUnlock( hOleMenu );
-
+  
   /* Lookup the hook item for the current thread */
   if ( !( pHookItem = OLEMenu_IsHookInstalled( GetCurrentThreadId() ) ) )
@@ -1184 +1183 @@
     return 0;
   }
-
+  
   /* Pass on the message to the next hooker */
   return CallNextHookEx( pHookItem->CallWndProc_hHook, code, wParam, lParam );
@@ -1201 +1200 @@
   OleMenuHookItem *pHookItem = NULL;
   WORD wCode;
-
+  
   TRACE("%i, %04x, %08x\n", code, wParam, (unsigned)lParam );
 
@@ -1207 +1206 @@
   if ( HC_ACTION != code )
     goto NEXTHOOK;
-
+      
   /* Retrieve the current message being dispatched from lParam */
   pMsg = (LPMSG)lParam;
@@ -1246 +1245 @@
     pMsg->hwnd = pOleMenuDescriptor->hwndActiveObject;
   }
-
+    
 NEXTHOOK:
   if ( pOleMenuDescriptor )
     GlobalUnlock( hOleMenu );
-
+  
   /* Lookup the hook item for the current thread */
   if ( !( pHookItem = OLEMenu_IsHookInstalled( GetCurrentThreadId() ) ) )
@@ -1258 +1257 @@
     return FALSE;
   }
-
+  
   /* Pass on the message to the next hooker */
   return CallNextHookEx( pHookItem->GetMsg_hHook, code, wParam, lParam );
@@ -1296 +1295 @@
   for ( i = 0; i < 6; i++ )
     pOleMenuDescriptor->mgw.width[i] = lpMenuWidths->width[i];
-
+  
   pOleMenuDescriptor->hmenuCombined = hmenuCombined;
   pOleMenuDescriptor->bIsServerItem = FALSE;
   GlobalUnlock( hOleMenu );
-
+      
   return hOleMenu;
 }
@@ -1313 +1312 @@
   if ( hmenuDescriptor )
     GlobalFree( hmenuDescriptor );
-    return S_OK;
+        return S_OK;
 }
 
@@ -1322 +1321 @@
  * OLE should install context sensitive help F1 filtering for the app when
  * these are non null.
- *
+ * 
  * PARAMS:
  *     hOleMenu         Handle to composite menu descriptor
@@ -1350 +1349 @@
   {
      FIXME("(%x, %x, %x, %p, %p), Context sensitive help filtering not implemented!\n",
-    (unsigned int)hOleMenu,
-    hwndFrame,
-    hwndActiveObject,
-    lpFrame,
-    lpActiveObject);
+        (unsigned int)hOleMenu,
+        hwndFrame,
+        hwndActiveObject,
+        lpFrame,
+        lpActiveObject);
   }
 
@@ -1370 +1369 @@
     if ( OLEMenu_IsHookInstalled( GetCurrentThreadId() ) )
   return E_FAIL;
-
+        
     /* Get the menu descriptor */
     pOleMenuDescriptor = (OleMenuDescriptor *) GlobalLock( hOleMenu );
@@ -1382 +1381 @@
     GlobalUnlock( hOleMenu );
     pOleMenuDescriptor = NULL;
-
+    
     /* Add a menu descriptor windows property to the frame window */
     SetPropA( hwndFrame, "PROP_OLEMenuDescriptor", hOleMenu );
@@ -1395 +1394 @@
     if ( !OLEMenu_UnInstallHooks( GetCurrentThreadId() ) )
       return E_FAIL;
-
+    
     /* Remove the menu descriptor property from the frame window */
     RemovePropA( hwndFrame, "PROP_OLEMenuDescriptor" );
   }
-
+      
   return S_OK;
 }
@@ -1420 +1419 @@
 #endif
     {
-    WARN_(accel)("invalid accel handle=%04x\n", hAccel);
-    return FALSE;
+        WARN_(accel)("invalid accel handle=%04x\n", hAccel);
+        return FALSE;
     }
     if((lpMsg->message != WM_KEYDOWN &&
-    lpMsg->message != WM_KEYUP &&
-    lpMsg->message != WM_SYSKEYDOWN &&
-    lpMsg->message != WM_SYSKEYUP &&
-    lpMsg->message != WM_CHAR)) return FALSE;
+        lpMsg->message != WM_KEYUP &&
+        lpMsg->message != WM_SYSKEYDOWN &&
+        lpMsg->message != WM_SYSKEYUP &&
+        lpMsg->message != WM_CHAR)) return FALSE;
 
     TRACE_(accel)("hAccel=%04x, cAccelEntries=%d,"
-        "msg->hwnd=%04x, msg->message=%04x, wParam=%08x, lParam=%08lx\n",
-        hAccel, cAccelEntries,
-        lpMsg->hwnd, lpMsg->message, lpMsg->wParam, lpMsg->lParam);
+                "msg->hwnd=%04x, msg->message=%04x, wParam=%08x, lParam=%08lx\n",
+                hAccel, cAccelEntries,
+                lpMsg->hwnd, lpMsg->message, lpMsg->wParam, lpMsg->lParam);
     for(i = 0; i < cAccelEntries; i++)
     {
-    if(lpAccelTbl[i].key != lpMsg->wParam)
-        continue;
-
-    if(lpMsg->message == WM_CHAR)
-    {
-        if(!(lpAccelTbl[i].fVirt & FALT) && !(lpAccelTbl[i].fVirt & FVIRTKEY))
-        {
-        TRACE_(accel)("found accel for WM_CHAR: ('%c')\n", lpMsg->wParam & 0xff);
-        goto found;
-        }
-    }
-    else
-    {
-        if(lpAccelTbl[i].fVirt & FVIRTKEY)
-        {
-        INT mask = 0;
-        TRACE_(accel)("found accel for virt_key %04x (scan %04x)\n",
-                lpMsg->wParam, HIWORD(lpMsg->lParam) & 0xff);
-        if(GetKeyState(VK_SHIFT) & 0x8000) mask |= FSHIFT;
-        if(GetKeyState(VK_CONTROL) & 0x8000) mask |= FCONTROL;
-        if(GetKeyState(VK_MENU) & 0x8000) mask |= FALT;
-        if(mask == (lpAccelTbl[i].fVirt & (FSHIFT | FCONTROL | FALT))) goto found;
-        TRACE_(accel)("incorrect SHIFT/CTRL/ALT-state\n");
-        }
-        else
-        {
-        if(!(lpMsg->lParam & 0x01000000))  /* no special_key */
-        {
-            if((lpAccelTbl[i].fVirt & FALT) && (lpMsg->lParam & 0x20000000))
-            {                              /* ^^ ALT pressed */
-            TRACE_(accel)("found accel for Alt-%c\n", lpMsg->wParam & 0xff);
-            goto found;
-            }
-        }
-        }
-    }
-    }
+        if(lpAccelTbl[i].key != lpMsg->wParam)
+            continue;
+
+        if(lpMsg->message == WM_CHAR)
+        {
+            if(!(lpAccelTbl[i].fVirt & FALT) && !(lpAccelTbl[i].fVirt & FVIRTKEY))
+            {
+                TRACE_(accel)("found accel for WM_CHAR: ('%c')\n", lpMsg->wParam & 0xff);
+                goto found;
+            }
+        }
+        else
+        {
+            if(lpAccelTbl[i].fVirt & FVIRTKEY)
+            {
+                INT mask = 0;
+                TRACE_(accel)("found accel for virt_key %04x (scan %04x)\n",
+                                lpMsg->wParam, HIWORD(lpMsg->lParam) & 0xff);
+                if(GetKeyState(VK_SHIFT) & 0x8000) mask |= FSHIFT;
+                if(GetKeyState(VK_CONTROL) & 0x8000) mask |= FCONTROL;
+                if(GetKeyState(VK_MENU) & 0x8000) mask |= FALT;
+                if(mask == (lpAccelTbl[i].fVirt & (FSHIFT | FCONTROL | FALT))) goto found;
+                TRACE_(accel)("incorrect SHIFT/CTRL/ALT-state\n");
+            }
+            else
+            {
+                if(!(lpMsg->lParam & 0x01000000))  /* no special_key */
+                {
+                    if((lpAccelTbl[i].fVirt & FALT) && (lpMsg->lParam & 0x20000000))
+                    {                                                  /* ^^ ALT pressed */
+                        TRACE_(accel)("found accel for Alt-%c\n", lpMsg->wParam & 0xff);
+                        goto found;
+                    }
+                }
+            }
+        }
+    }   
 
     WARN_(accel)("couldn't translate accelerator key\n");
@@ -1491 +1490 @@
     case TYMED_HGLOBAL:
     {
-      if ( (pmedium->pUnkForRelease==0) &&
-       (pmedium->u.hGlobal!=0) )
-    GlobalFree(pmedium->u.hGlobal);
+      if ( (pmedium->pUnkForRelease==0) && 
+           (pmedium->u.hGlobal!=0) )
+        GlobalFree(pmedium->u.hGlobal);
 
       pmedium->u.hGlobal = 0;
@@ -1502 +1501 @@
       if (pmedium->u.lpszFileName!=0)
       {
-    if (pmedium->pUnkForRelease==0)
-    {
-      DeleteFileW(pmedium->u.lpszFileName);
-    }
-
-    CoTaskMemFree(pmedium->u.lpszFileName);
+        if (pmedium->pUnkForRelease==0)
+        {
+          DeleteFileW(pmedium->u.lpszFileName);
+        }
+        
+        CoTaskMemFree(pmedium->u.lpszFileName);
       }
 
@@ -1517 +1516 @@
       if (pmedium->u.pstm!=0)
       {
-    IStream_Release(pmedium->u.pstm);
+        IStream_Release(pmedium->u.pstm);
       }
 
@@ -1527 +1526 @@
       if (pmedium->u.pstg!=0)
       {
-    IStorage_Release(pmedium->u.pstg);
+        IStorage_Release(pmedium->u.pstg);
       }
 
@@ -1535 +1534 @@
     case TYMED_GDI:
     {
-      if ( (pmedium->pUnkForRelease==0) &&
-       (pmedium->u.hGlobal!=0) )
-    DeleteObject(pmedium->u.hGlobal);
+      if ( (pmedium->pUnkForRelease==0) && 
+           (pmedium->u.hGlobal!=0) )
+        DeleteObject(pmedium->u.hGlobal);
 
       pmedium->u.hGlobal = 0;
@@ -1544 +1543 @@
     case TYMED_MFPICT:
     {
-      if ( (pmedium->pUnkForRelease==0) &&
-       (pmedium->u.hMetaFilePict!=0) )
+      if ( (pmedium->pUnkForRelease==0) && 
+           (pmedium->u.hMetaFilePict!=0) )
       {
-    LPMETAFILEPICT pMP = GlobalLock(pmedium->u.hMetaFilePict);
-    DeleteMetaFile(pMP->hMF);
-    GlobalUnlock(pmedium->u.hMetaFilePict);
-    GlobalFree(pmedium->u.hMetaFilePict);
+        LPMETAFILEPICT pMP = GlobalLock(pmedium->u.hMetaFilePict);
+        DeleteMetaFile(pMP->hMF);
+        GlobalUnlock(pmedium->u.hMetaFilePict);
+        GlobalFree(pmedium->u.hMetaFilePict);
       }
 
@@ -1558 +1557 @@
     case TYMED_ENHMF:
     {
-      if ( (pmedium->pUnkForRelease==0) &&
-       (pmedium->u.hEnhMetaFile!=0) )
+      if ( (pmedium->pUnkForRelease==0) && 
+           (pmedium->u.hEnhMetaFile!=0) )
       {
-    DeleteEnhMetaFile(pmedium->u.hEnhMetaFile);
+        DeleteEnhMetaFile(pmedium->u.hEnhMetaFile);
       }
 
@@ -1599 +1598 @@
     wndClass.hbrBackground = 0;
     wndClass.lpszClassName = OLEDD_DRAGTRACKERCLASS;
-
+ 
     RegisterClassA (&wndClass);
 }
@@ -1665 +1664 @@
   /*
    * If we get here, we have found a spot for our item. The parentNodeLink
-   * pointer points to the pointer that we have to modify.
+   * pointer points to the pointer that we have to modify. 
    * The curNode should be NULL. We just have to establish the link and Voila!
    */
@@ -1712 +1711 @@
     {
       /*
-       * The item was found in the list. Detach it from it's parent and
+       * The item was found in the list. Detach it from it's parent and 
        * re-insert it's kids in the tree.
        */
@@ -1728 +1727 @@
       if (curNode->nextDropTarget!=NULL)
       {
-    OLEDD_InsertDropTarget(curNode->nextDropTarget);
+        OLEDD_InsertDropTarget(curNode->nextDropTarget);
       }
 
@@ -1802 +1801 @@
  */
 static LRESULT WINAPI OLEDD_DragTrackerWindowProc(
-             HWND   hwnd,
-             UINT   uMsg,
-             WPARAM wParam,
-             LPARAM   lParam)
+                         HWND   hwnd, 
+                         UINT   uMsg,
+                         WPARAM wParam, 
+                         LPARAM   lParam)
 {
   switch (uMsg)
@@ -1813 +1812 @@
       LPCREATESTRUCTA createStruct = (LPCREATESTRUCTA)lParam;
 
-      SetWindowLongA(hwnd, 0, (LONG)createStruct->lpCreateParams);
-
-
+      SetWindowLongA(hwnd, 0, (LONG)createStruct->lpCreateParams); 
+
+      
       break;
     }
@@ -1910 +1909 @@
    * DragOver notification
    */
-  if ( (trackerInfo->curDragTarget != 0) &&
+  if ( (trackerInfo->curDragTarget != 0) && 
        (trackerInfo->curDragTargetHWND==hwndNewTarget) )
   {
     POINTL  mousePosParam;
-
+    
     /*
      * The documentation tells me that the coordinate should be in the target
@@ -1922 +1921 @@
     mousePosParam.x = mousePos.x;
     mousePosParam.y = mousePos.y;
-
+    
     IDropTarget_DragOver(trackerInfo->curDragTarget,
-             keyState,
-             mousePosParam,
-             trackerInfo->pdwEffect);
+                         keyState,
+                         mousePosParam,
+                         trackerInfo->pdwEffect);
   }
   else
   {
     DropTargetNode* newDropTargetNode = 0;
-
+    
     /*
      * If we changed window, we have to notify our old target and check for
@@ -1940 +1939 @@
       IDropTarget_DragLeave(trackerInfo->curDragTarget);
     }
-
+    
     /*
      * Make sure we're hovering over a window.
@@ -1951 +1950 @@
       HWND nexttar = hwndNewTarget;
       do {
-    newDropTargetNode = OLEDD_FindDropTarget(nexttar);
+        newDropTargetNode = OLEDD_FindDropTarget(nexttar);
       } while (!newDropTargetNode && (nexttar = GetParent(nexttar)) != 0);
       if(nexttar) hwndNewTarget = nexttar;
@@ -1957 +1956 @@
       trackerInfo->curDragTargetHWND = hwndNewTarget;
       trackerInfo->curDragTarget     = newDropTargetNode ? newDropTargetNode->dropTarget : 0;
-
+      
       /*
        * If there is, notify it that we just dragged-in
@@ -1963 +1962 @@
       if (trackerInfo->curDragTarget!=0)
       {
-    POINTL  mousePosParam;
-
-    /*
-     * The documentation tells me that the coordinate should be in the target
-     * window's coordinate space. However, the tests I made tell me the
-     * coordinates should be in screen coordinates.
-     */
-    mousePosParam.x = mousePos.x;
-    mousePosParam.y = mousePos.y;
-
-    IDropTarget_DragEnter(trackerInfo->curDragTarget,
-                  trackerInfo->dataObject,
-                  keyState,
-                  mousePosParam,
-                  trackerInfo->pdwEffect);
+        POINTL  mousePosParam;
+        
+        /*
+         * The documentation tells me that the coordinate should be in the target
+         * window's coordinate space. However, the tests I made tell me the
+         * coordinates should be in screen coordinates.
+         */
+        mousePosParam.x = mousePos.x;
+        mousePosParam.y = mousePos.y;
+        
+        IDropTarget_DragEnter(trackerInfo->curDragTarget,
+                              trackerInfo->dataObject,
+                              keyState,
+                              mousePosParam,
+                              trackerInfo->pdwEffect);
       }
     }
@@ -1991 +1990 @@
 
   /*
-   * Now that we have done that, we have to tell the source to give
-   * us feedback on the work being done by the target.  If we don't
+   * Now that we have done that, we have to tell the source to give 
+   * us feedback on the work being done by the target.  If we don't 
    * have a target, simulate no effect.
    */
@@ -2001 +2000 @@
 
   hr = IDropSource_GiveFeedback(trackerInfo->dropSource,
-                *trackerInfo->pdwEffect);
+                                *trackerInfo->pdwEffect);
 
   /*
@@ -2027 +2026 @@
       SetCursor(LoadCursorA(OLE32_hInstance, MAKEINTRESOURCEA(0)));
     }
-  }
+  }  
 }
 
@@ -2055 +2054 @@
    */
   trackerInfo->returnValue = IDropSource_QueryContinueDrag(
-                   trackerInfo->dropSource,
-                   trackerInfo->escPressed,
-                   keyState);
-
+                               trackerInfo->dropSource,
+                               trackerInfo->escPressed, 
+                               keyState);
+  
   /*
    * All the return valued will stop the operation except the S_OK
@@ -2071 +2070 @@
 
     /*
-     * Release the mouse in case the drop target decides to show a popup
+     * Release the mouse in case the drop target decides to show a popup 
      * or a menu or something.
      */
     ReleaseCapture();
-
+    
     /*
-     * If we end-up over a target, drop the object in the target or
+     * If we end-up over a target, drop the object in the target or 
      * inform the target that the operation was cancelled.
      */
@@ -2084 +2083 @@
       switch (trackerInfo->returnValue)
       {
-    /*
-     * If the source wants us to complete the operation, we tell
-     * the drop target that we just dropped the object in it.
-     */
+        /*
+         * If the source wants us to complete the operation, we tell 
+         * the drop target that we just dropped the object in it.
+         */
         case DRAGDROP_S_DROP:
-    {
-      POINTL  mousePosParam;
-
-      /*
-       * The documentation tells me that the coordinate should be
-       * in the target window's coordinate space. However, the tests
-       * I made tell me the coordinates should be in screen coordinates.
-       */
-      mousePosParam.x = mousePos.x;
-      mousePosParam.y = mousePos.y;
-
-      IDropTarget_Drop(trackerInfo->curDragTarget,
-               trackerInfo->dataObject,
-               keyState,
-               mousePosParam,
-               trackerInfo->pdwEffect);
-      break;
-    }
-    /*
-     * If the source told us that we should cancel, fool the drop
-     * target by telling it that the mouse left it's window.
-     * Also set the drop effect to "NONE" in case the application
-     * ignores the result of DoDragDrop.
-     */
+        {
+          POINTL  mousePosParam;
+        
+          /*
+           * The documentation tells me that the coordinate should be 
+           * in the target window's coordinate space. However, the tests
+           * I made tell me the coordinates should be in screen coordinates.
+           */
+          mousePosParam.x = mousePos.x;
+          mousePosParam.y = mousePos.y;
+          
+          IDropTarget_Drop(trackerInfo->curDragTarget,
+                           trackerInfo->dataObject,
+                           keyState,
+                           mousePosParam,
+                           trackerInfo->pdwEffect);
+          break;
+        }
+        /*
+         * If the source told us that we should cancel, fool the drop 
+         * target by telling it that the mouse left it's window.
+         * Also set the drop effect to "NONE" in case the application 
+         * ignores the result of DoDragDrop.
+         */
         case DRAGDROP_S_CANCEL:
-      IDropTarget_DragLeave(trackerInfo->curDragTarget);
-      *trackerInfo->pdwEffect = DROPEFFECT_NONE;
-      break;
+          IDropTarget_DragLeave(trackerInfo->curDragTarget);
+          *trackerInfo->pdwEffect = DROPEFFECT_NONE;
+          break;
       }
     }
@@ -2163 +2162 @@
  * params:
  *     regKey   - Key to read the default value from
- *     pdwValue - Pointer to the location where the DWORD
+ *     pdwValue - Pointer to the location where the DWORD 
  *                value is returned. This value is not modified
  *                if the value is not found.
@@ -2169 +2168 @@
 
 static void OLEUTL_ReadRegistryDWORDValue(
-  HKEY   regKey,
+  HKEY   regKey, 
   DWORD* pdwValue)
 {
@@ -2178 +2177 @@
 
   lres = RegQueryValueExA(regKey,
-              "",
-              NULL,
-              &dwKeyType,
-              (LPBYTE)buffer,
-              &cbData);
+                          "",
+                          NULL,
+                          &dwKeyType,
+                          (LPBYTE)buffer,
+                          &cbData);
 
   if (lres==ERROR_SUCCESS)
@@ -2189 +2188 @@
     {
       case REG_DWORD:
-    *pdwValue = *(DWORD*)buffer;
-    break;
+        *pdwValue = *(DWORD*)buffer;
+        break;
       case REG_EXPAND_SZ:
       case REG_MULTI_SZ:
       case REG_SZ:
-    *pdwValue = (DWORD)strtoul(buffer, NULL, 10);
-    break;
+        *pdwValue = (DWORD)strtoul(buffer, NULL, 10);
+        break;
     }
   }
@@ -2210 +2209 @@
  */
 HGLOBAL16 WINAPI OleMetaFilePictFromIconAndLabel16(
-    HICON16 hIcon,
-    LPCOLESTR16 lpszLabel,
-    LPCOLESTR16 lpszSourceFile,
-    UINT16 iIconIndex
+        HICON16 hIcon,
+        LPCOLESTR16 lpszLabel,
+        LPCOLESTR16 lpszSourceFile,
+        UINT16 iIconIndex
 ) {
     METAFILEPICT16 *mf;
@@ -2223 +2222 @@
     if (!hIcon) {
         if (lpszSourceFile) {
-        HINSTANCE16 hInstance = LoadLibrary16(lpszSourceFile);
-
-        /* load the icon at index from lpszSourceFile */
-        hIcon = (HICON16)LoadIconA(hInstance, (LPCSTR)(DWORD)iIconIndex);
-        FreeLibrary16(hInstance);
-    } else
-        return (HGLOBAL)NULL;
+            HINSTANCE16 hInstance = LoadLibrary16(lpszSourceFile);
+
+            /* load the icon at index from lpszSourceFile */
+            hIcon = (HICON16)LoadIconA(hInstance, (LPCSTR)(DWORD)iIconIndex);
+            FreeLibrary16(hInstance);
+        } else
+            return (HGLOBAL)NULL;
     }
 

trunk/src/ole32/ole2impl.c

@@ -1 @@
-/* $Id: ole2impl.c,v 1.2 2001-09-05 13:17:11 bird Exp $ */
 /*
  * Ole 2 Create functions implementation

trunk/src/ole32/ole2stubs.c

@@ -1 @@
-/* $Id: ole2stubs.c,v 1.2 2001-09-05 13:17:11 bird Exp $ */
 /*
  * Temporary place for ole2 stubs.
@@ -20 +19 @@
  */
 HRESULT WINAPI  OleCreateLinkToFile(LPCOLESTR lpszFileName, REFIID riid,
-            DWORD renderopt, LPFORMATETC lpFormatEtc,
-            LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj)
+                        DWORD renderopt, LPFORMATETC lpFormatEtc,
+                        LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj)
 {
     FIXME("(%p,%p,%li,%p,%p,%p,%p), stub!\n",lpszFileName, riid, renderopt, lpFormatEtc, pClientSite, pStg, ppvObj);
@@ -32 +31 @@
  */
 HRESULT WINAPI OleDuplicateData(HANDLE hSrc, CLIPFORMAT cfFormat,
-                              UINT uiFlags)
+                                  UINT uiFlags)
 {
     FIXME("(%x,%x,%x), stub!\n", hSrc, cfFormat, uiFlags);
@@ -38 +37 @@
 }
 
-
+ 
 /***********************************************************************
  *               WriteFmtUserTypeStg (OLE32.160)
  */
 HRESULT WINAPI WriteFmtUserTypeStg(
-      LPSTORAGE pstg, CLIPFORMAT cf, LPOLESTR lpszUserType)
+          LPSTORAGE pstg, CLIPFORMAT cf, LPOLESTR lpszUserType)
 {
     FIXME("(%p,%x,%s) stub!\n",pstg,cf,debugstr_w(lpszUserType));
@@ -82 +81 @@
  */
 HRESULT WINAPI OleCreate(
-    REFCLSID rclsid,
-    REFIID riid,
-    DWORD renderopt,
-    LPFORMATETC pFormatEtc,
-    LPOLECLIENTSITE pClientSite,
-    LPSTORAGE pStg,
-    LPVOID* ppvObj)
+        REFCLSID rclsid,
+        REFIID riid,
+        DWORD renderopt,
+        LPFORMATETC pFormatEtc,
+        LPOLECLIENTSITE pClientSite,
+        LPSTORAGE pStg,
+        LPVOID* ppvObj)
 {
   HRESULT hres, hres1;
   IUnknown * pUnk = NULL;
-
+    
   FIXME("\n\t%s\n\t%s stub!\n", debugstr_guid(rclsid), debugstr_guid(riid));
 
@@ -106 +105 @@
         hres1 = IOleObject_SetClientSite(pOE, pClientSite);
         TRACE("-- result 0x%08lx\n", hres1);
-    IOleObject_Release(pOE);
+        IOleObject_Release(pOE);
       }
       if (SUCCEEDED((hres = IUnknown_QueryInterface( pUnk, &IID_IPersistStorage, (LPVOID*)&pPS))))
       {
         TRACE("trying to set stg %p\n", pStg);
-    hres1 = IPersistStorage_InitNew(pPS, pStg);
+        hres1 = IPersistStorage_InitNew(pPS, pStg);
         TRACE("-- result 0x%08lx\n", hres1);
-    IPersistStorage_Release(pPS);
+        IPersistStorage_Release(pPS);
       }
     }
@@ -209 +208 @@
  */
 HRESULT     WINAPI OleRegEnumFormatEtc (
-  REFCLSID clsid,
+  REFCLSID clsid, 
   DWORD    dwDirection,
   LPENUMFORMATETC* ppenumFormatetc)
@@ -219 +218 @@
 
 /***********************************************************************
- *           PropVariantClear               [OLE32.166]
+ *           PropVariantClear                       [OLE32.166]
  */
 HRESULT WINAPI PropVariantClear(void *pvar) /* [in/out] FIXME: PROPVARIANT * */
 {
-    FIXME("(%p): stub:\n", pvar);
-
-    *(LPWORD)pvar = 0;
-    /* sets at least the vt field to VT_EMPTY */
-    return S_OK;
-}
-
-/***********************************************************************
- *           PropVariantCopy                [OLE32.246]
+        FIXME("(%p): stub:\n", pvar);
+
+        *(LPWORD)pvar = 0;
+        /* sets at least the vt field to VT_EMPTY */
+        return S_OK;
+}
+
+/***********************************************************************
+ *           PropVariantCopy                        [OLE32.246]
  */
 HRESULT WINAPI PropVariantCopy(void *pvarDest,      /* [out] FIXME: PROPVARIANT * */
-                   const void *pvarSrc) /* [in] FIXME: const PROPVARIANT * */
-{
-    FIXME("(%p, %p): stub:\n", pvarDest, pvarSrc);
-
-    return S_OK;
-}
-
-/***********************************************************************
- *           FreePropVariantArray               [OLE32.195]
+                               const void *pvarSrc) /* [in] FIXME: const PROPVARIANT * */
+{
+        FIXME("(%p, %p): stub:\n", pvarDest, pvarSrc);
+
+        return S_OK;
+}
+
+/***********************************************************************
+ *           FreePropVariantArray                           [OLE32.195]
  */
 HRESULT WINAPI FreePropVariantArray(ULONG cVariants, /* [in] */
-                    void *rgvars)    /* [in/out] FIXME: PROPVARIANT * */
-{
-    FIXME("(%lu, %p): stub:\n", cVariants, rgvars);
-
-    return S_OK;
+                                    void *rgvars)    /* [in/out] FIXME: PROPVARIANT * */
+{
+        FIXME("(%lu, %p): stub:\n", cVariants, rgvars);
+
+        return S_OK;
 }
 

trunk/src/ole32/ole32_main.c

@@ -1 @@
-/* $Id: ole32_main.c,v 1.2 2001-09-05 13:17:11 bird Exp $ */
 /*
  *  OLE32 Initialization
@@ -17 +16 @@
 
 /***********************************************************************
- *      DllEntryPoint (OLE32.@)
+ *              DllEntryPoint (OLE32.@)
  */
 
@@ -27 +26 @@
     case DLL_PROCESS_ATTACH:
         OLE32_hInstance = hinstDLL;
-    break;
+        break;
 
     case DLL_PROCESS_DETACH:
         OLE32_hInstance = 0;
-    break;
+        break;
     }
     return TRUE;
@@ -37 +36 @@
 
 /***********************************************************************
- *      DllRegisterServer (OLE32.@)
+ *              DllRegisterServer (OLE32.@)
  */
 HRESULT WINAPI OLE32_DllRegisterServer() {

trunk/src/ole32/oleobj.c

@@ -1 @@
-/* $Id: oleobj.c,v 1.2 2001-09-05 13:17:11 bird Exp $ */
 /*
- *  OLE2 COM objects
+ *      OLE2 COM objects
  *
- *  Copyright 1998 Eric Kohl
+ *      Copyright 1998 Eric Kohl
  *      Copyright 1999 Francis Beaudet
  */
@@ -13 +12 @@
 #include "debugtools.h"
 #include "oleidl.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);
@@ -72 +83 @@
 
   lpoah= (OleAdviseHolderImpl*)HeapAlloc(GetProcessHeap(),
-                     0,
-                     sizeof(OleAdviseHolderImpl));
-
+                                         0,
+                                         sizeof(OleAdviseHolderImpl));
+  
   ICOM_VTBL(lpoah) = &oahvt;
   lpoah->ref = 1;
   lpoah->maxSinks = INITIAL_SINKS;
   lpoah->arrayOfSinks = HeapAlloc(GetProcessHeap(),
-                  0,
-                  lpoah->maxSinks * sizeof(IAdviseSink*));
+                                  0,
+                                  lpoah->maxSinks * sizeof(IAdviseSink*));
 
   for (index = 0; index < lpoah->maxSinks; index++)
@@ -106 +117 @@
     }
   }
-
+  
   HeapFree(GetProcessHeap(),
-       0,
-       ptrToDestroy->arrayOfSinks);
-
+           0,
+           ptrToDestroy->arrayOfSinks);
+  
 
   HeapFree(GetProcessHeap(),
-       0,
-       ptrToDestroy);
+           0,
+           ptrToDestroy);
 }
 
@@ -122 +133 @@
 static HRESULT WINAPI OleAdviseHolderImpl_QueryInterface(
   LPOLEADVISEHOLDER iface,
-  REFIID            riid,
+  REFIID            riid, 
   LPVOID*           ppvObj)
 {
-  ICOM_THIS(OleAdviseHolderImpl, iface);
+  ICOM_THIS(OleAdviseHolderImpl, iface); 
   TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppvObj);
   /*
@@ -135 +146 @@
   *ppvObj = NULL;
 
-  if (IsEqualIID(riid, &IID_IUnknown))
+  if (IsEqualIID(riid, &IID_IUnknown)) 
   {
     /* IUnknown */
-    *ppvObj = This;
-  }
-  else if(IsEqualIID(riid, &IID_IOleAdviseHolder))
+    *ppvObj = This; 
+  }
+  else if(IsEqualIID(riid, &IID_IOleAdviseHolder)) 
   {
     /* IOleAdviseHolder */
@@ -148 +159 @@
   if(*ppvObj == NULL)
     return E_NOINTERFACE;
-
+  
   /*
    * A successful QI always increments the reference count.
@@ -163 +174 @@
   LPOLEADVISEHOLDER iface)
 {
-  ICOM_THIS(OleAdviseHolderImpl, iface);
-  TRACE("(%p)->(ref=%ld)\n", This, This->ref);
+  ICOM_THIS(OleAdviseHolderImpl, iface); 
+  TRACE("(%p)->(ref=%ld)\n", This, This->ref); 
   return ++(This->ref);
 }
@@ -174 +185 @@
   LPOLEADVISEHOLDER iface)
 {
-  ICOM_THIS(OleAdviseHolderImpl, iface);
-  TRACE("(%p)->(ref=%ld)\n", This, This->ref);
+  ICOM_THIS(OleAdviseHolderImpl, iface); 
+  TRACE("(%p)->(ref=%ld)\n", This, This->ref); 
   This->ref--;
 
@@ -197 +208 @@
 {
   DWORD index;
-
-  ICOM_THIS(OleAdviseHolderImpl, iface);
+  
+  ICOM_THIS(OleAdviseHolderImpl, iface); 
 
   TRACE("(%p)->(%p, %p)\n", This, pAdvise, pdwConnection);
@@ -207 +218 @@
   if (pdwConnection==NULL)
     return E_POINTER;
-
+  
   *pdwConnection = 0;
 
@@ -228 +239 @@
     This->maxSinks+=INITIAL_SINKS;
 
-    This->arrayOfSinks = HeapReAlloc(GetProcessHeap(),
-                     0,
-                     This->arrayOfSinks,
-                     This->maxSinks*sizeof(IAdviseSink*));
+    This->arrayOfSinks = HeapReAlloc(GetProcessHeap(), 
+                                     0,
+                                     This->arrayOfSinks,
+                                     This->maxSinks*sizeof(IAdviseSink*));
 
     for (i=index;i < This->maxSinks; i++)
-      This->arrayOfSinks[i]=0;
+      This->arrayOfSinks[i]=0;      
   }
 
@@ -259 +270 @@
  */
 static HRESULT WINAPI OleAdviseHolderImpl_Unadvise(
-  LPOLEADVISEHOLDER iface,
+  LPOLEADVISEHOLDER iface, 
   DWORD             dwConnection)
 {
-  ICOM_THIS(OleAdviseHolderImpl, iface);
+  ICOM_THIS(OleAdviseHolderImpl, iface); 
 
   TRACE("(%p)->(%lu)\n", This, dwConnection);
 
   /*
-   * So we don't return 0 as a cookie, the index was
+   * So we don't return 0 as a cookie, the index was 
    * incremented by 1 in OleAdviseHolderImpl_Advise
    * we have to compensate.
    */
   dwConnection--;
-
+  
   /*
    * Check for invalid cookies.
    */
-  if ( (dwConnection < 0) ||
+  if ( (dwConnection < 0) || 
        (dwConnection >= This->maxSinks) )
     return OLE_E_NOCONNECTION;
@@ -298 +309 @@
 OleAdviseHolderImpl_EnumAdvise (LPOLEADVISEHOLDER iface, IEnumSTATDATA **ppenumAdvise)
 {
-    ICOM_THIS(OleAdviseHolderImpl, iface);
+    ICOM_THIS(OleAdviseHolderImpl, iface); 
     FIXME("(%p)->(%p)\n", This, ppenumAdvise);
 
@@ -312 +323 @@
 OleAdviseHolderImpl_SendOnRename (LPOLEADVISEHOLDER iface, IMoniker *pmk)
 {
-    ICOM_THIS(OleAdviseHolderImpl, iface);
+    ICOM_THIS(OleAdviseHolderImpl, iface); 
     FIXME("(%p)->(%p)\n", This, pmk);
 
@@ -325 +336 @@
 OleAdviseHolderImpl_SendOnSave (LPOLEADVISEHOLDER iface)
 {
-    ICOM_THIS(OleAdviseHolderImpl, iface);
+    ICOM_THIS(OleAdviseHolderImpl, iface); 
     FIXME("(%p)\n", This);
 
@@ -337 +348 @@
 OleAdviseHolderImpl_SendOnClose (LPOLEADVISEHOLDER iface)
 {
-    ICOM_THIS(OleAdviseHolderImpl, iface);
+    ICOM_THIS(OleAdviseHolderImpl, iface); 
     FIXME("(%p)\n", This);
 
@@ -351 +362 @@
   FORMATETC fmat;
   DWORD advf;
-} DataAdviseConnection;
+} DataAdviseConnection;  
 
 typedef struct DataAdviseHolder
@@ -368 +379 @@
 static void               DataAdviseHolder_Destructor(DataAdviseHolder* ptrToDestroy);
 static HRESULT WINAPI     DataAdviseHolder_QueryInterface(
-                IDataAdviseHolder*      iface,
-                REFIID                  riid,
-                void**                  ppvObject);
-static ULONG WINAPI       DataAdviseHolder_AddRef(
+                            IDataAdviseHolder*      iface,
+                            REFIID                  riid,
+                            void**                  ppvObject);
+static ULONG WINAPI       DataAdviseHolder_AddRef( 
                             IDataAdviseHolder*      iface);
-static ULONG WINAPI       DataAdviseHolder_Release(
+static ULONG WINAPI       DataAdviseHolder_Release( 
                             IDataAdviseHolder*      iface);
-static HRESULT WINAPI     DataAdviseHolder_Advise(
+static HRESULT WINAPI     DataAdviseHolder_Advise( 
                             IDataAdviseHolder*      iface,
-                IDataObject*            pDataObject,
-                FORMATETC*              pFetc,
-                DWORD                   advf,
-                IAdviseSink*            pAdvise,
-                DWORD*                  pdwConnection);
-static HRESULT WINAPI     DataAdviseHolder_Unadvise(
+                            IDataObject*            pDataObject, 
+                            FORMATETC*              pFetc, 
+                            DWORD                   advf, 
+                            IAdviseSink*            pAdvise, 
+                            DWORD*                  pdwConnection);
+static HRESULT WINAPI     DataAdviseHolder_Unadvise( 
                             IDataAdviseHolder*      iface,
-                DWORD                   dwConnection);
-static HRESULT WINAPI     DataAdviseHolder_EnumAdvise(
-                            IDataAdviseHolder*      iface,
-                IEnumSTATDATA**         ppenumAdvise);
-static HRESULT WINAPI     DataAdviseHolder_SendOnDataChange(
-                            IDataAdviseHolder*      iface,
-                IDataObject*            pDataObject,
-                DWORD                   dwReserved,
-                DWORD                   advf);
+                            DWORD                   dwConnection);
+static HRESULT WINAPI     DataAdviseHolder_EnumAdvise( 
+                            IDataAdviseHolder*      iface,       
+                            IEnumSTATDATA**         ppenumAdvise);
+static HRESULT WINAPI     DataAdviseHolder_SendOnDataChange( 
+                            IDataAdviseHolder*      iface, 
+                            IDataObject*            pDataObject, 
+                            DWORD                   dwReserved, 
+                            DWORD                   advf);
 
 /**************************************************************************
@@ -417 +428 @@
 
   newHolder = (DataAdviseHolder*)HeapAlloc(GetProcessHeap(),
-                       0,
-                       sizeof(DataAdviseHolder));
-
+                                           0,
+                                           sizeof(DataAdviseHolder));
+  
   ICOM_VTBL(newHolder) = &DataAdviseHolderImpl_VTable;
   newHolder->ref = 1;
   newHolder->maxCons = INITIAL_SINKS;
   newHolder->Connections = HeapAlloc(GetProcessHeap(),
-                     HEAP_ZERO_MEMORY,
-                     newHolder->maxCons *
-                     sizeof(DataAdviseConnection));
+                                     HEAP_ZERO_MEMORY,
+                                     newHolder->maxCons * 
+                                     sizeof(DataAdviseConnection));
 
   TRACE("returning %p\n", newHolder);
@@ -448 +459 @@
     }
   }
-
+  
   HeapFree(GetProcessHeap(), 0, ptrToDestroy->Connections);
   HeapFree(GetProcessHeap(), 0, ptrToDestroy);
@@ -463 +474 @@
   void**                  ppvObject)
 {
-  ICOM_THIS(DataAdviseHolder, iface);
+  ICOM_THIS(DataAdviseHolder, iface); 
   TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppvObject);
   /*
@@ -470 +481 @@
   if ( (This==0) || (ppvObject==0) )
     return E_INVALIDARG;
-
+  
   /*
    * Initialize the return parameter.
@@ -484 +495 @@
     *ppvObject = iface;
   }
-
+  
   /*
    * Check that we obtained an interface.
@@ -492 +503 @@
     return E_NOINTERFACE;
   }
-
+  
   /*
    * Query Interface always increases the reference count by one when it is
-   * successful.
+   * successful. 
    */
   IUnknown_AddRef((IUnknown*)*ppvObject);
 
-  return S_OK;;
+  return S_OK;;  
 }
 
@@ -507 +518 @@
  * See Windows documentation for more details on IUnknown methods.
  */
-static ULONG WINAPI       DataAdviseHolder_AddRef(
+static ULONG WINAPI       DataAdviseHolder_AddRef(                             
   IDataAdviseHolder*      iface)
 {
-  ICOM_THIS(DataAdviseHolder, iface);
+  ICOM_THIS(DataAdviseHolder, iface); 
   TRACE("(%p) (ref=%ld)\n", This, This->ref);
   This->ref++;
@@ -522 +533 @@
  * See Windows documentation for more details on IUnknown methods.
  */
-static ULONG WINAPI DataAdviseHolder_Release(
+static ULONG WINAPI DataAdviseHolder_Release( 
   IDataAdviseHolder*      iface)
 {
@@ -542 +553 @@
     return 0;
   }
-
+  
   return This->ref;
 }
@@ -552 +563 @@
 static HRESULT WINAPI DataAdviseHolder_Advise(
   IDataAdviseHolder*      iface,
-  IDataObject*            pDataObject,
-  FORMATETC*              pFetc,
-  DWORD                   advf,
-  IAdviseSink*            pAdvise,
+  IDataObject*            pDataObject, 
+  FORMATETC*              pFetc, 
+  DWORD                   advf, 
+  IAdviseSink*            pAdvise, 
   DWORD*                  pdwConnection)
 {
   DWORD index;
-
-  ICOM_THIS(DataAdviseHolder, iface);
+  
+  ICOM_THIS(DataAdviseHolder, iface); 
 
   TRACE("(%p)->(%p, %p, %08lx, %p, %p)\n", This, pDataObject, pFetc, advf,
-    pAdvise, pdwConnection);
+        pAdvise, pdwConnection);
   /*
    * Sanity check
@@ -569 +580 @@
   if (pdwConnection==NULL)
     return E_POINTER;
-
+  
   *pdwConnection = 0;
 
@@ -588 +599 @@
     This->maxCons+=INITIAL_SINKS;
     This->Connections = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
-                    This->Connections,
-                    This->maxCons*sizeof(DataAdviseConnection));
+                                    This->Connections,
+                                    This->maxCons*sizeof(DataAdviseConnection));
   }
   /*
@@ -617 +628 @@
  * DataAdviseHolder_Unadvise
  */
-static HRESULT WINAPI     DataAdviseHolder_Unadvise(
+static HRESULT WINAPI     DataAdviseHolder_Unadvise( 
   IDataAdviseHolder*      iface,
   DWORD                   dwConnection)
 {
-  ICOM_THIS(DataAdviseHolder, iface);
+  ICOM_THIS(DataAdviseHolder, iface); 
 
   TRACE("(%p)->(%lu)\n", This, dwConnection);
 
   /*
-   * So we don't return 0 as a cookie, the index was
+   * So we don't return 0 as a cookie, the index was 
    * incremented by 1 in OleAdviseHolderImpl_Advise
    * we have to compensate.
    */
   dwConnection--;
-
+  
   /*
    * Check for invalid cookies.
    */
-  if ( (dwConnection < 0) ||
+  if ( (dwConnection < 0) || 
        (dwConnection >= This->maxCons) )
     return OLE_E_NOCONNECTION;
@@ -650 +661 @@
 }
 
-static HRESULT WINAPI     DataAdviseHolder_EnumAdvise(
-  IDataAdviseHolder*      iface,
+static HRESULT WINAPI     DataAdviseHolder_EnumAdvise( 
+  IDataAdviseHolder*      iface,       
   IEnumSTATDATA**         ppenumAdvise)
 {
-  ICOM_THIS(DataAdviseHolder, iface);
+  ICOM_THIS(DataAdviseHolder, iface); 
 
   FIXME("(%p)->(%p)\n", This, ppenumAdvise);
@@ -663 +674 @@
  * DataAdviseHolder_SendOnDataChange
  */
-static HRESULT WINAPI     DataAdviseHolder_SendOnDataChange(
-  IDataAdviseHolder*      iface,
-  IDataObject*            pDataObject,
-  DWORD                   dwReserved,
+static HRESULT WINAPI     DataAdviseHolder_SendOnDataChange( 
+  IDataAdviseHolder*      iface, 
+  IDataObject*            pDataObject, 
+  DWORD                   dwReserved, 
   DWORD                   advf)
 {
-  ICOM_THIS(DataAdviseHolder, iface);
+  ICOM_THIS(DataAdviseHolder, iface); 
   DWORD index;
   STGMEDIUM stg;
@@ -679 +690 @@
     if(This->Connections[index].sink != NULL) {
       if(!(This->Connections[index].advf & ADVF_NODATA)) {
-    TRACE("Calling IDataObject_GetData\n");
-    res = IDataObject_GetData(pDataObject,
-                  &(This->Connections[index].fmat),
-                  &stg);
-    TRACE("returns %08lx\n", res);
+        TRACE("Calling IDataObject_GetData\n");
+        res = IDataObject_GetData(pDataObject,
+                                  &(This->Connections[index].fmat),
+                                  &stg);
+        TRACE("returns %08lx\n", res);
       }
       TRACE("Calling IAdviseSink_OnDataChange\n");
       IAdviseSink_OnDataChange(This->Connections[index].sink,
-                     &(This->Connections[index].fmat),
-                     &stg);
+                                     &(This->Connections[index].fmat),
+                                     &stg);
       TRACE("Done IAdviseSink_OnDataChange\n");
       if(This->Connections[index].advf & ADVF_ONLYONCE) {
-    TRACE("Removing connection\n");
-    DataAdviseHolder_Unadvise(iface, index+1);
+        TRACE("Removing connection\n");
+        DataAdviseHolder_Unadvise(iface, index+1);
       }
     }

trunk/src/ole32/stg_bigblockfile.c

@@ -1 @@
-/* $Id: stg_bigblockfile.c,v 1.3 2001-09-05 13:17:12 bird Exp $ */
 /******************************************************************************
  *
  * BigBlockFile
  *
- * This is the implementation of a file that consists of blocks of
+ * This is the implementation of a file that consists of blocks of 
  * a predetermined size.
- * This class is used in the Compound File implementation of the
- * IStorage and IStream interfaces. It provides the functionality
- * to read and write any blocks in the file as well as setting and
+ * This class is used in the Compound File implementation of the 
+ * IStorage and IStream interfaces. It provides the functionality 
+ * to read and write any blocks in the file as well as setting and 
  * obtaining the size of the file.
  * The blocks are indexed sequentially from the start of the file
  * starting with -1.
- *
+ * 
  * TODO:
  * - Support for a transacted mode
@@ -45 +44 @@
 #include "debugtools.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(storage);
 
@@ -70 +81 @@
 /***
  * This structure identifies the paged that are mapped
- * from the file and their position in memory. It is
+ * from the file and their position in memory. It is 
  * also used to hold a reference count to those pages.
  *
@@ -103 +114 @@
                                                  ULONG          index,
                                                  DWORD          desired_access);
-static MappedPage* BIGBLOCKFILE_GetPageFromPointer(LPBIGBLOCKFILE This,
-                           void*         pBlock);
+static MappedPage* BIGBLOCKFILE_GetPageFromPointer(LPBIGBLOCKFILE This, 
+                                                   void*         pBlock);
 static MappedPage* BIGBLOCKFILE_CreatePage(LPBIGBLOCKFILE This,
-                       ULONG page_index);
+                                           ULONG page_index);
 static DWORD     BIGBLOCKFILE_GetProtectMode(DWORD openFlags);
 static BOOL      BIGBLOCKFILE_FileInit(LPBIGBLOCKFILE This, HANDLE hFile);
@@ -119 +130 @@
  */
 static inline BOOL BIGBLOCKFILE_TestBit(const BlockBits *bb,
-                    unsigned int index)
+                                        unsigned int index)
 {
     unsigned int array_index = index / (CHAR_BIT * sizeof(unsigned int));
@@ -151 +162 @@
  *      BIGBLOCKFILE_Construct
  *
- * Construct a big block file. Create the file mapping object.
+ * Construct a big block file. Create the file mapping object. 
  * Create the read only mapped pages list, the writable mapped page list
  * and the blocks in use list.
@@ -231 +242 @@
 
   This->filesize.s.LowPart = GetFileSize(This->hfile,
-                     &This->filesize.s.HighPart);
+                                         &This->filesize.s.HighPart);
 
   This->maplist = NULL;
@@ -324 +335 @@
   /*
    * validate the block index
-   *
+   * 
    */
   if (This->blocksize * (index + 1)
@@ -330 +341 @@
   {
     TRACE("out of range %lu vs %lu\n", This->blocksize * (index + 1),
-      This->filesize.s.LowPart);
+          This->filesize.s.LowPart);
     return NULL;
   }
@@ -380 +391 @@
 
     if (pBlock == NULL)
-    return;
+        return;
 
     page = BIGBLOCKFILE_GetPageFromPointer(This, pBlock);
 
     if (page == NULL)
-    return;
+        return;
 
     BIGBLOCKFILE_ReleaseMappedPage(This, page);
@@ -394 +405 @@
  *
  * Sets the size of the file.
- *
+ * 
  */
 void BIGBLOCKFILE_SetSize(LPBIGBLOCKFILE This, ULARGE_INTEGER newSize)
@@ -406 +417 @@
    */
   BIGBLOCKFILE_UnmapAllMappedPages(This);
-
+  
   if (This->fileBased)
   {
@@ -424 +435 @@
      *
      * The problem is that the SetFilePointer-SetEndOfFile combo below
-     * doesn't always succeed. The file is not grown. It seems like the
+     * doesn't always succeed. The file is not grown. It seems like the 
      * operation is cached. By doing the WriteFile, the file is actually
      * grown on disk.
@@ -433 +444 @@
     WriteFile(This->hfile, buf, 10, NULL, NULL);
     /*
-     * END HACK
+     * END HACK 
      */
 
@@ -441 +452 @@
     SetFilePointer(This->hfile, newSize.s.LowPart, NULL, FILE_BEGIN);
     SetEndOfFile(This->hfile);
-
+  
     /*
      * re-create the file mapping object
@@ -448 +459 @@
                                         NULL,
                                         This->flProtect,
-                                        0, 0,
+                                        0, 0, 
                                         NULL);
   }
@@ -477 +488 @@
  *
  * Returns the size of the file.
- *
+ * 
  */
 ULARGE_INTEGER BIGBLOCKFILE_GetSize(LPBIGBLOCKFILE This)
@@ -490 +501 @@
  */
 static BOOL BIGBLOCKFILE_AccessCheck(MappedPage *page, ULONG block_index,
-                     DWORD desired_access)
+                                     DWORD desired_access)
 {
     assert(block_index < BLOCKS_PER_PAGE);
@@ -496 +507 @@
     if (desired_access == FILE_MAP_READ)
     {
-    if (BIGBLOCKFILE_TestBit(&page->writable_blocks, block_index))
-        return FALSE;
-
-    BIGBLOCKFILE_SetBit(&page->readable_blocks, block_index);
+        if (BIGBLOCKFILE_TestBit(&page->writable_blocks, block_index))
+            return FALSE;
+
+        BIGBLOCKFILE_SetBit(&page->readable_blocks, block_index);
     }
     else
     {
-    assert(desired_access == FILE_MAP_WRITE);
-
-    if (BIGBLOCKFILE_TestBit(&page->readable_blocks, block_index))
-        return FALSE;
-
-    BIGBLOCKFILE_SetBit(&page->writable_blocks, block_index);
+        assert(desired_access == FILE_MAP_WRITE);
+
+        if (BIGBLOCKFILE_TestBit(&page->readable_blocks, block_index))
+            return FALSE;
+
+        BIGBLOCKFILE_SetBit(&page->writable_blocks, block_index);
     }
 
@@ -520 +531 @@
  */
 static void* BIGBLOCKFILE_GetBigBlockPointer(
-  LPBIGBLOCKFILE This,
-  ULONG          block_index,
+  LPBIGBLOCKFILE This, 
+  ULONG          block_index, 
   DWORD          desired_access)
 {
@@ -532 +543 @@
     if (!BIGBLOCKFILE_AccessCheck(page, block_on_page, desired_access))
     {
-    BIGBLOCKFILE_ReleaseMappedPage(This, page);
-    return NULL;
+        BIGBLOCKFILE_ReleaseMappedPage(This, page);
+        return NULL;
     }
 
@@ -548 +559 @@
  */
 static MappedPage *BIGBLOCKFILE_GetPageFromPointer(LPBIGBLOCKFILE This,
-                           void *pBlock)
+                                                   void *pBlock)
 {
     MappedPage *page;
@@ -554 +565 @@
     for (page = This->maplist; page != NULL; page = page->next)
     {
-    if ((LPBYTE)pBlock >= (LPBYTE)page->lpBytes
-        && (LPBYTE)pBlock <= (LPBYTE)page->lpBytes + PAGE_SIZE)
-        break;
+        if ((LPBYTE)pBlock >= (LPBYTE)page->lpBytes
+            && (LPBYTE)pBlock <= (LPBYTE)page->lpBytes + PAGE_SIZE)
+            break;
 
     }
@@ -568 +579 @@
  */
 static MappedPage *BIGBLOCKFILE_FindPageInList(MappedPage *head,
-                           ULONG page_index)
+                                               ULONG page_index)
 {
     for (; head != NULL; head = head->next)
     {
-    if (head->page_index == page_index)
-    {
-        InterlockedIncrement(&head->refcnt);
-        break;
-    }
+        if (head->page_index == page_index)
+        {
+            InterlockedIncrement(&head->refcnt);
+            break;
+        }
     }
 
@@ -612 +623 @@
     if (!page)
     {
-    page = BIGBLOCKFILE_FindPageInList(This->victimhead, page_index);
+        page = BIGBLOCKFILE_FindPageInList(This->victimhead, page_index);
+        if (page)
+        {
+            This->num_victim_pages--;
+
+            BIGBLOCKFILE_Zero(&page->readable_blocks);
+            BIGBLOCKFILE_Zero(&page->writable_blocks);
+        }
+    }
+
     if (page)
     {
-        This->num_victim_pages--;
-
-        BIGBLOCKFILE_Zero(&page->readable_blocks);
-        BIGBLOCKFILE_Zero(&page->writable_blocks);
-    }
-    }
-
-    if (page)
-    {
-    /* If the page is not already at the head of the list, move
-     * it there. (Also moves pages from victim to main list.) */
-    if (This->maplist != page)
-    {
-        if (This->victimhead == page) This->victimhead = page->next;
-        if (This->victimtail == page) This->victimtail = page->prev;
-
-        BIGBLOCKFILE_UnlinkPage(page);
-
-        BIGBLOCKFILE_LinkHeadPage(&This->maplist, page);
-    }
-
-    return page;
+        /* If the page is not already at the head of the list, move
+         * it there. (Also moves pages from victim to main list.) */
+        if (This->maplist != page)
+        {
+            if (This->victimhead == page) This->victimhead = page->next;
+            if (This->victimtail == page) This->victimtail = page->prev;
+
+            BIGBLOCKFILE_UnlinkPage(page);
+
+            BIGBLOCKFILE_LinkHeadPage(&This->maplist, page);
+        }
+
+        return page;
     }
 
@@ -653 +664 @@
     if (This->fileBased)
     {
-    DWORD numBytesToMap;
-    DWORD desired_access;
-
-    if (lowoffset + PAGE_SIZE > This->filesize.s.LowPart)
-        numBytesToMap = This->filesize.s.LowPart - lowoffset;
+        DWORD numBytesToMap;
+        DWORD desired_access;
+
+        if (lowoffset + PAGE_SIZE > This->filesize.s.LowPart)
+            numBytesToMap = This->filesize.s.LowPart - lowoffset;
+        else
+            numBytesToMap = PAGE_SIZE;
+
+        if (This->flProtect == PAGE_READONLY)
+            desired_access = FILE_MAP_READ;
+        else
+            desired_access = FILE_MAP_WRITE;
+
+        page->lpBytes = MapViewOfFile(This->hfilemap, desired_access, 0,
+                                      lowoffset, numBytesToMap);
+    }
     else
-        numBytesToMap = PAGE_SIZE;
-
-    if (This->flProtect == PAGE_READONLY)
-        desired_access = FILE_MAP_READ;
-    else
-        desired_access = FILE_MAP_WRITE;
-
-    page->lpBytes = MapViewOfFile(This->hfilemap, desired_access, 0,
-                      lowoffset, numBytesToMap);
-    }
-    else
-    {
-    page->lpBytes = (LPBYTE)This->pbytearray + lowoffset;
+    {
+        page->lpBytes = (LPBYTE)This->pbytearray + lowoffset;
     }
 
@@ -680 +691 @@
 
 static MappedPage *BIGBLOCKFILE_CreatePage(LPBIGBLOCKFILE This,
-                       ULONG page_index)
+                                           ULONG page_index)
 {
     MappedPage *page;
@@ -706 +717 @@
     TRACE("%ld at %p\n", page->page_index, page->lpBytes);
     if (page->refcnt > 0)
-    ERR("unmapping inuse page %p\n", page->lpBytes);
+        ERR("unmapping inuse page %p\n", page->lpBytes);
 
     if (This->fileBased && page->lpBytes)
-    UnmapViewOfFile(page->lpBytes);
+        UnmapViewOfFile(page->lpBytes);
 
     page->lpBytes = NULL;
@@ -737 +748 @@
     if (!InterlockedDecrement(&page->refcnt))
     {
-    if (This->maplist == page) This->maplist = page->next;
-
-    BIGBLOCKFILE_UnlinkPage(page);
-
-    if (MAX_VICTIM_PAGES > 0)
-    {
-        if (This->num_victim_pages >= MAX_VICTIM_PAGES)
-        {
-        MappedPage *victim = This->victimtail;
-        if (victim)
-        {
-            This->victimtail = victim->prev;
-            if (This->victimhead == victim)
-            This->victimhead = victim->next;
-
-            BIGBLOCKFILE_UnlinkPage(victim);
-            BIGBLOCKFILE_DeletePage(This, victim);
-        }
-        }
-        else This->num_victim_pages++;
-
-        BIGBLOCKFILE_LinkHeadPage(&This->victimhead, page);
-        if (This->victimtail == NULL) This->victimtail = page;
-    }
-    else
-        BIGBLOCKFILE_DeletePage(This, page);
+        if (This->maplist == page) This->maplist = page->next;
+
+        BIGBLOCKFILE_UnlinkPage(page);
+
+        if (MAX_VICTIM_PAGES > 0)
+        {
+            if (This->num_victim_pages >= MAX_VICTIM_PAGES)
+            {
+                MappedPage *victim = This->victimtail;
+                if (victim)
+                {
+                    This->victimtail = victim->prev;
+                    if (This->victimhead == victim)
+                        This->victimhead = victim->next;
+
+                    BIGBLOCKFILE_UnlinkPage(victim);
+                    BIGBLOCKFILE_DeletePage(This, victim);
+                }
+            }
+            else This->num_victim_pages++;
+
+            BIGBLOCKFILE_LinkHeadPage(&This->victimhead, page);
+            if (This->victimtail == NULL) This->victimtail = page;
+        }
+        else
+            BIGBLOCKFILE_DeletePage(This, page);
     }
 }
@@ -770 +781 @@
     while (list != NULL)
     {
-    MappedPage *next = list->next;
-
-    BIGBLOCKFILE_DeletePage(This, list);
-
-    list = next;
+        MappedPage *next = list->next;
+
+        BIGBLOCKFILE_DeletePage(This, list);
+
+        list = next;
     }
 }
@@ -800 +811 @@
     for (; list != NULL; list = list->next)
     {
-    BIGBLOCKFILE_UnmapPage(This, list);
+        BIGBLOCKFILE_UnmapPage(This, list);
     }
 }
@@ -814 +825 @@
     while (list != NULL)
     {
-    MappedPage *next = list->next;
-
-    if (list->page_index * PAGE_SIZE > This->filesize.s.LowPart)
-    {
-        TRACE("discarding %lu\n", list->page_index);
-
-        /* page is entirely outside of the file, delete it */
-        BIGBLOCKFILE_UnlinkPage(list);
-        BIGBLOCKFILE_DeletePage(This, list);
-    }
-    else
-    {
-        /* otherwise, remap it */
-        BIGBLOCKFILE_MapPage(This, list);
-    }
-
-    list = next;
+        MappedPage *next = list->next;
+
+        if (list->page_index * PAGE_SIZE > This->filesize.s.LowPart)
+        {
+            TRACE("discarding %lu\n", list->page_index);
+
+            /* page is entirely outside of the file, delete it */
+            BIGBLOCKFILE_UnlinkPage(list);
+            BIGBLOCKFILE_DeletePage(This, list);
+        }
+        else
+        {
+            /* otherwise, remap it */
+            BIGBLOCKFILE_MapPage(This, list);
+        }
+
+        list = next;
     }
 }
@@ -849 +860 @@
 {
     if (openFlags & (STGM_WRITE | STGM_READWRITE))
-    return PAGE_READWRITE;
+        return PAGE_READWRITE;
     else
-    return PAGE_READONLY;
-}
+        return PAGE_READONLY;
+}

trunk/src/ole32/stg_stream.c

@@ -1 @@
-/* $Id: stg_stream.c,v 1.3 2001-09-05 13:17:12 bird Exp $ */
 /*
  * Compound Storage (32 bit version)
@@ -28 +27 @@
 
 #include "storage32.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(storage);
@@ -66 +77 @@
  */
 StgStreamImpl* StgStreamImpl_Construct(
-        StorageBaseImpl* parentStorage,
+                StorageBaseImpl* parentStorage,
     DWORD            grfMode,
     ULONG            ownerProperty)
@@ -73 +84 @@
 
   newStream = HeapAlloc(GetProcessHeap(), 0, sizeof(StgStreamImpl));
-
+  
   if (newStream!=0)
   {
@@ -81 +92 @@
     ICOM_VTBL(newStream) = &StgStreamImpl_Vtbl;
     newStream->ref       = 0;
-
+    
     /*
      * We want to nail-down the reference to the storage in case the
@@ -89 +100 @@
     IStorage_AddRef((IStorage*)newStream->parentStorage);
 
-    newStream->grfMode = grfMode;
+    newStream->grfMode = grfMode;    
     newStream->ownerProperty = ownerProperty;
-
+    
     /*
      * Start the stream at the begining.
@@ -97 +108 @@
     newStream->currentPosition.s.HighPart = 0;
     newStream->currentPosition.s.LowPart = 0;
-
+    
     /*
      * Initialize the rest of the data.
@@ -105 +116 @@
     newStream->bigBlockChain       = 0;
     newStream->smallBlockChain     = 0;
-
+    
     /*
      * Read the size from the property and determine if the blocks forming
@@ -112 +123 @@
     StgStreamImpl_OpenBlockChain(newStream);
   }
-
+  
   return newStream;
 }
@@ -119 +130 @@
  * This is the destructor of the StgStreamImpl class.
  *
- * This method will clean-up all the resources used-up by the given StgStreamImpl
+ * This method will clean-up all the resources used-up by the given StgStreamImpl 
  * class. The pointer passed-in to this function will be freed and will not
  * be valid anymore.
@@ -151 +162 @@
    * Finally, free the memory used-up by the class.
    */
-  HeapFree(GetProcessHeap(), 0, This);
+  HeapFree(GetProcessHeap(), 0, This);  
 }
 
@@ -159 +170 @@
  */
 HRESULT WINAPI StgStreamImpl_QueryInterface(
-          IStream*     iface,
-          REFIID         riid,        /* [in] */
-          void**         ppvObject)   /* [iid_is][out] */
+                  IStream*     iface,
+                  REFIID         riid,        /* [in] */          
+                  void**         ppvObject)   /* [iid_is][out] */ 
 {
   StgStreamImpl* const This=(StgStreamImpl*)iface;
@@ -170 +181 @@
   if (ppvObject==0)
     return E_INVALIDARG;
-
+  
   /*
    * Initialize the return parameter.
    */
   *ppvObject = 0;
-
+  
   /*
    * Compare the riid with the interface IDs implemented by this object.
    */
-  if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0)
+  if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) 
   {
     *ppvObject = (IStream*)This;
   }
-  else if (memcmp(&IID_IStream, riid, sizeof(IID_IStream)) == 0)
+  else if (memcmp(&IID_IStream, riid, sizeof(IID_IStream)) == 0) 
   {
     *ppvObject = (IStream*)This;
   }
-
+  
   /*
    * Check that we obtained an interface.
@@ -193 +204 @@
   if ((*ppvObject)==0)
     return E_NOINTERFACE;
-
+  
   /*
    * Query Interface always increases the reference count by one when it is
@@ -199 +210 @@
    */
   StgStreamImpl_AddRef(iface);
-
+  
   return S_OK;;
 }
@@ -208 +219 @@
  */
 ULONG WINAPI StgStreamImpl_AddRef(
-        IStream* iface)
+                IStream* iface)
 {
   StgStreamImpl* const This=(StgStreamImpl*)iface;
 
   This->ref++;
-
+  
   return This->ref;
 }
@@ -222 +233 @@
  */
 ULONG WINAPI StgStreamImpl_Release(
-        IStream* iface)
+                IStream* iface)
 {
   StgStreamImpl* const This=(StgStreamImpl*)iface;
 
   ULONG newRef;
-
+  
   This->ref--;
-
+  
   newRef = This->ref;
-
+  
   /*
    * If the reference count goes down to 0, perform suicide.
@@ -239 +250 @@
     StgStreamImpl_Destroy(This);
   }
-
+  
   return newRef;
 }
@@ -273 +284 @@
    */
   readSucessful = StorageImpl_ReadProperty(This->parentStorage->ancestorStorage,
-                         This->ownerProperty,
-                         &curProperty);
-
+                                             This->ownerProperty,
+                                             &curProperty);
+  
   if (readSucessful)
   {
     This->streamSize = curProperty.size;
-
+    
     /*
      * This code supports only streams that are <32 bits in size.
      */
     assert(This->streamSize.s.HighPart == 0);
-
+    
     if(curProperty.startingBlock == BLOCK_END_OF_CHAIN)
     {
@@ -292 +303 @@
     {
       if ( (This->streamSize.s.HighPart == 0) &&
-       (This->streamSize.s.LowPart < LIMIT_TO_USE_SMALL_BLOCK) )
+           (This->streamSize.s.LowPart < LIMIT_TO_USE_SMALL_BLOCK) )
       {
-    This->smallBlockChain = SmallBlockChainStream_Construct(
-                                This->parentStorage->ancestorStorage,
-                                This->ownerProperty);
+        This->smallBlockChain = SmallBlockChainStream_Construct(
+                                                                This->parentStorage->ancestorStorage,   
+                                                                This->ownerProperty);
       }
       else
       {
-    This->bigBlockChain = BlockChainStream_Construct(
-                             This->parentStorage->ancestorStorage,
-                             NULL,
-                             This->ownerProperty);
+        This->bigBlockChain = BlockChainStream_Construct(
+                                                         This->parentStorage->ancestorStorage,
+                                                         NULL,
+                                                         This->ownerProperty);
       }
     }
@@ -318 +329 @@
  * See the documentation of ISequentialStream for more info.
  */
-HRESULT WINAPI StgStreamImpl_Read(
-          IStream*     iface,
-          void*          pv,        /* [length_is][size_is][out] */
-          ULONG          cb,        /* [in] */
-          ULONG*         pcbRead)   /* [out] */
+HRESULT WINAPI StgStreamImpl_Read( 
+                  IStream*     iface,
+                  void*          pv,        /* [length_is][size_is][out] */
+                  ULONG          cb,        /* [in] */                     
+                  ULONG*         pcbRead)   /* [out] */                    
 {
   StgStreamImpl* const This=(StgStreamImpl*)iface;
@@ -330 +341 @@
 
   TRACE("(%p, %p, %ld, %p)\n",
-    iface, pv, cb, pcbRead);
-
-  /*
+        iface, pv, cb, pcbRead);
+
+  /* 
    * If the caller is not interested in the nubmer of bytes read,
    * we use another buffer to avoid "if" statements in the code.
@@ -338 +349 @@
   if (pcbRead==0)
     pcbRead = &bytesReadBuffer;
-
+  
   /*
    * Using the known size of the stream, calculate the number of bytes
@@ -344 +355 @@
    */
   bytesToReadFromBuffer = min( This->streamSize.s.LowPart - This->currentPosition.s.LowPart, cb);
-
+  
   /*
    * Depending on the type of chain that was opened when the stream was constructed,
@@ -352 +363 @@
   {
     SmallBlockChainStream_ReadAt(This->smallBlockChain,
-                 This->currentPosition,
-                 bytesToReadFromBuffer,
-                 pv,
-                 pcbRead);
-
+                                 This->currentPosition,
+                                 bytesToReadFromBuffer,
+                                 pv,
+                                 pcbRead);
+    
   }
   else if (This->bigBlockChain!=0)
   {
     BlockChainStream_ReadAt(This->bigBlockChain,
-                This->currentPosition,
-                bytesToReadFromBuffer,
-                pv,
-                pcbRead);
+                            This->currentPosition,
+                            bytesToReadFromBuffer,
+                            pv,
+                            pcbRead);
   }
   else
@@ -387 +398 @@
    */
   This->currentPosition.s.LowPart += *pcbRead;
-
+  
   /*
    * The function returns S_OK if the buffer was filled completely
@@ -395 +406 @@
   if(*pcbRead == cb)
     return S_OK;
-
+  
   return S_FALSE;
 }
-
+        
 /***
  * This method is part of the ISequentialStream interface.
@@ -410 +421 @@
  */
 HRESULT WINAPI StgStreamImpl_Write(
-              IStream*     iface,
-          const void*    pv,          /* [size_is][in] */
-          ULONG          cb,          /* [in] */
-          ULONG*         pcbWritten)  /* [out] */
+                  IStream*     iface,
+                  const void*    pv,          /* [size_is][in] */ 
+                  ULONG          cb,          /* [in] */          
+                  ULONG*         pcbWritten)  /* [out] */         
 {
   StgStreamImpl* const This=(StgStreamImpl*)iface;
@@ -421 +432 @@
 
   TRACE("(%p, %p, %ld, %p)\n",
-    iface, pv, cb, pcbWritten);
-
+        iface, pv, cb, pcbWritten);
+ 
   /*
    * Do we have permission to write to this stream?
@@ -436 +447 @@
   if (pcbWritten == 0)
     pcbWritten = &bytesWritten;
-
+  
   /*
    * Initialize the out parameter
@@ -451 +462 @@
     newSize.s.LowPart = This->currentPosition.s.LowPart + cb;
   }
-
+  
   /*
    * Verify if we need to grow the stream
@@ -460 +471 @@
     IStream_SetSize(iface, newSize);
   }
-
+  
   /*
    * Depending on the type of chain that was opened when the stream was constructed,
@@ -468 +479 @@
   {
     SmallBlockChainStream_WriteAt(This->smallBlockChain,
-                  This->currentPosition,
-                  cb,
-                  pv,
-                  pcbWritten);
-
+                                  This->currentPosition,
+                                  cb,
+                                  pv,
+                                  pcbWritten);
+    
   }
   else if (This->bigBlockChain!=0)
   {
     BlockChainStream_WriteAt(This->bigBlockChain,
-                 This->currentPosition,
-                 cb,
-                 pv,
-                 pcbWritten);
+                             This->currentPosition,
+                             cb,
+                             pv,
+                             pcbWritten);
   }
   else
     assert(FALSE);
-
+  
   /*
    * Advance the position pointer for the number of positions written.
    */
   This->currentPosition.s.LowPart += *pcbWritten;
-
+  
   return S_OK;
 }
@@ -500 +511 @@
  *
  * See the documentation of IStream for more info.
- */
-HRESULT WINAPI StgStreamImpl_Seek(
-          IStream*      iface,
-          LARGE_INTEGER   dlibMove,         /* [in] */
-          DWORD           dwOrigin,         /* [in] */
-          ULARGE_INTEGER* plibNewPosition) /* [out] */
+ */        
+HRESULT WINAPI StgStreamImpl_Seek( 
+                  IStream*      iface,
+                  LARGE_INTEGER   dlibMove,         /* [in] */ 
+                  DWORD           dwOrigin,         /* [in] */ 
+                  ULARGE_INTEGER* plibNewPosition) /* [out] */
 {
   StgStreamImpl* const This=(StgStreamImpl*)iface;
@@ -512 +523 @@
 
   TRACE("(%p, %ld, %ld, %p)\n",
-    iface, dlibMove.s.LowPart, dwOrigin, plibNewPosition);
-
-  /*
+        iface, dlibMove.s.LowPart, dwOrigin, plibNewPosition);
+
+  /* 
    * The caller is allowed to pass in NULL as the new position return value.
    * If it happens, we assign it to a dynamic variable to avoid special cases
@@ -556 +567 @@
       /* ... and subtract with carry */
       if (dlibMove.s.LowPart > plibNewPosition->s.LowPart) {
-      /* carry needed, This accounts for any underflows at [1]*/
-      plibNewPosition->s.HighPart -= 1;
+          /* carry needed, This accounts for any underflows at [1]*/
+          plibNewPosition->s.HighPart -= 1; 
       }
       plibNewPosition->s.LowPart -= dlibMove.s.LowPart; /* [1] */
-      plibNewPosition->s.HighPart -= dlibMove.s.HighPart;
+      plibNewPosition->s.HighPart -= dlibMove.s.HighPart; 
   } else {
       /* add directly */
@@ -566 +577 @@
       plibNewPosition->s.LowPart += dlibMove.s.LowPart;
       if((plibNewPosition->s.LowPart < initialLowPart) ||
-     (plibNewPosition->s.LowPart < dlibMove.s.LowPart)) {
-      /* LowPart has rolled over => add the carry digit to HighPart */
-      plibNewPosition->s.HighPart++;
+         (plibNewPosition->s.LowPart < dlibMove.s.LowPart)) {
+          /* LowPart has rolled over => add the carry digit to HighPart */
+          plibNewPosition->s.HighPart++;
       }
-      plibNewPosition->s.HighPart += dlibMove.s.HighPart;
-  }
-  /*
-   * Check if we end-up before the beginning of the file. That should
+      plibNewPosition->s.HighPart += dlibMove.s.HighPart; 
+  }
+  /*
+   * Check if we end-up before the beginning of the file. That should 
    * trigger an error.
    */
@@ -581 +592 @@
 
     /*
-   * We currently don't support files with offsets of >32 bits.
+   * We currently don't support files with offsets of >32 bits.  
    * Note that we have checked for a negative offset already
      */
@@ -594 +605 @@
    */
   This->currentPosition = *plibNewPosition;
-
+ 
   return S_OK;
 }
@@ -607 +618 @@
  * See the documentation of IStream for more info.
  */
-HRESULT WINAPI StgStreamImpl_SetSize(
-                     IStream*      iface,
-                     ULARGE_INTEGER  libNewSize)   /* [in] */
+HRESULT WINAPI StgStreamImpl_SetSize( 
+                                     IStream*      iface,
+                                     ULARGE_INTEGER  libNewSize)   /* [in] */ 
 {
   StgStreamImpl* const This=(StgStreamImpl*)iface;
@@ -658 +669 @@
   Success = StorageImpl_ReadProperty(This->parentStorage->ancestorStorage,
                                        This->ownerProperty,
-                                       &curProperty);
+                                       &curProperty); 
   /*
    * Determine if we have to switch from small to big blocks or vice versa
-   */
-  if ( (This->smallBlockChain!=0) &&
+   */  
+  if ( (This->smallBlockChain!=0) && 
        (curProperty.size.s.LowPart < LIMIT_TO_USE_SMALL_BLOCK) )
   {
@@ -694 +705 @@
   curProperty.size.s.HighPart = libNewSize.s.HighPart;
   curProperty.size.s.LowPart = libNewSize.s.LowPart;
-
+  
   if (Success)
   {
     StorageImpl_WriteProperty(This->parentStorage->ancestorStorage,
-                This->ownerProperty,
-                &curProperty);
-  }
-
+                                This->ownerProperty,
+                                &curProperty);
+  }
+  
   This->streamSize = libNewSize;
-
+  
   return S_OK;
 }
-
+        
 /***
  * This method is part of the IStream interface.
@@ -714 +725 @@
  * See the documentation of IStream for more info.
  */
-HRESULT WINAPI StgStreamImpl_CopyTo(
-                    IStream*      iface,
-                    IStream*      pstm,         /* [unique][in] */
-                    ULARGE_INTEGER  cb,           /* [in] */
-                    ULARGE_INTEGER* pcbRead,      /* [out] */
-                    ULARGE_INTEGER* pcbWritten)   /* [out] */
+HRESULT WINAPI StgStreamImpl_CopyTo( 
+                                    IStream*      iface,
+                                    IStream*      pstm,         /* [unique][in] */ 
+                                    ULARGE_INTEGER  cb,           /* [in] */         
+                                    ULARGE_INTEGER* pcbRead,      /* [out] */        
+                                    ULARGE_INTEGER* pcbWritten)   /* [out] */        
 {
   HRESULT        hr = S_OK;
@@ -727 +738 @@
   ULARGE_INTEGER totalBytesWritten;
 
-  TRACE("(%p, %p, %ld, %p, %p)\n",
-    iface, pstm, cb.s.LowPart, pcbRead, pcbWritten);
+  TRACE("(%p, %p, %ld, %p, %p)\n", 
+        iface, pstm, cb.s.LowPart, pcbRead, pcbWritten);
 
   /*
@@ -750 +761 @@
     else
       copySize = cb.s.LowPart;
-
+    
     IStream_Read(iface, tmpBuffer, copySize, &bytesRead);
 
     totalBytesRead.s.LowPart += bytesRead;
-
+    
     IStream_Write(pstm, tmpBuffer, bytesRead, &bytesWritten);
 
@@ -767 +778 @@
       break;
     }
-
+    
     if (bytesRead!=copySize)
       cb.s.LowPart = 0;
@@ -798 +809 @@
  *
  * See the documentation of IStream for more info.
- */
-HRESULT WINAPI StgStreamImpl_Commit(
-          IStream*      iface,
-          DWORD           grfCommitFlags)  /* [in] */
+ */        
+HRESULT WINAPI StgStreamImpl_Commit( 
+                  IStream*      iface,
+                  DWORD           grfCommitFlags)  /* [in] */ 
 {
   return S_OK;
@@ -813 +824 @@
  *
  * See the documentation of IStream for more info.
- */
-HRESULT WINAPI StgStreamImpl_Revert(
-          IStream* iface)
+ */        
+HRESULT WINAPI StgStreamImpl_Revert( 
+                  IStream* iface)
 {
   return S_OK;
 }
 
-HRESULT WINAPI StgStreamImpl_LockRegion(
-                    IStream*     iface,
-                    ULARGE_INTEGER libOffset,   /* [in] */
-                    ULARGE_INTEGER cb,          /* [in] */
-                    DWORD          dwLockType)  /* [in] */
+HRESULT WINAPI StgStreamImpl_LockRegion( 
+                                        IStream*     iface,
+                                        ULARGE_INTEGER libOffset,   /* [in] */ 
+                                        ULARGE_INTEGER cb,          /* [in] */ 
+                                        DWORD          dwLockType)  /* [in] */ 
 {
   FIXME("not implemented!\n");
@@ -830 +841 @@
 }
 
-HRESULT WINAPI StgStreamImpl_UnlockRegion(
-                      IStream*     iface,
-                      ULARGE_INTEGER libOffset,   /* [in] */
-                      ULARGE_INTEGER cb,          /* [in] */
-                      DWORD          dwLockType)  /* [in] */
+HRESULT WINAPI StgStreamImpl_UnlockRegion( 
+                                          IStream*     iface,
+                                          ULARGE_INTEGER libOffset,   /* [in] */ 
+                                          ULARGE_INTEGER cb,          /* [in] */ 
+                                          DWORD          dwLockType)  /* [in] */ 
 {
   FIXME("not implemented!\n");
@@ -847 +858 @@
  *
  * See the documentation of IStream for more info.
- */
-HRESULT WINAPI StgStreamImpl_Stat(
-          IStream*     iface,
-          STATSTG*       pstatstg,     /* [out] */
-          DWORD          grfStatFlag)  /* [in] */
+ */        
+HRESULT WINAPI StgStreamImpl_Stat( 
+                  IStream*     iface,
+                  STATSTG*       pstatstg,     /* [out] */
+                  DWORD          grfStatFlag)  /* [in] */ 
 {
   StgStreamImpl* const This=(StgStreamImpl*)iface;
@@ -857 +868 @@
   StgProperty    curProperty;
   BOOL         readSucessful;
-
+  
   /*
    * Read the information from the property.
    */
   readSucessful = StorageImpl_ReadProperty(This->parentStorage->ancestorStorage,
-                         This->ownerProperty,
-                         &curProperty);
-
+                                             This->ownerProperty,
+                                             &curProperty);
+  
   if (readSucessful)
   {
-    StorageUtl_CopyPropertyToSTATSTG(pstatstg,
-                     &curProperty,
-                     grfStatFlag);
+    StorageUtl_CopyPropertyToSTATSTG(pstatstg, 
+                                     &curProperty, 
+                                     grfStatFlag);
 
     pstatstg->grfMode = This->grfMode;
-
+    
     return S_OK;
   }
-
+  
   return E_FAIL;
 }
-
-HRESULT WINAPI StgStreamImpl_Clone(
-                   IStream*     iface,
-                   IStream**    ppstm) /* [out] */
-{
-  FIXME("not implemented!\n");
-  return E_NOTIMPL;
-}
+        
+/***
+ * This method is part of the IStream interface.
+ *
+ * This method returns a clone of the interface that allows for
+ * another seek pointer
+ *
+ * See the documentation of IStream for more info.
+ *
+ * I am not totally sure what I am doing here but I presume that this
+ * should be basically as simple as creating a new stream with the same
+ * parent etc and positioning its seek cursor.
+ */        
+HRESULT WINAPI StgStreamImpl_Clone( 
+                                   IStream*     iface,
+                                   IStream**    ppstm) /* [out] */ 
+{
+  StgStreamImpl* const This=(StgStreamImpl*)iface;
+  HRESULT hres;
+  StgStreamImpl* new_stream;
+  LARGE_INTEGER seek_pos;
+
+  /*
+   * Sanity check
+   */
+  if ( ppstm == 0 )
+    return STG_E_INVALIDPOINTER;
+
+  new_stream = StgStreamImpl_Construct (This->parentStorage, This->grfMode, This->ownerProperty);
+
+  if (!new_stream)
+    return STG_E_INSUFFICIENTMEMORY; /* Currently the only reason for new_stream=0 */
+
+  *ppstm = (IStream*) new_stream;
+  seek_pos.QuadPart = This->currentPosition.QuadPart;
+  
+  hres=StgStreamImpl_Seek (*ppstm, seek_pos, STREAM_SEEK_SET, NULL);
+  
+  assert (SUCCEEDED(hres));
+
+  return S_OK;
+}

trunk/src/ole32/storage32.c

@@ -1 @@
-/* $Id: storage32.c,v 1.3 2001-09-05 13:17:12 bird Exp $ */
 /*
  * Compound Storage (32 bit version)
@@ -38 +37 @@
 #define FILE_BEGIN 0
 
+#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
+
 
 /* Used for OleConvertIStorageToOLESTREAM and OleConvertOLESTREAMToIStorage */
@@ -48 +59 @@
 /* OLESTREAM memory structure to use for Get and Put Routines */
 /* Used for OleConvertIStorageToOLESTREAM and OleConvertOLESTREAMToIStorage */
-typedef struct
+typedef struct 
 {
     DWORD dwOleID;
@@ -86 +97 @@
     DWORD dwExtentX;
     DWORD dwExtentY;
-    DWORD dwSize;
+    DWORD dwSize;  
     BYTE *pData;
 }OLECONVERT_ISTORAGE_OLEPRES;
@@ -111 +122 @@
   INT         typeOfRelation);
 
-static HRESULT adjustPropertyChain(
+static HRESULT adjustPropertyChain( 
   StorageImpl *This,
   StgProperty   propertyToDelete,
@@ -138 +149 @@
  * Declaration of miscellaneous functions...
  */
-static HRESULT validateSTGM(DWORD stgmValue);
+static HRESULT validateSTGM(DWORD stgmValue); 
 
 static DWORD GetShareModeFromSTGM(DWORD stgm);
@@ -224 +235 @@
  * This method implements the common QueryInterface for all IStorage32
  * implementations contained in this file.
- *
+ * 
  * See Windows documentation for more details on IUnknown methods.
  */
@@ -238 +249 @@
   if ( (This==0) || (ppvObject==0) )
     return E_INVALIDARG;
-
+  
   /*
    * Initialize the return parameter.
    */
   *ppvObject = 0;
-
+  
   /*
    * Compare the riid with the interface IDs implemented by this object.
    */
-  if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0)
+  if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) 
   {
     *ppvObject = (IStorage*)This;
   }
-  else if (memcmp(&IID_IStorage, riid, sizeof(IID_IStorage)) == 0)
+  else if (memcmp(&IID_IStorage, riid, sizeof(IID_IStorage)) == 0) 
   {
     *ppvObject = (IStorage*)This;
   }
-
+  
   /*
    * Check that we obtained an interface.
@@ -261 +272 @@
   if ((*ppvObject)==0)
     return E_NOINTERFACE;
-
+  
   /*
    * Query Interface always increases the reference count by one when it is
@@ -270 +281 @@
   return S_OK;
 }
-
+        
 /************************************************************************
  * Storage32BaseImpl_AddRef (IUnknown)
@@ -276 +287 @@
  * This method implements the common AddRef for all IStorage32
  * implementations contained in this file.
- *
+ * 
  * See Windows documentation for more details on IUnknown methods.
  */
-ULONG WINAPI StorageBaseImpl_AddRef(
+ULONG WINAPI StorageBaseImpl_AddRef( 
             IStorage* iface)
 {
@@ -287 +298 @@
   return This->ref;
 }
-
+        
 /************************************************************************
  * Storage32BaseImpl_Release (IUnknown)
@@ -293 +304 @@
  * This method implements the common Release for all IStorage32
  * implementations contained in this file.
- *
+ * 
  * See Windows documentation for more details on IUnknown methods.
  */
-ULONG WINAPI StorageBaseImpl_Release(
+ULONG WINAPI StorageBaseImpl_Release( 
       IStorage* iface)
 {
@@ -311 +322 @@
   {
     /*
-     * Since we are using a system of base-classes, we want to call the
-     * destructor of the appropriate derived class. To do this, we are
+     * Since we are using a system of base-classes, we want to call the 
+     * destructor of the appropriate derived class. To do this, we are 
      * using virtual functions to implement the destructor.
      */
@@ -319 +330 @@
     return 0;
   }
-
+  
   return This->ref;
 }
@@ -330 +341 @@
  * See Windows documentation for more details on IStorage methods.
  */
-HRESULT WINAPI StorageBaseImpl_OpenStream(
+HRESULT WINAPI StorageBaseImpl_OpenStream( 
   IStorage*        iface,
   const OLECHAR*   pwcsName,  /* [string][in] */
   void*            reserved1, /* [unique][in] */
-  DWORD            grfMode,   /* [in]  */
-  DWORD            reserved2, /* [in]  */
-  IStream**        ppstm)     /* [out] */
+  DWORD            grfMode,   /* [in]  */        
+  DWORD            reserved2, /* [in]  */        
+  IStream**        ppstm)     /* [out] */       
 {
   ICOM_THIS(StorageBaseImpl,iface);
@@ -344 +355 @@
   ULONG             foundPropertyIndex;
 
-  TRACE("(%p, %s, %p, %lx, %ld, %p)\n",
-    iface, debugstr_w(pwcsName), reserved1, grfMode, reserved2, ppstm);
+  TRACE("(%p, %s, %p, %lx, %ld, %p)\n", 
+        iface, debugstr_w(pwcsName), reserved1, grfMode, reserved2, ppstm);
 
   /*
@@ -352 +363 @@
   if ( (pwcsName==NULL) || (ppstm==0) )
     return E_INVALIDARG;
-
+  
   /*
    * Initialize the out parameter
    */
   *ppstm = 0;
-
+  
   /*
    * Validate the STGM flags
@@ -376 +387 @@
    */
   propertyEnumeration = IEnumSTATSTGImpl_Construct(
-    This->ancestorStorage,
+    This->ancestorStorage, 
     This->rootPropertySetIndex);
-
+  
   /*
    * Search the enumeration for the property with the given name
@@ -386 +397 @@
     pwcsName,
     &currentProperty);
-
+  
   /*
    * Delete the property enumeration since we don't need it anymore
    */
   IEnumSTATSTGImpl_Destroy(propertyEnumeration);
-
+  
   /*
    * If it was found, construct the stream object and return a pointer to it.
    */
-  if ( (foundPropertyIndex!=PROPERTY_NULL) &&
+  if ( (foundPropertyIndex!=PROPERTY_NULL) && 
        (currentProperty.propertyType==PROPTYPE_STREAM) )
   {
     newStream = StgStreamImpl_Construct(This, grfMode, foundPropertyIndex);
-
+    
     if (newStream!=0)
     {
@@ -406 +417 @@
 
       /*
-       * Since we are returning a pointer to the interface, we have to
+       * Since we are returning a pointer to the interface, we have to 
        * nail down the reference.
        */
       StgStreamImpl_AddRef(*ppstm);
-
+      
       return S_OK;
     }
-
+    
     return E_OUTOFMEMORY;
   }
-
+  
   return STG_E_FILENOTFOUND;
 }
@@ -424 +435 @@
  *
  * This method will open a new storage object from the current storage.
- *
+ * 
  * See Windows documentation for more details on IStorage methods.
- */
-HRESULT WINAPI StorageBaseImpl_OpenStorage(
+ */        
+HRESULT WINAPI StorageBaseImpl_OpenStorage( 
   IStorage*        iface,
-  const OLECHAR*   pwcsName,      /* [string][unique][in] */
-  IStorage*        pstgPriority,  /* [unique][in] */
-  DWORD            grfMode,       /* [in] */
-  SNB              snbExclude,    /* [unique][in] */
-  DWORD            reserved,      /* [in] */
-  IStorage**       ppstg)         /* [out] */
+  const OLECHAR*   pwcsName,      /* [string][unique][in] */ 
+  IStorage*        pstgPriority,  /* [unique][in] */         
+  DWORD            grfMode,       /* [in] */                 
+  SNB              snbExclude,    /* [unique][in] */         
+  DWORD            reserved,      /* [in] */                 
+  IStorage**       ppstg)         /* [out] */                        
 {
   ICOM_THIS(StorageBaseImpl,iface);
@@ -442 +453 @@
   ULONG                  foundPropertyIndex;
 
-  TRACE("(%p, %s, %p, %lx, %p, %ld, %p)\n",
-    iface, debugstr_w(pwcsName), pstgPriority,
-    grfMode, snbExclude, reserved, ppstg);
-
+  TRACE("(%p, %s, %p, %lx, %p, %ld, %p)\n", 
+        iface, debugstr_w(pwcsName), pstgPriority, 
+        grfMode, snbExclude, reserved, ppstg);
+  
   /*
    * Perform a sanity check on the parameters.
@@ -451 +462 @@
   if ( (This==0) || (pwcsName==NULL) || (ppstg==0) )
     return E_INVALIDARG;
-
+  
   /*
    * Validate the STGM flags
@@ -461 +472 @@
    * As documented.
    */
-  if ( !(grfMode & STGM_SHARE_EXCLUSIVE) ||
+  if ( !(grfMode & STGM_SHARE_EXCLUSIVE) || 
         (grfMode & STGM_DELETEONRELEASE) ||
         (grfMode & STGM_PRIORITY) )
@@ -470 +481 @@
    */
   *ppstg = 0;
-
+  
   /*
    * Create a property enumeration to search the properties
    */
   propertyEnumeration = IEnumSTATSTGImpl_Construct(
-                          This->ancestorStorage,
+                          This->ancestorStorage, 
                           This->rootPropertySetIndex);
-
+  
   /*
    * Search the enumeration for the property with the given name
@@ -485 +496 @@
                          pwcsName,
                          &currentProperty);
-
+  
   /*
    * Delete the property enumeration since we don't need it anymore
    */
   IEnumSTATSTGImpl_Destroy(propertyEnumeration);
-
+  
   /*
    * If it was found, construct the stream object and return a pointer to it.
    */
-  if ( (foundPropertyIndex!=PROPERTY_NULL) &&
+  if ( (foundPropertyIndex!=PROPERTY_NULL) && 
        (currentProperty.propertyType==PROPTYPE_STORAGE) )
   {
@@ -503 +514 @@
                    This->ancestorStorage,
                    foundPropertyIndex);
-
+    
     if (newStorage != 0)
     {
@@ -509 +520 @@
 
       /*
-       * Since we are returning a pointer to the interface,
+       * Since we are returning a pointer to the interface, 
        * we have to nail down the reference.
        */
       StorageBaseImpl_AddRef(*ppstg);
-
+      
       return S_OK;
     }
-
+    
     return STG_E_INSUFFICIENTMEMORY;
   }
-
+  
   return STG_E_FILENOTFOUND;
 }
@@ -526 +537 @@
  * Storage32BaseImpl_EnumElements (IStorage)
  *
- * This method will create an enumerator object that can be used to
+ * This method will create an enumerator object that can be used to 
  * retrieve informatino about all the properties in the storage object.
- *
+ * 
  * See Windows documentation for more details on IStorage methods.
- */
-HRESULT WINAPI StorageBaseImpl_EnumElements(
+ */        
+HRESULT WINAPI StorageBaseImpl_EnumElements( 
   IStorage*       iface,
-  DWORD           reserved1, /* [in] */
-  void*           reserved2, /* [size_is][unique][in] */
-  DWORD           reserved3, /* [in] */
-  IEnumSTATSTG**  ppenum)    /* [out] */
+  DWORD           reserved1, /* [in] */                  
+  void*           reserved2, /* [size_is][unique][in] */ 
+  DWORD           reserved3, /* [in] */                  
+  IEnumSTATSTG**  ppenum)    /* [out] */                 
 {
   ICOM_THIS(StorageBaseImpl,iface);
   IEnumSTATSTGImpl* newEnum;
 
-  TRACE("(%p, %ld, %p, %ld, %p)\n",
-    iface, reserved1, reserved2, reserved3, ppenum);
+  TRACE("(%p, %ld, %p, %ld, %p)\n", 
+        iface, reserved1, reserved2, reserved3, ppenum);
 
   /*
@@ -549 +560 @@
   if ( (This==0) || (ppenum==0))
     return E_INVALIDARG;
-
+  
   /*
    * Construct the enumerator.
@@ -566 +577 @@
      */
     IEnumSTATSTGImpl_AddRef(*ppenum);
-
+    
     return S_OK;
   }
@@ -577 +588 @@
  *
  * This method will retrieve information about this storage object.
- *
+ * 
  * See Windows documentation for more details on IStorage methods.
- */
-HRESULT WINAPI StorageBaseImpl_Stat(
+ */        
+HRESULT WINAPI StorageBaseImpl_Stat( 
   IStorage*        iface,
-  STATSTG*         pstatstg,     /* [out] */
-  DWORD            grfStatFlag)  /* [in] */
+  STATSTG*         pstatstg,     /* [out] */ 
+  DWORD            grfStatFlag)  /* [in] */  
 {
   ICOM_THIS(StorageBaseImpl,iface);
@@ -589 +600 @@
   BOOL         readSuccessful;
 
-  TRACE("(%p, %p, %lx)\n",
-    iface, pstatstg, grfStatFlag);
+  TRACE("(%p, %p, %lx)\n", 
+        iface, pstatstg, grfStatFlag);
 
   /*
@@ -609 +620 @@
   {
     StorageUtl_CopyPropertyToSTATSTG(
-      pstatstg,
-      &curProperty,
+      pstatstg, 
+      &curProperty, 
       grfStatFlag);
-
+    
     return S_OK;
   }
-
+  
   return E_FAIL;
 }
@@ -622 +633 @@
  * Storage32BaseImpl_RenameElement (IStorage)
  *
- * This method will rename the specified element.
+ * This method will rename the specified element. 
  *
  * See Windows documentation for more details on IStorage methods.
- *
- * Implementation notes: The method used to rename consists of creating a clone
- *    of the deleted StgProperty object setting it with the new name and to
+ * 
+ * Implementation notes: The method used to rename consists of creating a clone 
+ *    of the deleted StgProperty object setting it with the new name and to 
  *    perform a DestroyElement of the old StgProperty.
  */
@@ -640 +651 @@
   ULONG             foundPropertyIndex;
 
-  TRACE("(%p, %s, %s)\n",
-    iface, debugstr_w(pwcsOldName), debugstr_w(pwcsNewName));
+  TRACE("(%p, %s, %s)\n", 
+        iface, debugstr_w(pwcsOldName), debugstr_w(pwcsNewName));
 
   /*
@@ -687 +698 @@
      * Setup a new property for the renamed property
      */
-    renamedProperty.sizeOfNameString =
+    renamedProperty.sizeOfNameString = 
       ( lstrlenW(pwcsNewName)+1 ) * sizeof(WCHAR);
-
+  
     if (renamedProperty.sizeOfNameString > PROPERTY_NAME_BUFFER_LEN)
       return STG_E_INVALIDNAME;
-
+  
     strcpyW(renamedProperty.name, pwcsNewName);
-
+ 
     renamedProperty.propertyType  = currentProperty.propertyType;
     renamedProperty.startingBlock = currentProperty.startingBlock;
     renamedProperty.size.s.LowPart  = currentProperty.size.s.LowPart;
     renamedProperty.size.s.HighPart = currentProperty.size.s.HighPart;
-
+  
     renamedProperty.previousProperty = PROPERTY_NULL;
     renamedProperty.nextProperty     = PROPERTY_NULL;
-
+  
     /*
      * Bring the dirProperty link in case it is a storage and in which
@@ -708 +719 @@
      */
     renamedProperty.dirProperty = currentProperty.dirProperty;
-
-    /* call CoFileTime to get the current time
+  
+    /* call CoFileTime to get the current time 
     renamedProperty.timeStampS1
     renamedProperty.timeStampD1
     renamedProperty.timeStampS2
     renamedProperty.timeStampD2
-    renamedProperty.propertyUniqueID
+    renamedProperty.propertyUniqueID 
     */
-
-    /*
+  
+    /* 
      * Obtain a free property in the property chain
      */
     renamedPropertyIndex = getFreeProperty(This->ancestorStorage);
-
+  
     /*
      * Save the new property into the new property spot
-     */
+     */  
     StorageImpl_WriteProperty(
       This->ancestorStorage,
-      renamedPropertyIndex,
+      renamedPropertyIndex, 
       &renamedProperty);
-
-    /*
+  
+    /* 
      * Find a spot in the property chain for our newly created property.
      */
     updatePropertyChain(
       (StorageImpl*)This,
-      renamedPropertyIndex,
+      renamedPropertyIndex, 
       renamedProperty);
 
     /*
-     * At this point the renamed property has been inserted in the tree,
-     * now, before to Destroy the old property we must zeroed it's dirProperty
-     * otherwise the DestroyProperty below will zap it all and we do not want
+     * At this point the renamed property has been inserted in the tree, 
+     * now, before to Destroy the old property we must zeroed it's dirProperty 
+     * otherwise the DestroyProperty below will zap it all and we do not want 
      * this to happen.
      * Also, we fake that the old property is a storage so the DestroyProperty
      * will not do a SetSize(0) on the stream data.
-     *
+     * 
      * This means that we need to tweek the StgProperty if it is a stream or a
      * non empty storage.
@@ -757 +768 @@
     StorageImpl_WriteProperty(
       This->ancestorStorage,
-      foundPropertyIndex,
+      foundPropertyIndex, 
       &currentProperty);
 
-    /*
-     * Invoke Destroy to get rid of the ole property and automatically redo
-     * the linking of it's previous and next members...
-     */
-    StorageImpl_DestroyElement((IStorage*)This->ancestorStorage, pwcsOldName);
+    /* 
+     * Invoke Destroy to get rid of the ole property and automatically redo 
+     * the linking of it's previous and next members... 
+     */ 
+    StorageImpl_DestroyElement((IStorage*)This->ancestorStorage, pwcsOldName); 
 
   }
@@ -781 +792 @@
  * Storage32BaseImpl_CreateStream (IStorage)
  *
- * This method will create a stream object within this storage
+ * This method will create a stream object within this storage 
  *
  * See Windows documentation for more details on IStorage methods.
@@ -799 +810 @@
   ULONG             foundPropertyIndex, newPropertyIndex;
 
-  TRACE("(%p, %s, %lx, %ld, %ld, %p)\n",
-    iface, debugstr_w(pwcsName), grfMode,
-    reserved1, reserved2, ppstm);
+  TRACE("(%p, %s, %lx, %ld, %ld, %p)\n", 
+        iface, debugstr_w(pwcsName), grfMode, 
+        reserved1, reserved2, ppstm);
 
   /*
@@ -846 +857 @@
   {
     /*
-     * An element with this name already exists
+     * An element with this name already exists 
      */
     if (grfMode & STGM_CREATE)
     {
-      IStorage_DestroyElement(iface, pwcsName);
-    }
-    else
+      IStorage_DestroyElement(iface, pwcsName); 
+    }
+    else 
       return STG_E_FILEALREADYEXISTS;
   }
 
-  /*
-   * memset the empty property
+  /* 
+   * memset the empty property 
    */
   memset(&newStreamProperty, 0, sizeof(StgProperty));
@@ -878 +889 @@
   newStreamProperty.dirProperty      = PROPERTY_NULL;
 
-  /* call CoFileTime to get the current time
+  /* call CoFileTime to get the current time 
   newStreamProperty.timeStampS1
   newStreamProperty.timeStampD1
@@ -888 +899 @@
 
   /*
-   * Get a free property or create a new one
+   * Get a free property or create a new one 
    */
   newPropertyIndex = getFreeProperty(This->ancestorStorage);
@@ -894 +905 @@
   /*
    * Save the new property into the new property spot
-   */
+   */  
   StorageImpl_WriteProperty(
     This->ancestorStorage,
-    newPropertyIndex,
+    newPropertyIndex, 
     &newStreamProperty);
 
-  /*
+  /* 
    * Find a spot in the property chain for our newly created property.
    */
   updatePropertyChain(
     (StorageImpl*)This,
-    newPropertyIndex,
+    newPropertyIndex, 
     newStreamProperty);
 
-  /*
+  /* 
    * Open the stream to return it.
    */
@@ -934 +945 @@
  * Storage32BaseImpl_SetClass (IStorage)
  *
- * This method will write the specified CLSID in the property of this
+ * This method will write the specified CLSID in the property of this 
  * storage.
  *
@@ -949 +960 @@
 
   TRACE("(%p, %p)\n", iface, clsid);
-
+  
   success = StorageImpl_ReadProperty(This->ancestorStorage,
                                        This->rootPropertySetIndex,
@@ -970 +981 @@
 ** Storage32Impl implementation
 */
-
+        
 /************************************************************************
  * Storage32Impl_CreateStorage (IStorage)
@@ -978 +989 @@
  * See Windows documentation for more details on IStorage methods.
  */
-HRESULT WINAPI StorageImpl_CreateStorage(
+HRESULT WINAPI StorageImpl_CreateStorage( 
   IStorage*      iface,
-  const OLECHAR  *pwcsName, /* [string][in] */
-  DWORD            grfMode,   /* [in] */
-  DWORD            reserved1, /* [in] */
-  DWORD            reserved2, /* [in] */
-  IStorage       **ppstg)   /* [out] */
+  const OLECHAR  *pwcsName, /* [string][in] */ 
+  DWORD            grfMode,   /* [in] */ 
+  DWORD            reserved1, /* [in] */ 
+  DWORD            reserved2, /* [in] */ 
+  IStorage       **ppstg)   /* [out] */ 
 {
   StorageImpl* const This=(StorageImpl*)iface;
@@ -995 +1006 @@
   HRESULT          hr;
 
-  TRACE("(%p, %s, %lx, %ld, %ld, %p)\n",
-    iface, debugstr_w(pwcsName), grfMode,
-    reserved1, reserved2, ppstg);
-
+  TRACE("(%p, %s, %lx, %ld, %ld, %p)\n", 
+        iface, debugstr_w(pwcsName), grfMode, 
+        reserved1, reserved2, ppstg);
+  
   /*
    * Validate parameters
@@ -1034 +1045 @@
   {
     /*
-     * An element with this name already exists
+     * An element with this name already exists 
      */
     if (grfMode & STGM_CREATE)
-      IStorage_DestroyElement(iface, pwcsName);
-    else
+      IStorage_DestroyElement(iface, pwcsName); 
+    else 
       return STG_E_FILEALREADYEXISTS;
   }
 
-  /*
-   * memset the empty property
+  /* 
+   * memset the empty property 
    */
   memset(&newProperty, 0, sizeof(StgProperty));
@@ -1063 +1074 @@
   newProperty.dirProperty      = PROPERTY_NULL;
 
-  /* call CoFileTime to get the current time
+  /* call CoFileTime to get the current time 
   newProperty.timeStampS1
   newProperty.timeStampD1
@@ -1072 +1083 @@
   /*  newStorageProperty.propertyUniqueID */
 
-  /*
+  /* 
    * Obtain a free property in the property chain
    */
@@ -1079 +1090 @@
   /*
    * Save the new property into the new property spot
-   */
+   */  
   StorageImpl_WriteProperty(
     This->ancestorStorage,
-    newPropertyIndex,
+    newPropertyIndex, 
     &newProperty);
 
-  /*
+  /* 
    * Find a spot in the property chain for our newly created property.
    */
   updatePropertyChain(
     This,
-    newPropertyIndex,
+    newPropertyIndex, 
     newProperty);
 
-  /*
+  /* 
    * Open it to get a pointer to return.
    */
@@ -1110 +1121 @@
   }
 
-
+  
   return S_OK;
 }
@@ -1141 +1152 @@
       if (currentProperty.sizeOfNameString == 0)
       {
-        /*
+        /* 
          * The property existis and is available, we found it.
          */
@@ -1158 +1169 @@
   } while (newPropertyIndex == PROPERTY_NULL);
 
-  /*
-   * grow the property chain
+  /* 
+   * grow the property chain 
    */
   if (! readSuccessful)
@@ -1169 +1180 @@
     ULONG          blockCount    = 0;
 
-    /*
-     * obtain the new count of property blocks
+    /* 
+     * obtain the new count of property blocks 
      */
     blockCount = BlockChainStream_GetCount(
                    storage->ancestorStorage->rootBlockChain)+1;
 
-    /*
-     * initialize the size used by the property stream
+    /* 
+     * initialize the size used by the property stream 
      */
     newSize.s.HighPart = 0;
     newSize.s.LowPart  = storage->bigBlockSize * blockCount;
 
-    /*
-     * add a property block to the property chain
+    /* 
+     * add a property block to the property chain 
      */
     BlockChainStream_SetSize(storage->ancestorStorage->rootBlockChain, newSize);
 
-    /*
-     * memset the empty property in order to initialize the unused newly
+    /* 
+     * memset the empty property in order to initialize the unused newly 
      * created property
      */
     memset(&emptyProperty, 0, sizeof(StgProperty));
 
-    /*
+    /* 
      * initialize them
      */
-    lastProperty = storage->bigBlockSize / PROPSET_BLOCK_SIZE * blockCount;
-
+    lastProperty = storage->bigBlockSize / PROPSET_BLOCK_SIZE * blockCount; 
+    
     for(
       propertyIndex = newPropertyIndex;
@@ -1204 +1215 @@
       StorageImpl_WriteProperty(
         storage->ancestorStorage,
-        propertyIndex,
+        propertyIndex, 
         &emptyProperty);
     }
@@ -1216 +1227 @@
  * Internal Method
  *
- * Case insensitive comparaison of StgProperty.name by first considering
+ * Case insensitive comparaison of StgProperty.name by first considering 
  * their size.
  *
@@ -1229 +1240 @@
   LONG diff      = lstrlenW(newProperty) - lstrlenW(currentProperty);
 
-  if (diff == 0)
-  {
-    /*
+  if (diff == 0) 
+  {
+    /* 
      * We compare the string themselves only when they are of the same lenght
      */
@@ -1237 +1248 @@
   }
 
-  return diff;
+  return diff;  
 }
 
@@ -1249 +1260 @@
   StorageImpl *storage,
   ULONG         newPropertyIndex,
-  StgProperty   newProperty)
+  StgProperty   newProperty) 
 {
   StgProperty currentProperty;
@@ -1262 +1273 @@
   if (currentProperty.dirProperty != PROPERTY_NULL)
   {
-    /*
+    /* 
      * The root storage contains some element, therefore, start the research
      * for the appropriate location.
@@ -1275 +1286 @@
 
     /*
-     * Read
+     * Read 
      */
     StorageImpl_ReadProperty(storage->ancestorStorage,
@@ -1288 +1299 @@
     {
       LONG diff = propertyNameCmp( newProperty.name, currentProperty.name);
-
+  
       if (diff < 0)
       {
@@ -1327 +1338 @@
       else
       {
-    /*
-     * Trying to insert an item with the same name in the
-     * subtree structure.
-     */
-    assert(FALSE);
+        /*
+         * Trying to insert an item with the same name in the
+         * subtree structure.
+         */
+        assert(FALSE);
       }
 
@@ -1340 +1351 @@
   else
   {
-    /*
+    /* 
      * The root storage is empty, link the new property to it's dir property
      */
@@ -1350 +1361 @@
 }
 
-
+      
 /*************************************************************************
  * CopyTo (IStorage)
  */
-HRESULT WINAPI StorageImpl_CopyTo(
+HRESULT WINAPI StorageImpl_CopyTo( 
   IStorage*   iface,
-  DWORD       ciidExclude,  /* [in] */
-  const IID*  rgiidExclude, /* [size_is][unique][in] */
-  SNB         snbExclude,   /* [unique][in] */
-  IStorage*   pstgDest)     /* [unique][in] */
+  DWORD       ciidExclude,  /* [in] */ 
+  const IID*  rgiidExclude, /* [size_is][unique][in] */ 
+  SNB         snbExclude,   /* [unique][in] */ 
+  IStorage*   pstgDest)     /* [unique][in] */ 
 {
   IEnumSTATSTG *elements     = 0;
@@ -1370 +1381 @@
     FIXME("Exclude option not implemented\n");
 
-  TRACE("(%p, %ld, %p, %p, %p)\n",
-    iface, ciidExclude, rgiidExclude,
-    snbExclude, pstgDest);
+  TRACE("(%p, %ld, %p, %p, %p)\n", 
+        iface, ciidExclude, rgiidExclude, 
+        snbExclude, pstgDest);
 
   /*
@@ -1380 +1391 @@
     return STG_E_INVALIDPOINTER;
 
-  /*
+  /* 
    * Enumerate the elements
    */
@@ -1393 +1404 @@
   IStorage_Stat( iface, &curElement, STATFLAG_NONAME);
   IStorage_SetClass( pstgDest, &curElement.clsid );
-
+  
   do
   {
@@ -1413 +1424 @@
        */
       hr = IStorage_OpenStorage( iface, curElement.pwcsName, NULL,
-                 STGM_READ|STGM_SHARE_EXCLUSIVE,
-                 NULL, 0, &pstgChild );
+                                 STGM_READ|STGM_SHARE_EXCLUSIVE,
+                                 NULL, 0, &pstgChild );
 
       if (hr != S_OK)
@@ -1425 +1436 @@
       if (pstgChild == pstgDest)
       {
-    IEnumSTATSTG_Release(elements);
-
-    return STG_E_ACCESSDENIED;
+        IEnumSTATSTG_Release(elements);
+
+        return STG_E_ACCESSDENIED;
       }
-
+            
       /*
        * create a new storage in destination storage
@@ -1435 +1446 @@
       hr = IStorage_CreateStorage( pstgDest, curElement.pwcsName,
                                    STGM_FAILIFTHERE|STGM_WRITE|STGM_SHARE_EXCLUSIVE,
-                   0, 0,
+                                   0, 0,
                                    &pstgTmp );
       /*
@@ -1446 +1457 @@
                                    NULL, 0, &pstgTmp );
       }
-
+        
       if (hr != S_OK)
         break;
 
-
+        
       /*
        * do the copy recursively
@@ -1456 +1467 @@
       hr = IStorage_CopyTo( pstgChild, ciidExclude, rgiidExclude,
                                snbExclude, pstgTmp );
-
+                                
       IStorage_Release( pstgTmp );
       IStorage_Release( pstgChild );
@@ -1477 +1488 @@
        */
       hr = IStorage_OpenStream( iface, curElement.pwcsName, NULL,
-                STGM_READ|STGM_SHARE_EXCLUSIVE,
-                0, &pstrChild );
+                                STGM_READ|STGM_SHARE_EXCLUSIVE,
+                                0, &pstrChild );
 
       if (hr != S_OK)
@@ -1492 +1503 @@
        */
       IStream_SetSize(pstrTmp, strStat.cbSize);
-
+      
       /*
        * do the copy
@@ -1498 +1509 @@
       hr = IStream_CopyTo( pstrChild, pstrTmp, strStat.cbSize,
                            NULL, NULL );
-
+                                
       IStream_Release( pstrTmp );
       IStream_Release( pstrChild );
@@ -1513 +1524 @@
    */
   IEnumSTATSTG_Release(elements);
-
+  
   return hr;
 }
-
+        
 /*************************************************************************
  * MoveElementTo (IStorage)
  */
-HRESULT WINAPI StorageImpl_MoveElementTo(
+HRESULT WINAPI StorageImpl_MoveElementTo( 
   IStorage*     iface,
-  const OLECHAR *pwcsName,   /* [string][in] */
-  IStorage      *pstgDest,   /* [unique][in] */
-  const OLECHAR *pwcsNewName,/* [string][in] */
-  DWORD           grfFlags)    /* [in] */
+  const OLECHAR *pwcsName,   /* [string][in] */ 
+  IStorage      *pstgDest,   /* [unique][in] */ 
+  const OLECHAR *pwcsNewName,/* [string][in] */ 
+  DWORD           grfFlags)    /* [in] */ 
 {
   FIXME("not implemented!\n");
   return E_NOTIMPL;
 }
-
+        
 /*************************************************************************
  * Commit (IStorage)
  */
-HRESULT WINAPI StorageImpl_Commit(
+HRESULT WINAPI StorageImpl_Commit( 
   IStorage*   iface,
-  DWORD         grfCommitFlags)/* [in] */
+  DWORD         grfCommitFlags)/* [in] */ 
 {
   FIXME("(%ld): stub!\n", grfCommitFlags);
   return S_OK;
 }
-
+        
 /*************************************************************************
  * Revert (IStorage)
  */
-HRESULT WINAPI StorageImpl_Revert(
+HRESULT WINAPI StorageImpl_Revert( 
   IStorage* iface)
 {
@@ -1555 +1566 @@
  * DestroyElement (IStorage)
  *
- * Stategy: This implementation is build this way for simplicity not for speed.
+ * Stategy: This implementation is build this way for simplicity not for speed. 
  *          I always delete the top most element of the enumeration and adjust
- *          the deleted element pointer all the time.  This takes longer to
- *          do but allow to reinvoke DestroyElement whenever we encounter a
+ *          the deleted element pointer all the time.  This takes longer to 
+ *          do but allow to reinvoke DestroyElement whenever we encounter a 
  *          storage object.  The optimisation reside in the usage of another
- *          enumeration stategy that would give all the leaves of a storage
+ *          enumeration stategy that would give all the leaves of a storage 
  *          first. (postfix order)
  */
-HRESULT WINAPI StorageImpl_DestroyElement(
+HRESULT WINAPI StorageImpl_DestroyElement( 
   IStorage*     iface,
-  const OLECHAR *pwcsName)/* [string][in] */
+  const OLECHAR *pwcsName)/* [string][in] */ 
 {
   StorageImpl* const This=(StorageImpl*)iface;
@@ -1578 +1589 @@
   ULONG             parentPropertyId;
 
-  TRACE("(%p, %s)\n",
-    iface, debugstr_w(pwcsName));
+  TRACE("(%p, %s)\n", 
+        iface, debugstr_w(pwcsName));
 
   /*
    * Perform a sanity check on the parameters.
    */
-  if (pwcsName==NULL)
+  if (pwcsName==NULL) 
     return STG_E_INVALIDPOINTER;
-
+  
   /*
    * Create a property enumeration to search the property with the given name
    */
   propertyEnumeration = IEnumSTATSTGImpl_Construct(
-    This->ancestorStorage,
+    This->ancestorStorage, 
     This->rootPropertySetIndex);
-
+  
   foundPropertyIndexToDelete = IEnumSTATSTGImpl_FindProperty(
     propertyEnumeration,
@@ -1601 +1612 @@
   IEnumSTATSTGImpl_Destroy(propertyEnumeration);
 
-  if ( foundPropertyIndexToDelete == PROPERTY_NULL )
+  if ( foundPropertyIndexToDelete == PROPERTY_NULL )  
   {
     return STG_E_FILENOTFOUND;
   }
 
-  /*
-   * Find the parent property of the property to delete (the one that
-   * link to it).  If This->dirProperty == foundPropertyIndexToDelete,
+  /* 
+   * Find the parent property of the property to delete (the one that 
+   * link to it).  If This->dirProperty == foundPropertyIndexToDelete, 
    * the parent is This. Otherwise, the parent is one of it's sibling...
    */
 
-  /*
+  /* 
    * First, read This's StgProperty..
    */
-  res = StorageImpl_ReadProperty(
+  res = StorageImpl_ReadProperty( 
           This->ancestorStorage,
           This->rootPropertySetIndex,
@@ -1622 +1633 @@
   assert(res==TRUE);
 
-  /*
+  /* 
    * Second, check to see if by any chance the actual storage (This) is not
    * the parent of the property to delete... We never know...
@@ -1628 +1639 @@
   if ( parentProperty.dirProperty == foundPropertyIndexToDelete )
   {
-    /*
+    /* 
      * Set data as it would have been done in the else part...
      */
@@ -1634 +1645 @@
     parentPropertyId = This->rootPropertySetIndex;
   }
-  else
-  {
-    /*
-     * Create a property enumeration to search the parent properties, and
+  else 
+  { 
+    /*
+     * Create a property enumeration to search the parent properties, and 
      * delete it once done.
      */
@@ -1643 +1654 @@
 
     propertyEnumeration2 = IEnumSTATSTGImpl_Construct(
-      This->ancestorStorage,
+      This->ancestorStorage, 
       This->rootPropertySetIndex);
-
+  
     typeOfRelation = IEnumSTATSTGImpl_FindParentProperty(
       propertyEnumeration2,
@@ -1655 +1666 @@
   }
 
-  if ( propertyToDelete.propertyType == PROPTYPE_STORAGE )
+  if ( propertyToDelete.propertyType == PROPTYPE_STORAGE ) 
   {
     hr = deleteStorageProperty(
-           This,
+           This, 
            foundPropertyIndexToDelete,
            propertyToDelete);
-  }
+  } 
   else if ( propertyToDelete.propertyType == PROPTYPE_STREAM )
   {
     hr = deleteStreamProperty(
-           This,
+           This, 
            foundPropertyIndexToDelete,
            propertyToDelete);
   }
 
-  if (hr!=S_OK)
+  if (hr!=S_OK) 
     return hr;
 
@@ -1678 +1689 @@
   hr = adjustPropertyChain(
         This,
-        propertyToDelete,
+        propertyToDelete, 
         parentProperty,
         parentPropertyId,
@@ -1722 +1733 @@
   }
 
-  /*
+  /* 
    * Enumerate the elements
    */
@@ -1736 +1747 @@
     {
       destroyHr = StorageImpl_DestroyElement(
-                    (IStorage*)childStorage,
+                    (IStorage*)childStorage, 
                     (OLECHAR*)currentElement.pwcsName);
 
@@ -1761 +1772 @@
   IStorage_Release(childStorage);
   IEnumSTATSTG_Release(elements);
-
+    
   return destroyHr;
 }
@@ -1791 +1802 @@
          0,
          &pis);
-
+    
   if (hr!=S_OK)
   {
@@ -1797 +1808 @@
   }
 
-  /*
-   * Zap the stream
-   */
-  hr = IStream_SetSize(pis, size);
+  /* 
+   * Zap the stream 
+   */ 
+  hr = IStream_SetSize(pis, size); 
 
   if(hr != S_OK)
@@ -1812 +1823 @@
   IStream_Release(pis);
 
-  /*
+  /* 
    * Invalidate the property by zeroing it's name member.
    */
   propertyToDelete.sizeOfNameString = 0;
 
-  /*
+  /* 
    * Here we should re-read the property so we get the updated pointer
    * but since we are here to zap it, I don't do it...
    */
   StorageImpl_WriteProperty(
-    parentStorage->ancestorStorage,
+    parentStorage->ancestorStorage, 
     indexOfPropertyToDelete,
     &propertyToDelete);
@@ -1851 +1862 @@
   res = StorageImpl_ReadProperty(
           storage->ancestorStorage,
-          storePropertyIndex,
+          storePropertyIndex, 
           &storeProperty);
 
@@ -1865 +1876 @@
       return findPlaceholder(
                storage,
-               propertyIndexToStore,
+               propertyIndexToStore, 
                storeProperty.previousProperty,
                typeOfRelation);
@@ -1880 +1891 @@
       return findPlaceholder(
                storage,
-               propertyIndexToStore,
+               propertyIndexToStore, 
                storeProperty.nextProperty,
                typeOfRelation);
@@ -1888 +1899 @@
       storeProperty.nextProperty = propertyIndexToStore;
     }
-  }
+  } 
   else if (typeOfRelation == PROPERTY_RELATION_DIR)
   {
@@ -1895 +1906 @@
       return findPlaceholder(
                storage,
-               propertyIndexToStore,
+               propertyIndexToStore, 
                storeProperty.dirProperty,
                typeOfRelation);
@@ -1907 +1918 @@
   hr = StorageImpl_WriteProperty(
          storage->ancestorStorage,
-         storePropertyIndex,
+         storePropertyIndex, 
          &storeProperty);
 
@@ -1922 +1933 @@
  * Internal Method
  *
- * This method takes the previous and the next property link of a property
+ * This method takes the previous and the next property link of a property 
  * to be deleted and find them a place in the Storage.
  */
-static HRESULT adjustPropertyChain(
+static HRESULT adjustPropertyChain( 
   StorageImpl *This,
   StgProperty   propertyToDelete,
@@ -1939 +1950 @@
   HRESULT hr                     = S_OK;
   BOOL  res                    = TRUE;
-
-  if (typeOfRelation == PROPERTY_RELATION_PREVIOUS)
-  {
-    if (propertyToDelete.previousProperty != PROPERTY_NULL)
-    {
-      /*
+  
+  if (typeOfRelation == PROPERTY_RELATION_PREVIOUS) 
+  {
+    if (propertyToDelete.previousProperty != PROPERTY_NULL)  
+    {
+      /* 
        * Set the parent previous to the property to delete previous
        */
       newLinkProperty = propertyToDelete.previousProperty;
 
-      if (propertyToDelete.nextProperty != PROPERTY_NULL)
+      if (propertyToDelete.nextProperty != PROPERTY_NULL)  
       {
         /*
-         * We also need to find a storage for the other link, setup variables
+         * We also need to find a storage for the other link, setup variables 
          * to do this at the end...
-         */
+         */      
         needToFindAPlaceholder = TRUE;
         storeNode              = propertyToDelete.previousProperty;
@@ -1960 +1971 @@
         relationType           = PROPERTY_RELATION_NEXT;
       }
-    }
-    else if (propertyToDelete.nextProperty != PROPERTY_NULL)
-    {
-      /*
+    } 
+    else if (propertyToDelete.nextProperty != PROPERTY_NULL)  
+    {
+      /* 
        * Set the parent previous to the property to delete next
        */
       newLinkProperty = propertyToDelete.nextProperty;
     }
-
-    /*
+   
+    /* 
      * Link it for real...
-     */
+     */ 
     parentProperty.previousProperty = newLinkProperty;
-
-  }
-  else if (typeOfRelation == PROPERTY_RELATION_NEXT)
-  {
-    if (propertyToDelete.previousProperty != PROPERTY_NULL)
-    {
-      /*
+  
+  } 
+  else if (typeOfRelation == PROPERTY_RELATION_NEXT) 
+  {
+    if (propertyToDelete.previousProperty != PROPERTY_NULL)  
+    {
+      /* 
        * Set the parent next to the property to delete next previous
        */
       newLinkProperty = propertyToDelete.previousProperty;
-
-      if (propertyToDelete.nextProperty != PROPERTY_NULL)
+      
+      if (propertyToDelete.nextProperty != PROPERTY_NULL)  
       {
         /*
-         * We also need to find a storage for the other link, setup variables
+         * We also need to find a storage for the other link, setup variables 
          * to do this at the end...
-         */
+         */      
         needToFindAPlaceholder = TRUE;
         storeNode              = propertyToDelete.previousProperty;
@@ -1995 +2006 @@
         relationType           = PROPERTY_RELATION_NEXT;
       }
-    }
-    else if (propertyToDelete.nextProperty != PROPERTY_NULL)
-    {
-      /*
+    } 
+    else if (propertyToDelete.nextProperty != PROPERTY_NULL)  
+    {
+      /* 
        * Set the parent next to the property to delete next
        */
@@ -2004 +2015 @@
     }
 
-    /*
+    /* 
      * Link it for real...
-     */
+     */ 
     parentProperty.nextProperty = newLinkProperty;
-  }
+  } 
   else /* (typeOfRelation == PROPERTY_RELATION_DIR) */
   {
-    if (propertyToDelete.previousProperty != PROPERTY_NULL)
-    {
-      /*
+    if (propertyToDelete.previousProperty != PROPERTY_NULL) 
+    {
+      /* 
        * Set the parent dir to the property to delete previous
        */
       newLinkProperty = propertyToDelete.previousProperty;
 
-      if (propertyToDelete.nextProperty != PROPERTY_NULL)
+      if (propertyToDelete.nextProperty != PROPERTY_NULL)  
       {
         /*
-         * We also need to find a storage for the other link, setup variables
+         * We also need to find a storage for the other link, setup variables 
          * to do this at the end...
-         */
+         */      
         needToFindAPlaceholder = TRUE;
         storeNode              = propertyToDelete.previousProperty;
@@ -2029 +2040 @@
         relationType           = PROPERTY_RELATION_NEXT;
       }
-    }
-    else if (propertyToDelete.nextProperty != PROPERTY_NULL)
-    {
-      /*
+    } 
+    else if (propertyToDelete.nextProperty != PROPERTY_NULL)  
+    {
+      /* 
        * Set the parent dir to the property to delete next
        */
@@ -2038 +2049 @@
     }
 
-    /*
+    /* 
      * Link it for real...
-     */
+     */ 
     parentProperty.dirProperty = newLinkProperty;
   }
 
-  /*
-   * Write back the parent property
+  /* 
+   * Write back the parent property    
    */
   res = StorageImpl_WriteProperty(
-          This->ancestorStorage,
+          This->ancestorStorage, 
           parentPropertyId,
           &parentProperty);
@@ -2057 +2068 @@
 
   /*
-   * If a placeholder is required for the other link, then, find one and
+   * If a placeholder is required for the other link, then, find one and 
    * get out of here...
    */
-  if (needToFindAPlaceholder)
+  if (needToFindAPlaceholder) 
   {
     hr = findPlaceholder(
-           This,
-           toStoreNode,
+           This, 
+           toStoreNode, 
            storeNode,
            relationType);
@@ -2076 +2087 @@
  * SetElementTimes (IStorage)
  */
-HRESULT WINAPI StorageImpl_SetElementTimes(
+HRESULT WINAPI StorageImpl_SetElementTimes( 
   IStorage*     iface,
-  const OLECHAR *pwcsName,/* [string][in] */
-  const FILETIME  *pctime,  /* [in] */
-  const FILETIME  *patime,  /* [in] */
-  const FILETIME  *pmtime)  /* [in] */
+  const OLECHAR *pwcsName,/* [string][in] */ 
+  const FILETIME  *pctime,  /* [in] */ 
+  const FILETIME  *patime,  /* [in] */ 
+  const FILETIME  *pmtime)  /* [in] */ 
 {
   FIXME("not implemented!\n");
@@ -2090 +2101 @@
  * SetStateBits (IStorage)
  */
-HRESULT WINAPI StorageImpl_SetStateBits(
+HRESULT WINAPI StorageImpl_SetStateBits( 
   IStorage*   iface,
-  DWORD         grfStateBits,/* [in] */
-  DWORD         grfMask)     /* [in] */
+  DWORD         grfStateBits,/* [in] */ 
+  DWORD         grfMask)     /* [in] */ 
 {
   FIXME("not implemented!\n");
@@ -2111 +2122 @@
   BOOL      readSuccessful;
   ULONG       currentPropertyIndex;
-
+  
   if ( FAILED( validateSTGM(openFlags) ))
     return STG_E_INVALIDFLAG;
 
   memset(This, 0, sizeof(StorageImpl));
-
+  
   /*
    * Initialize the virtual fgunction table.
@@ -2122 +2133 @@
   ICOM_VTBL(This)    = &Storage32Impl_Vtbl;
   This->v_destructor = &StorageImpl_Destroy;
-
+  
   /*
    * This is the top-level storage so initialize the ancester pointer
@@ -2128 +2139 @@
    */
   This->ancestorStorage = This;
-
+  
   /*
    * Initialize the physical support of the storage.
    */
   This->hFile = hFile;
-
+  
   /*
    * Initialize the big block cache.
@@ -2147 +2158 @@
   if (This->bigBlockFile == 0)
     return E_FAIL;
-
+ 
   if (fileCreate)
   {
@@ -2159 +2170 @@
      * - There is no small block depot
      */
-    memset( This->bigBlockDepotStart,
-            BLOCK_UNUSED,
+    memset( This->bigBlockDepotStart,     
+            BLOCK_UNUSED, 
             sizeof(This->bigBlockDepotStart));
 
@@ -2214 +2225 @@
    */
   This->prevFreeBlock = 0;
-
+  
   /*
    * Create the block chain abstractions.
    */
-  This->rootBlockChain =
+  This->rootBlockChain = 
     BlockChainStream_Construct(This, &This->rootStartBlock, PROPERTY_NULL);
 
   This->smallBlockDepotChain = BlockChainStream_Construct(
-                                 This,
-                                 &This->smallBlockDepotStart,
+                                 This, 
+                                 &This->smallBlockDepotStart, 
                                  PROPERTY_NULL);
 
   /*
-   * Write the root property
+   * Write the root property 
    */
   if (fileCreate)
@@ -2254 +2265 @@
    */
   currentPropertyIndex = 0;
-
+  
   do
   {
     readSuccessful = StorageImpl_ReadProperty(
-                      This,
-                      currentPropertyIndex,
+                      This, 
+                      currentPropertyIndex, 
                       &currentProperty);
-
+    
     if (readSuccessful)
     {
@@ -2272 +2283 @@
 
     currentPropertyIndex++;
-
+    
   } while (readSuccessful && (This->rootPropertySetIndex == PROPERTY_NULL) );
-
+  
   if (!readSuccessful)
   {
@@ -2285 +2296 @@
    */
   This->smallBlockRootChain = BlockChainStream_Construct(
-                                This,
-                                NULL,
+                                This, 
+                                NULL, 
                                 This->rootPropertySetIndex);
-
+  
   return hr;
 }
@@ -2821 +2832 @@
 
     StorageUtl_ReadWord(
-      headerBigBlock,
-      OFFSET_BIGBLOCKSIZEBITS,
+      headerBigBlock, 
+      OFFSET_BIGBLOCKSIZEBITS,   
       &This->bigBlockSizeBits);
 
     StorageUtl_ReadWord(
-      headerBigBlock,
-      OFFSET_SMALLBLOCKSIZEBITS,
+      headerBigBlock, 
+      OFFSET_SMALLBLOCKSIZEBITS, 
       &This->smallBlockSizeBits);
 
     StorageUtl_ReadDWord(
-      headerBigBlock,
-      OFFSET_BBDEPOTCOUNT,
+      headerBigBlock, 
+      OFFSET_BBDEPOTCOUNT,      
       &This->bigBlockDepotCount);
 
     StorageUtl_ReadDWord(
-      headerBigBlock,
-      OFFSET_ROOTSTARTBLOCK,
+      headerBigBlock, 
+      OFFSET_ROOTSTARTBLOCK,    
       &This->rootStartBlock);
 
     StorageUtl_ReadDWord(
-      headerBigBlock,
-      OFFSET_SBDEPOTSTART,
+      headerBigBlock, 
+      OFFSET_SBDEPOTSTART,      
       &This->smallBlockDepotStart);
 
+    StorageUtl_ReadDWord( 
+      headerBigBlock, 
+      OFFSET_EXTBBDEPOTSTART,   
+      &This->extBigBlockDepotStart);
+
     StorageUtl_ReadDWord(
-      headerBigBlock,
-      OFFSET_EXTBBDEPOTSTART,
-      &This->extBigBlockDepotStart);
-
-    StorageUtl_ReadDWord(
-      headerBigBlock,
-      OFFSET_EXTBBDEPOTCOUNT,
+      headerBigBlock, 
+      OFFSET_EXTBBDEPOTCOUNT,   
       &This->extBigBlockDepotCount);
-
+    
     for (index = 0; index < COUNT_BBDEPOTINHEADER; index ++)
     {
       StorageUtl_ReadDWord(
-        headerBigBlock,
+        headerBigBlock, 
         OFFSET_BBDEPOTSTART + (sizeof(ULONG)*index),
         &(This->bigBlockDepotStart[index]));
     }
-
+    
     /*
      * Make the bitwise arithmetic to get the size of the blocks in bytes.
@@ -2876 +2887 @@
       This->smallBlockSize = 0x000000001 >> (DWORD)This->smallBlockSizeBits;
     }
-
-    /*
-     * Right now, the code is making some assumptions about the size of the
+    
+    /*
+     * Right now, the code is making some assumptions about the size of the 
      * blocks, just make sure they are what we're expecting.
      */
-    assert( (This->bigBlockSize==DEF_BIG_BLOCK_SIZE) &&
+    assert( (This->bigBlockSize==DEF_BIG_BLOCK_SIZE) && 
             (This->smallBlockSize==DEF_SMALL_BLOCK_SIZE));
-
+    
     /*
      * Release the block.
@@ -2891 +2902 @@
     hr = S_OK;
   }
-
+  
   return hr;
 }
@@ -2911 +2922 @@
    */
   success = StorageImpl_ReadBigBlock(This, -1, headerBigBlock);
-
+  
   /*
    * If the block read failed, the file is probably new.
@@ -2921 +2932 @@
      */
     memset(headerBigBlock, 0, BIG_BLOCK_SIZE);
-
+    
     /*
      * Initialize the magic number.
      */
     memcpy(headerBigBlock, STORAGE_magic, sizeof(STORAGE_magic));
-
+    
     /*
      * And a bunch of things we don't know what they mean
@@ -2936 +2947 @@
     StorageUtl_WriteDWord(headerBigBlock, 0x40, (DWORD)0x0001);
   }
-
+  
   /*
    * Write the information to the header.
@@ -2943 +2954 @@
   {
     StorageUtl_WriteWord(
-      headerBigBlock,
-      OFFSET_BIGBLOCKSIZEBITS,
+      headerBigBlock, 
+      OFFSET_BIGBLOCKSIZEBITS,   
       This->bigBlockSizeBits);
 
     StorageUtl_WriteWord(
-      headerBigBlock,
-      OFFSET_SMALLBLOCKSIZEBITS,
+      headerBigBlock, 
+      OFFSET_SMALLBLOCKSIZEBITS, 
       This->smallBlockSizeBits);
 
     StorageUtl_WriteDWord(
-      headerBigBlock,
-      OFFSET_BBDEPOTCOUNT,
+      headerBigBlock, 
+      OFFSET_BBDEPOTCOUNT,      
       This->bigBlockDepotCount);
 
     StorageUtl_WriteDWord(
-      headerBigBlock,
-      OFFSET_ROOTSTARTBLOCK,
+      headerBigBlock, 
+      OFFSET_ROOTSTARTBLOCK,    
       This->rootStartBlock);
 
     StorageUtl_WriteDWord(
-      headerBigBlock,
-      OFFSET_SBDEPOTSTART,
+      headerBigBlock, 
+      OFFSET_SBDEPOTSTART,      
       This->smallBlockDepotStart);
 
     StorageUtl_WriteDWord(
-      headerBigBlock,
-      OFFSET_EXTBBDEPOTSTART,
+      headerBigBlock, 
+      OFFSET_EXTBBDEPOTSTART,   
       This->extBigBlockDepotStart);
 
     StorageUtl_WriteDWord(
-      headerBigBlock,
-      OFFSET_EXTBBDEPOTCOUNT,
+      headerBigBlock, 
+      OFFSET_EXTBBDEPOTCOUNT,   
       This->extBigBlockDepotCount);
 
@@ -2980 +2991 @@
     {
       StorageUtl_WriteDWord(
-        headerBigBlock,
+        headerBigBlock, 
         OFFSET_BBDEPOTSTART + (sizeof(ULONG)*index),
         (This->bigBlockDepotStart[index]));
     }
   }
-
+  
   /*
    * Write the big block back to the file.
@@ -3009 +3020 @@
   offsetInPropSet.s.HighPart = 0;
   offsetInPropSet.s.LowPart  = index * PROPSET_BLOCK_SIZE;
-
+  
   readSuccessful = BlockChainStream_ReadAt(
                     This->rootBlockChain,
@@ -3016 +3027 @@
                     currentProperty,
                     &bytesRead);
-
+  
   if (readSuccessful)
   {
     memset(buffer->name, 0, sizeof(buffer->name));
     memcpy(
-      buffer->name,
-      currentProperty+OFFSET_PS_NAME,
+      buffer->name, 
+      currentProperty+OFFSET_PS_NAME, 
       PROPERTY_NAME_BUFFER_LEN );
 
     memcpy(&buffer->propertyType, currentProperty + OFFSET_PS_PROPERTYTYPE, 1);
-
+    
     StorageUtl_ReadWord(
-      currentProperty,
-      OFFSET_PS_NAMELENGTH,
+      currentProperty,  
+      OFFSET_PS_NAMELENGTH,  
       &buffer->sizeOfNameString);
 
     StorageUtl_ReadDWord(
-      currentProperty,
-      OFFSET_PS_PREVIOUSPROP,
+      currentProperty, 
+      OFFSET_PS_PREVIOUSPROP, 
       &buffer->previousProperty);
 
     StorageUtl_ReadDWord(
-      currentProperty,
-      OFFSET_PS_NEXTPROP,
+      currentProperty, 
+      OFFSET_PS_NEXTPROP,     
       &buffer->nextProperty);
 
     StorageUtl_ReadDWord(
-      currentProperty,
-      OFFSET_PS_DIRPROP,
+      currentProperty, 
+      OFFSET_PS_DIRPROP,      
       &buffer->dirProperty);
 
     StorageUtl_ReadGUID(
-      currentProperty,
-      OFFSET_PS_GUID,
+      currentProperty,  
+      OFFSET_PS_GUID,        
       &buffer->propertyUniqueID);
 
     StorageUtl_ReadDWord(
-      currentProperty,
-      OFFSET_PS_TSS1,
+      currentProperty, 
+      OFFSET_PS_TSS1,         
       &buffer->timeStampS1);
 
     StorageUtl_ReadDWord(
-      currentProperty,
-      OFFSET_PS_TSD1,
+      currentProperty, 
+      OFFSET_PS_TSD1,         
       &buffer->timeStampD1);
 
     StorageUtl_ReadDWord(
-      currentProperty,
-      OFFSET_PS_TSS2,
+      currentProperty, 
+      OFFSET_PS_TSS2,         
       &buffer->timeStampS2);
 
     StorageUtl_ReadDWord(
-      currentProperty,
-      OFFSET_PS_TSD2,
+      currentProperty, 
+      OFFSET_PS_TSD2,         
       &buffer->timeStampD2);
 
     StorageUtl_ReadDWord(
-      currentProperty,
-      OFFSET_PS_STARTBLOCK,
+      currentProperty, 
+      OFFSET_PS_STARTBLOCK,   
       &buffer->startingBlock);
 
     StorageUtl_ReadDWord(
-      currentProperty,
-      OFFSET_PS_SIZE,
+      currentProperty, 
+      OFFSET_PS_SIZE,         
       &buffer->size.s.LowPart);
 
@@ -3107 +3118 @@
 
   memcpy(
-    currentProperty + OFFSET_PS_NAME,
-    buffer->name,
+    currentProperty + OFFSET_PS_NAME, 
+    buffer->name, 
     PROPERTY_NAME_BUFFER_LEN );
 
@@ -3114 +3125 @@
 
   StorageUtl_WriteWord(
-    currentProperty,
-      OFFSET_PS_NAMELENGTH,
+    currentProperty,  
+      OFFSET_PS_NAMELENGTH,   
       buffer->sizeOfNameString);
 
   StorageUtl_WriteDWord(
-    currentProperty,
-      OFFSET_PS_PREVIOUSPROP,
+    currentProperty, 
+      OFFSET_PS_PREVIOUSPROP, 
       buffer->previousProperty);
 
   StorageUtl_WriteDWord(
-    currentProperty,
-      OFFSET_PS_NEXTPROP,
+    currentProperty, 
+      OFFSET_PS_NEXTPROP,     
       buffer->nextProperty);
 
   StorageUtl_WriteDWord(
-    currentProperty,
-      OFFSET_PS_DIRPROP,
+    currentProperty, 
+      OFFSET_PS_DIRPROP,      
       buffer->dirProperty);
 
   StorageUtl_WriteGUID(
-    currentProperty,
-      OFFSET_PS_GUID,
+    currentProperty,  
+      OFFSET_PS_GUID,        
       &buffer->propertyUniqueID);
 
   StorageUtl_WriteDWord(
-    currentProperty,
-      OFFSET_PS_TSS1,
+    currentProperty, 
+      OFFSET_PS_TSS1,         
       buffer->timeStampS1);
 
   StorageUtl_WriteDWord(
-    currentProperty,
-      OFFSET_PS_TSD1,
+    currentProperty, 
+      OFFSET_PS_TSD1,         
       buffer->timeStampD1);
 
   StorageUtl_WriteDWord(
-    currentProperty,
-      OFFSET_PS_TSS2,
+    currentProperty, 
+      OFFSET_PS_TSS2,         
       buffer->timeStampS2);
 
   StorageUtl_WriteDWord(
-    currentProperty,
-      OFFSET_PS_TSD2,
+    currentProperty, 
+      OFFSET_PS_TSD2,         
       buffer->timeStampD2);
 
   StorageUtl_WriteDWord(
-    currentProperty,
-      OFFSET_PS_STARTBLOCK,
+    currentProperty, 
+      OFFSET_PS_STARTBLOCK,   
       buffer->startingBlock);
 
   StorageUtl_WriteDWord(
-    currentProperty,
-      OFFSET_PS_SIZE,
+    currentProperty, 
+      OFFSET_PS_SIZE,         
       buffer->size.s.LowPart);
 
@@ -3211 +3222 @@
 
     StorageImpl_ReleaseBigBlock(This, bigBlockBuffer);
-
+    
     return TRUE;
   }
-
+  
   return FALSE;
 }
@@ -3344 +3355 @@
 
 StorageInternalImpl* StorageInternalImpl_Construct(
-  StorageImpl* ancestorStorage,
+  StorageImpl* ancestorStorage,  
   ULONG          rootPropertyIndex)
 {
@@ -3395 +3406 @@
 ** does nothing.
 */
-HRESULT WINAPI StorageInternalImpl_Commit(
+HRESULT WINAPI StorageInternalImpl_Commit( 
   IStorage*            iface,
-  DWORD                  grfCommitFlags)  /* [in] */
+  DWORD                  grfCommitFlags)  /* [in] */ 
 {
   return S_OK;
 }
-
+        
 /******************************************************************************
 **
@@ -3409 +3420 @@
 ** does nothing.
 */
-HRESULT WINAPI StorageInternalImpl_Revert(
+HRESULT WINAPI StorageInternalImpl_Revert( 
   IStorage*            iface)
 {
@@ -3426 +3437 @@
 
   newEnumeration = HeapAlloc(GetProcessHeap(), 0, sizeof(IEnumSTATSTGImpl));
-
+  
   if (newEnumeration!=0)
   {
@@ -3434 +3445 @@
     ICOM_VTBL(newEnumeration) = &IEnumSTATSTGImpl_Vtbl;
     newEnumeration->ref       = 0;
-
+    
     /*
      * We want to nail-down the reference to the storage in case the
@@ -3441 +3452 @@
     newEnumeration->parentStorage = parentStorage;
     IStorage_AddRef((IStorage*)newEnumeration->parentStorage);
-
+    
     newEnumeration->firstPropertyNode   = firstPropertyNode;
-
+    
     /*
      * Initialize the search stack
@@ -3449 +3460 @@
     newEnumeration->stackSize    = 0;
     newEnumeration->stackMaxSize = ENUMSTATSGT_SIZE_INCREMENT;
-    newEnumeration->stackToVisit =
+    newEnumeration->stackToVisit = 
       HeapAlloc(GetProcessHeap(), 0, sizeof(ULONG)*ENUMSTATSGT_SIZE_INCREMENT);
-
+    
     /*
      * Make sure the current node of the iterator is the first one.
@@ -3457 +3468 @@
     IEnumSTATSTGImpl_Reset((IEnumSTATSTG*)newEnumeration);
   }
-
+  
   return newEnumeration;
 }
@@ -3489 +3500 @@
    * Compare the riid with the interface IDs implemented by this object.
    */
-  if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0)
+  if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) 
   {
     *ppvObject = (IEnumSTATSTG*)This;
   }
-  else if (memcmp(&IID_IStorage, riid, sizeof(IID_IEnumSTATSTG)) == 0)
+  else if (memcmp(&IID_IStorage, riid, sizeof(IID_IEnumSTATSTG)) == 0) 
   {
     *ppvObject = (IEnumSTATSTG*)This;
@@ -3512 +3523 @@
   return S_OK;
 }
-
+        
 ULONG   WINAPI IEnumSTATSTGImpl_AddRef(
   IEnumSTATSTG* iface)
@@ -3521 +3532 @@
   return This->ref;
 }
-
+        
 ULONG   WINAPI IEnumSTATSTGImpl_Release(
   IEnumSTATSTG* iface)
@@ -3560 +3571 @@
    */
   if ( (rgelt==0) || ( (celt!=1) && (pceltFetched==0) ) )
-    return E_INVALIDARG;
-
+    return E_INVALIDARG;  
+  
   /*
    * To avoid the special case, get another pointer to a ULONG value if
@@ -3568 +3579 @@
   if (pceltFetched==0)
     pceltFetched = &objectFetched;
-
+  
   /*
    * Start the iteration, we will iterate until we hit the end of the
@@ -3580 +3591 @@
   currentSearchNode = IEnumSTATSTGImpl_PopSearchNode(This, FALSE);
 
-  while ( ( *pceltFetched < celt) &&
+  while ( ( *pceltFetched < celt) && 
           ( currentSearchNode!=PROPERTY_NULL) )
   {
-    /*
+    /* 
      * Remove the top node from the stack
      */
@@ -3592 +3603 @@
      */
     StorageImpl_ReadProperty(This->parentStorage,
-      currentSearchNode,
+      currentSearchNode, 
       &currentProperty);
 
@@ -3601 +3612 @@
       &currentProperty,
       STATFLAG_DEFAULT);
-
+        
     /*
      * Step to the next item in the iteration
@@ -3625 +3636 @@
 }
 
-
+        
 HRESULT WINAPI IEnumSTATSTGImpl_Skip(
   IEnumSTATSTG* iface,
@@ -3641 +3652 @@
   currentSearchNode = IEnumSTATSTGImpl_PopSearchNode(This, FALSE);
 
-  while ( (objectFetched < celt) &&
+  while ( (objectFetched < celt) && 
           (currentSearchNode!=PROPERTY_NULL) )
   {
-    /*
+    /* 
      * Remove the top node from the stack
      */
@@ -3653 +3664 @@
      */
     StorageImpl_ReadProperty(This->parentStorage,
-      currentSearchNode,
+      currentSearchNode, 
       &currentProperty);
-
+    
     /*
      * Step to the next item in the iteration
@@ -3677 +3688 @@
   return S_FALSE;
 }
-
+        
 HRESULT WINAPI IEnumSTATSTGImpl_Reset(
   IEnumSTATSTG* iface)
@@ -3696 +3707 @@
   readSuccessful = StorageImpl_ReadProperty(
                     This->parentStorage,
-                    This->firstPropertyNode,
+                    This->firstPropertyNode, 
                     &rootProperty);
 
@@ -3711 +3722 @@
   return S_OK;
 }
-
+        
 HRESULT WINAPI IEnumSTATSTGImpl_Clone(
   IEnumSTATSTG* iface,
@@ -3725 +3736 @@
   if (ppenum==0)
     return E_INVALIDARG;
-
+  
   newClone = IEnumSTATSTGImpl_Construct(This->parentStorage,
                This->firstPropertyNode);
 
-
+  
   /*
    * The new clone enumeration must point to the same current node as
@@ -3736 +3747 @@
   newClone->stackSize    = This->stackSize    ;
   newClone->stackMaxSize = This->stackMaxSize ;
-  newClone->stackToVisit =
+  newClone->stackToVisit = 
     HeapAlloc(GetProcessHeap(), 0, sizeof(ULONG) * newClone->stackMaxSize);
 
   memcpy(
-    newClone->stackToVisit,
-    This->stackToVisit,
+    newClone->stackToVisit, 
+    This->stackToVisit, 
     sizeof(ULONG) * newClone->stackSize);
 
@@ -3757 +3768 @@
 INT IEnumSTATSTGImpl_FindParentProperty(
   IEnumSTATSTGImpl *This,
-  ULONG             childProperty,
+  ULONG             childProperty, 
   StgProperty      *currentProperty,
   ULONG            *thisNodeId)
@@ -3775 +3786 @@
    */
   currentSearchNode = IEnumSTATSTGImpl_PopSearchNode(This, FALSE);
-
+  
 
   while (currentSearchNode!=PROPERTY_NULL)
@@ -3784 +3795 @@
     *thisNodeId = currentSearchNode;
 
-    /*
+    /* 
      * Remove the top node from the stack
      */
@@ -3794 +3805 @@
     StorageImpl_ReadProperty(
       This->parentStorage,
-      currentSearchNode,
+      currentSearchNode, 
       currentProperty);
-
+      
     if (currentProperty->previousProperty == childProperty)
       return PROPERTY_RELATION_PREVIOUS;
 
-    else if (currentProperty->nextProperty == childProperty)
+    else if (currentProperty->nextProperty == childProperty)  
       return PROPERTY_RELATION_NEXT;
-
+  
     else if (currentProperty->dirProperty == childProperty)
       return PROPERTY_RELATION_DIR;
-
+       
     /*
      * Push the next search node in the search stack.
@@ -3834 +3845 @@
   while (currentSearchNode!=PROPERTY_NULL)
   {
-    /*
+    /* 
      * Remove the top node from the stack
      */
@@ -3843 +3854 @@
      */
     StorageImpl_ReadProperty(This->parentStorage,
-      currentSearchNode,
+      currentSearchNode, 
       currentProperty);
 
     if ( propertyNameCmp(
-          (OLECHAR*)currentProperty->name,
+          (OLECHAR*)currentProperty->name, 
           (OLECHAR*)lpszPropName) == 0)
       return currentSearchNode;
@@ -3886 +3897 @@
 
     This->stackToVisit = HeapReAlloc(
-                           GetProcessHeap(),
+                           GetProcessHeap(), 
                            0,
                            This->stackToVisit,
@@ -3900 +3911 @@
   readSuccessful = StorageImpl_ReadProperty(
                     This->parentStorage,
-                    nodeToPush,
+                    nodeToPush, 
                     &rootProperty);
 
@@ -3987 +3998 @@
   else
   {
-    destination->pwcsName =
+    destination->pwcsName = 
       CoTaskMemAlloc((lstrlenW(source->name)+1)*sizeof(WCHAR));
 
     strcpyW((LPWSTR)destination->pwcsName, source->name);
   }
-
+  
   switch (source->propertyType)
   {
@@ -4004 +4015 @@
     default:
       destination->type = STGTY_STREAM;
-      break;
+      break;        
   }
 
   destination->cbSize            = source->size;
-/*
+/*    
   currentReturnStruct->mtime     = {0}; TODO
   currentReturnStruct->ctime     = {0};
-  currentReturnStruct->atime     = {0};
+  currentReturnStruct->atime     = {0}; 
 */
   destination->grfMode           = 0;
-  destination->grfLocksSupported = 0;
+  destination->grfLocksSupported = 0; 
   destination->clsid             = source->propertyUniqueID;
-  destination->grfStateBits      = 0;
-  destination->reserved          = 0;
+  destination->grfStateBits      = 0; 
+  destination->reserved          = 0; 
 }
 
@@ -4025 +4036 @@
 
 BlockChainStream* BlockChainStream_Construct(
-  StorageImpl* parentStorage,
+  StorageImpl* parentStorage,  
   ULONG*         headOfStreamPlaceHolder,
   ULONG          propertyIndex)
@@ -4098 +4109 @@
  * Returns the number of blocks that comprises this chain.
  * This is not the size of the stream as the last block may not be full!
- *
+ * 
  */
 ULONG BlockChainStream_GetCount(BlockChainStream* This)
@@ -4112 +4123 @@
 
     blockIndex = StorageImpl_GetNextBlockInChain(
-                   This->parentStorage,
+                   This->parentStorage, 
                    blockIndex);
   }
@@ -4120 +4131 @@
 
 /******************************************************************************
- *      BlockChainStream_ReadAt
+ *      BlockChainStream_ReadAt 
  *
  * Reads a specified number of bytes from this chain at the specified offset.
@@ -4160 +4171 @@
   while ( (blockNoInSequence > 0) &&  (blockIndex != BLOCK_END_OF_CHAIN))
   {
-    blockIndex =
+    blockIndex = 
       StorageImpl_GetNextBlockInChain(This->parentStorage, blockIndex);
-
+    
     blockNoInSequence--;
   }
@@ -4173 +4184 @@
   *bytesRead   = 0;
   bufferWalker = buffer;
-
+  
   while ( (size > 0) && (blockIndex != BLOCK_END_OF_CHAIN) )
   {
@@ -4179 +4190 @@
      * Calculate how many bytes we can copy from this big block.
      */
-    bytesToReadInBuffer =
+    bytesToReadInBuffer = 
       min(This->parentStorage->bigBlockSize - offsetInBlock, size);
-
+    
     /*
      * Copy those bytes to the buffer
      */
-    bigBlockBuffer =
+    bigBlockBuffer = 
       StorageImpl_GetROBigBlock(This->parentStorage, blockIndex);
-
+    
     memcpy(bufferWalker, bigBlockBuffer + offsetInBlock, bytesToReadInBuffer);
-
+    
     StorageImpl_ReleaseBigBlock(This->parentStorage, bigBlockBuffer);
-
+    
     /*
      * Step to the next big block.
      */
-    blockIndex    =
+    blockIndex    = 
       StorageImpl_GetNextBlockInChain(This->parentStorage, blockIndex);
 
@@ -4204 +4215 @@
 
   }
-
+  
   return (size == 0);
 }
@@ -4249 +4260 @@
   while ( (blockNoInSequence > 0) &&  (blockIndex != BLOCK_END_OF_CHAIN))
   {
-    blockIndex =
+    blockIndex = 
       StorageImpl_GetNextBlockInChain(This->parentStorage, blockIndex);
-
+    
     blockNoInSequence--;
   }
@@ -4269 +4280 @@
      * Calculate how many bytes we can copy from this big block.
      */
-    bytesToWrite =
+    bytesToWrite = 
       min(This->parentStorage->bigBlockSize - offsetInBlock, size);
-
+    
     /*
      * Copy those bytes to the buffer
      */
     bigBlockBuffer = StorageImpl_GetBigBlock(This->parentStorage, blockIndex);
-
+    
     memcpy(bigBlockBuffer + offsetInBlock, bufferWalker, bytesToWrite);
-
+    
     StorageImpl_ReleaseBigBlock(This->parentStorage, bigBlockBuffer);
-
+    
     /*
      * Step to the next big block.
      */
-    blockIndex    =
+    blockIndex    = 
       StorageImpl_GetNextBlockInChain(This->parentStorage, blockIndex);
 
@@ -4292 +4303 @@
     offsetInBlock  = 0;      /* There is no offset on the next block */
   }
-
+  
   return (size == 0);
 }
@@ -4329 +4340 @@
   while (count < numBlocks)
   {
-    blockIndex =
+    blockIndex = 
       StorageImpl_GetNextBlockInChain(This->parentStorage, blockIndex);
 
@@ -4336 +4347 @@
 
   /* Get the next block before marking the new end */
-  extraBlock =
+  extraBlock = 
     StorageImpl_GetNextBlockInChain(This->parentStorage, blockIndex);
 
   /* Mark the new end of chain */
   StorageImpl_SetNextBlockInChain(
-    This->parentStorage,
-    blockIndex,
+    This->parentStorage, 
+    blockIndex, 
     BLOCK_END_OF_CHAIN);
 
@@ -4353 +4364 @@
   while (extraBlock != BLOCK_END_OF_CHAIN)
   {
-    blockIndex =
+    blockIndex = 
       StorageImpl_GetNextBlockInChain(This->parentStorage, extraBlock);
 
@@ -4397 +4408 @@
 
       StorageImpl_ReadProperty(
-        This->parentStorage,
+        This->parentStorage, 
         This->ownerPropertyIndex,
         &chainProp);
 
-      chainProp.startingBlock = blockIndex;
+      chainProp.startingBlock = blockIndex; 
 
       StorageImpl_WriteProperty(
-        This->parentStorage,
+        This->parentStorage, 
         This->ownerPropertyIndex,
         &chainProp);
@@ -4453 +4464 @@
 
       StorageImpl_SetNextBlockInChain(
-    This->parentStorage,
-    currentBlock,
-    blockIndex);
+        This->parentStorage, 
+        currentBlock, 
+        blockIndex);
 
       StorageImpl_SetNextBlockInChain(
-        This->parentStorage,
-    blockIndex,
-    BLOCK_END_OF_CHAIN);
+        This->parentStorage, 
+        blockIndex, 
+        BLOCK_END_OF_CHAIN);
 
       currentBlock = blockIndex;
@@ -4481 +4492 @@
  * TODO: Free the actual blocks in the file when we shrink the chain.
  *       Currently, the blocks are still in the file. So the file size
- *       doesn't shrink even if we shrink streams.
+ *       doesn't shrink even if we shrink streams. 
  */
 BOOL BlockChainStream_SetSize(
@@ -4498 +4509 @@
   else
   {
-    ULARGE_INTEGER fileSize =
+    ULARGE_INTEGER fileSize = 
       BIGBLOCKFILE_GetSize(This->parentStorage->bigBlockFile);
 
@@ -4507 +4518 @@
      */
     if ((diff % This->parentStorage->bigBlockSize) != 0)
-      diff += (This->parentStorage->bigBlockSize -
+      diff += (This->parentStorage->bigBlockSize - 
                 (diff % This->parentStorage->bigBlockSize) );
 
@@ -4531 +4542 @@
   if(This->headOfStreamPlaceHolder == NULL)
   {
-    /*
-     * This chain is a data stream read the property and return
+    /* 
+     * This chain is a data stream read the property and return 
      * the appropriate size
      */
@@ -4545 +4556 @@
   {
     /*
-     * this chain is a chain that does not have a property, figure out the
-     * size by making the product number of used blocks times the
+     * this chain is a chain that does not have a property, figure out the 
+     * size by making the product number of used blocks times the 
      * size of them
      */
@@ -4552 +4563 @@
     result.s.HighPart = 0;
 
-    result.s.LowPart  =
-      BlockChainStream_GetCount(This) *
+    result.s.LowPart  = 
+      BlockChainStream_GetCount(This) * 
       This->parentStorage->bigBlockSize;
 
@@ -4565 +4576 @@
 
 SmallBlockChainStream* SmallBlockChainStream_Construct(
-  StorageImpl* parentStorage,
+  StorageImpl* parentStorage,  
   ULONG          propertyIndex)
 {
@@ -4616 +4627 @@
  *
  * Returns the index of the next small block in this chain.
- *
+ * 
  * Return Values:
  *    - BLOCK_END_OF_CHAIN: end of this chain
@@ -4743 +4754 @@
     else
     {
-      ULONG count =
+      ULONG count = 
         BlockChainStream_GetCount(This->parentStorage->smallBlockDepotChain);
 
@@ -4754 +4765 @@
       {
         sbdIndex = nextBlock;
-        nextBlock =
+        nextBlock = 
           StorageImpl_GetNextBlockInChain(This->parentStorage, sbdIndex);
       }
@@ -4761 +4772 @@
       if (sbdIndex != BLOCK_END_OF_CHAIN)
         StorageImpl_SetNextBlockInChain(
-          This->parentStorage,
-          sbdIndex,
+          This->parentStorage, 
+          sbdIndex, 
           newsbdIndex);
 
       StorageImpl_SetNextBlockInChain(
-        This->parentStorage,
-        newsbdIndex,
+        This->parentStorage, 
+        newsbdIndex, 
         BLOCK_END_OF_CHAIN);
 
@@ -4773 +4784 @@
        * Initialize all the small blocks to free
        */
-      smallBlockDepot =
+      smallBlockDepot = 
         StorageImpl_GetBigBlock(This->parentStorage, newsbdIndex);
 
@@ -4785 +4796 @@
          */
         StgProperty rootProp;
-        ULONG sbStartIndex;
+        ULONG sbStartIndex; 
 
         /*
@@ -4794 +4805 @@
 
         /*
-         * And allocate the first big block that will contain small blocks
+         * And allocate the first big block that will contain small blocks 
          */
-        sbStartIndex =
+        sbStartIndex = 
           StorageImpl_GetNextFreeBigBlock(This->parentStorage);
 
         StorageImpl_SetNextBlockInChain(
-          This->parentStorage,
-          sbStartIndex,
+          This->parentStorage, 
+          sbStartIndex, 
           BLOCK_END_OF_CHAIN);
 
         StorageImpl_ReadProperty(
-          This->parentStorage,
-          This->parentStorage->rootPropertySetIndex,
+          This->parentStorage, 
+          This->parentStorage->rootPropertySetIndex, 
           &rootProp);
 
@@ -4814 +4825 @@
 
         StorageImpl_WriteProperty(
-          This->parentStorage,
-          This->parentStorage->rootPropertySetIndex,
+          This->parentStorage, 
+          This->parentStorage->rootPropertySetIndex, 
           &rootProp);
       }
@@ -4821 +4832 @@
   }
 
-  smallBlocksPerBigBlock =
+  smallBlocksPerBigBlock = 
     This->parentStorage->bigBlockSize / This->parentStorage->smallBlockSize;
 
@@ -4833 +4844 @@
 
     StorageImpl_ReadProperty(
-      This->parentStorage,
-      This->parentStorage->rootPropertySetIndex,
+      This->parentStorage, 
+      This->parentStorage->rootPropertySetIndex, 
       &rootProp);
 
-    if (rootProp.size.s.LowPart <
+    if (rootProp.size.s.LowPart < 
        (blocksRequired * This->parentStorage->bigBlockSize))
     {
@@ -4843 +4854 @@
 
       BlockChainStream_SetSize(
-        This->parentStorage->smallBlockRootChain,
+        This->parentStorage->smallBlockRootChain, 
         rootProp.size);
 
       StorageImpl_WriteProperty(
-        This->parentStorage,
-        This->parentStorage->rootPropertySetIndex,
+        This->parentStorage, 
+        This->parentStorage->rootPropertySetIndex, 
         &rootProp);
     }
@@ -4861 +4872 @@
  * Reads a specified number of bytes from this chain at the specified offset.
  * bytesRead may be NULL.
- * Failure will be returned if the specified number of bytes has not been read.
+ * Failure will be returned if the specified number of bytes has not been read. 
  */
 BOOL SmallBlockChainStream_ReadAt(
@@ -4871 +4882 @@
 {
   ULARGE_INTEGER offsetInBigBlockFile;
-  ULONG blockNoInSequence =
+  ULONG blockNoInSequence = 
     offset.s.LowPart / This->parentStorage->smallBlockSize;
 
@@ -4908 +4919 @@
      * Calculate how many bytes we can copy from this small block.
      */
-    bytesToReadInBuffer =
+    bytesToReadInBuffer = 
       min(This->parentStorage->smallBlockSize - offsetInBlock, size);
 
@@ -4915 +4926 @@
      */
     offsetInBigBlockFile.s.HighPart  = 0;
-    offsetInBigBlockFile.s.LowPart   =
+    offsetInBigBlockFile.s.LowPart   = 
       blockIndex * This->parentStorage->smallBlockSize;
 
@@ -4959 +4970 @@
 {
   ULARGE_INTEGER offsetInBigBlockFile;
-  ULONG blockNoInSequence =
+  ULONG blockNoInSequence = 
     offset.s.LowPart / This->parentStorage->smallBlockSize;
 
@@ -4967 +4978 @@
   ULONG bytesWrittenFromBigBlockFile;
   BYTE* bufferWalker;
-
+  
   /*
    * This should never happen on a small block file.
    */
   assert(offset.s.HighPart==0);
-
+  
   /*
    * Find the first block in the stream that contains part of the buffer.
    */
   blockIndex = SmallBlockChainStream_GetHeadOfChain(This);
-
+  
   while ( (blockNoInSequence > 0) &&  (blockIndex != BLOCK_END_OF_CHAIN))
   {
     blockIndex = SmallBlockChainStream_GetNextBlockInChain(This, blockIndex);
-
+    
     blockNoInSequence--;
   }
-
+  
   /*
    * Start writing the buffer.
@@ -4998 +5009 @@
      * Calculate how many bytes we can copy to this small block.
      */
-    bytesToWriteInBuffer =
+    bytesToWriteInBuffer = 
       min(This->parentStorage->smallBlockSize - offsetInBlock, size);
-
+    
     /*
      * Calculate the offset of the small block in the small block file.
      */
     offsetInBigBlockFile.s.HighPart  = 0;
-    offsetInBigBlockFile.s.LowPart   =
+    offsetInBigBlockFile.s.LowPart   = 
       blockIndex * This->parentStorage->smallBlockSize;
 
     offsetInBigBlockFile.s.LowPart  += offsetInBlock;
-
+    
     /*
      * Write those bytes in the buffer to the small block file.
@@ -5018 +5029 @@
       bufferWalker,
       &bytesWrittenFromBigBlockFile);
-
+    
     assert(bytesWrittenFromBigBlockFile == bytesToWriteInBuffer);
-
+    
     /*
      * Step to the next big block.
@@ -5030 +5041 @@
     offsetInBlock  = 0;     /* There is no offset on the next block */
   }
-
+  
   return (size == 0);
 }
@@ -5037 +5048 @@
  *       SmallBlockChainStream_Shrink
  *
- * Shrinks this chain in the small block depot.
+ * Shrinks this chain in the small block depot. 
  */
 BOOL SmallBlockChainStream_Shrink(
@@ -5065 +5076 @@
   /*
    * If the count is 0, we have a special case, the head of the chain was
-   * just freed.
+   * just freed. 
    */
   if (count == 0)
@@ -5071 +5082 @@
     StgProperty chainProp;
 
-    StorageImpl_ReadProperty(This->parentStorage,
-                 This->ownerPropertyIndex,
-                 &chainProp);
+    StorageImpl_ReadProperty(This->parentStorage, 
+                             This->ownerPropertyIndex,
+                             &chainProp);
 
     chainProp.startingBlock = BLOCK_END_OF_CHAIN;
 
     StorageImpl_WriteProperty(This->parentStorage,
-                  This->ownerPropertyIndex,
-                  &chainProp);
+                              This->ownerPropertyIndex,
+                              &chainProp);
 
     /*
@@ -5093 +5104 @@
     /* Mark the new end of chain */
     SmallBlockChainStream_SetNextBlockInChain(
-      This,
-      blockIndex,
+      This, 
+      blockIndex, 
       BLOCK_END_OF_CHAIN);
   }
@@ -5108 +5119 @@
   }
 
-  return TRUE;
+  return TRUE;  
 }
 
@@ -5144 +5155 @@
     blockIndex = chainProp.startingBlock;
     SmallBlockChainStream_SetNextBlockInChain(
-      This,
-      blockIndex,
+      This, 
+      blockIndex, 
       BLOCK_END_OF_CHAIN);
   }
@@ -5178 +5189 @@
 
     SmallBlockChainStream_SetNextBlockInChain(
-      This,
-      blockIndex,
+      This, 
+      blockIndex, 
       BLOCK_END_OF_CHAIN);
 
@@ -5220 +5231 @@
  * TODO: Free the actual blocks in the file when we shrink the chain.
  *       Currently, the blocks are still in the file. So the file size
- *       doesn't shrink even if we shrink streams.
+ *       doesn't shrink even if we shrink streams. 
  */
 BOOL SmallBlockChainStream_SetSize(
@@ -5278 +5289 @@
   WCHAR          tempFileName[MAX_PATH];
 
-  TRACE("(%s, %lx, %ld, %p)\n",
-    debugstr_w(pwcsName), grfMode,
-    reserved, ppstgOpen);
+  TRACE("(%s, %lx, %ld, %p)\n", 
+        debugstr_w(pwcsName), grfMode, 
+        reserved, ppstgOpen);
 
   /*
@@ -5326 +5337 @@
 
   /*
-   * Interpret the STGM value grfMode
+   * Interpret the STGM value grfMode 
    */
   shareMode    = GetShareModeFromSTGM(grfMode);
@@ -5351 +5362 @@
                         fileAttributes,
             0);
-
+ 
   if (hFile == INVALID_HANDLE_VALUE)
   {
@@ -5361 +5372 @@
    */
   newStorage = HeapAlloc(GetProcessHeap(), 0, sizeof(StorageImpl));
-
+ 
   if (newStorage == 0)
     return STG_E_INSUFFICIENTMEMORY;
@@ -5372 +5383 @@
          TRUE,
          TRUE);
-
+ 
   if (FAILED(hr))
   {
@@ -5398 +5409 @@
   DWORD           grfMode,
   SNB           snbExclude,
-  DWORD           reserved,
+  DWORD           reserved, 
   IStorage      **ppstgOpen)
 {
@@ -5407 +5418 @@
   DWORD          accessMode;
 
-  TRACE("(%s, %p, %lx, %p, %ld, %p)\n",
-    debugstr_w(pwcsName), pstgPriority, grfMode,
-    snbExclude, reserved, ppstgOpen);
+  TRACE("(%s, %p, %lx, %p, %ld, %p)\n", 
+        debugstr_w(pwcsName), pstgPriority, grfMode,
+        snbExclude, reserved, ppstgOpen);
 
   /*
@@ -5433 +5444 @@
    */
   *ppstgOpen = 0;
-
-  hFile = CreateFileW( pwcsName,
+  
+  hFile = CreateFileW( pwcsName, 
                        accessMode,
                        shareMode,
@@ -5441 +5452 @@
                        FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS,
                        0);
-
-
+  
+  
   if (hFile==INVALID_HANDLE_VALUE)
   {
@@ -5478 +5489 @@
    */
   newStorage = HeapAlloc(GetProcessHeap(), 0, sizeof(StorageImpl));
-
+  
   if (newStorage == 0)
     return STG_E_INSUFFICIENTMEMORY;
@@ -5489 +5500 @@
          TRUE,
          FALSE);
-
+  
   if (FAILED(hr))
   {
@@ -5497 +5508 @@
      */
     if(hr == STG_E_INVALIDHEADER)
-    return STG_E_FILEALREADYEXISTS;
+        return STG_E_FILEALREADYEXISTS;
     return hr;
   }
-
+  
   /*
    * Get an "out" pointer for the caller.
@@ -5508 +5519 @@
          (REFIID)&IID_IStorage,
          (void**)ppstgOpen);
-
+  
   return hr;
 }
@@ -5560 +5571 @@
          (void**)ppstgOpen);
 
-  return hr;
+  return hr;  
 }
 
@@ -5598 +5609 @@
    */
   newStorage = HeapAlloc(GetProcessHeap(), 0, sizeof(StorageImpl));
-
+ 
   if (newStorage == 0)
     return STG_E_INSUFFICIENTMEMORY;
@@ -5634 +5645 @@
 HRESULT WINAPI StgSetTimes(WCHAR * str, FILETIME * a, FILETIME * b, FILETIME *c )
 {
-
+ 
   FIXME("(%p, %p, %p, %p),stub!\n", str, a, b, c);
   return FALSE;
@@ -5685 +5696 @@
     STATSTG pstatstg;
     HRESULT hRes;
-
+    
     TRACE("()\n");
 
@@ -5708 +5719 @@
 HRESULT  WINAPI OleLoadFromStream(IStream *pStm,REFIID iidInterface,void** ppvObj)
 {
-    CLSID   clsid;
-    HRESULT res;
-    LPPERSISTSTREAM xstm;
+    CLSID       clsid;
+    HRESULT     res;
+    LPPERSISTSTREAM     xstm;
 
     TRACE("(%p,%s,%p)\n",pStm,debugstr_guid(iidInterface),ppvObj);
@@ -5716 +5727 @@
     res=ReadClassStm(pStm,&clsid);
     if (!SUCCEEDED(res))
-    return res;
+        return res;
     res=CoCreateInstance(&clsid,NULL,CLSCTX_INPROC_SERVER,iidInterface,ppvObj);
     if (!SUCCEEDED(res))
-    return res;
+        return res;
     res=IUnknown_QueryInterface((IUnknown*)*ppvObj,&IID_IPersistStream,(LPVOID*)&xstm);
     if (!SUCCEEDED(res)) {
-    IUnknown_Release((IUnknown*)*ppvObj);
-    return res;
+        IUnknown_Release((IUnknown*)*ppvObj);
+        return res;
     }
     res=IPersistStream_Load(xstm,pStm);
     IPersistStream_Release(xstm);
     /* FIXME: all refcounts ok at this point? I think they should be:
-     *      pStm    : unchanged
-     *      ppvObj  : 1
-     *      xstm    : 0 (released)
+     *          pStm    : unchanged
+     *          ppvObj  : 1
+     *          xstm    : 0 (released)
      */
     return res;
@@ -5746 +5757 @@
     CLSID clsid;
     HRESULT res;
-
+    
     TRACE("(%p,%p)\n",pPStm,pStm);
 
@@ -5752 +5763 @@
 
     if (SUCCEEDED(res)){
-
+        
         res=WriteClassStm(pStm,&clsid);
 
@@ -5770 +5781 @@
  * STGM_TRANSACTED           0x00010000
  * STGM_SIMPLE               0x08000000
- *
+ * 
  * STGM_READ                 0x00000000
  * STGM_WRITE                0x00000001
  * STGM_READWRITE            0x00000002
- *
+ * 
  * STGM_SHARE_DENY_NONE      0x00000040
  * STGM_SHARE_DENY_READ      0x00000030
  * STGM_SHARE_DENY_WRITE     0x00000020
  * STGM_SHARE_EXCLUSIVE      0x00000010
- *
+ * 
  * STGM_PRIORITY             0x00040000
  * STGM_DELETEONRELEASE      0x04000000
@@ -5795 +5806 @@
   BOOL bSTGM_SIMPLE           = ((stgm & STGM_SIMPLE) == STGM_SIMPLE);
   BOOL bSTGM_DIRECT           = ! (bSTGM_TRANSACTED || bSTGM_SIMPLE);
-
+   
   BOOL bSTGM_WRITE            = ((stgm & STGM_WRITE) == STGM_WRITE);
   BOOL bSTGM_READWRITE        = ((stgm & STGM_READWRITE) == STGM_READWRITE);
   BOOL bSTGM_READ             = ! (bSTGM_WRITE || bSTGM_READWRITE);
-
+   
   BOOL bSTGM_SHARE_DENY_NONE  =
                      ((stgm & STGM_SHARE_DENY_NONE)  == STGM_SHARE_DENY_NONE);
@@ -5814 +5825 @@
   BOOL bSTGM_CREATE           = ((stgm & STGM_CREATE) == STGM_CREATE);
   BOOL bSTGM_CONVERT          = ((stgm & STGM_CONVERT) == STGM_CONVERT);
-
+   
   BOOL bSTGM_NOSCRATCH        = ((stgm & STGM_NOSCRATCH) == STGM_NOSCRATCH);
   BOOL bSTGM_NOSNAPSHOT       = ((stgm & STGM_NOSNAPSHOT) == STGM_NOSNAPSHOT);
 
-  /*
+  /* 
    * STGM_DIRECT | STGM_TRANSACTED | STGM_SIMPLE
    */
@@ -5825 +5836 @@
       return E_FAIL;
 
-  /*
+  /* 
    * STGM_WRITE |  STGM_READWRITE | STGM_READ
    */
@@ -5833 +5844 @@
 
   /*
-   * STGM_SHARE_DENY_NONE | others
+   * STGM_SHARE_DENY_NONE | others 
    * (I assume here that DENY_READ implies DENY_WRITE)
    */
   if ( bSTGM_SHARE_DENY_NONE )
     if ( bSTGM_SHARE_DENY_READ ||
-         bSTGM_SHARE_DENY_WRITE ||
-         bSTGM_SHARE_EXCLUSIVE)
+         bSTGM_SHARE_DENY_WRITE || 
+         bSTGM_SHARE_EXCLUSIVE) 
       return E_FAIL;
 
@@ -5854 +5865 @@
   if ( bSTGM_NOSCRATCH && ! bSTGM_TRANSACTED )
     return E_FAIL;
-
-  /*
-   * STGM_NOSNAPSHOT requires STGM_TRANSACTED and
+  
+  /*
+   * STGM_NOSNAPSHOT requires STGM_TRANSACTED and 
    * not STGM_SHARE_EXCLUSIVE or STGM_SHARE_DENY_WRITE`
    */
   if (bSTGM_NOSNAPSHOT)
   {
-    if ( ! ( bSTGM_TRANSACTED &&
+    if ( ! ( bSTGM_TRANSACTED && 
            !(bSTGM_SHARE_EXCLUSIVE || bSTGM_SHARE_DENY_WRITE)) )
     return E_FAIL;
@@ -5873 +5884 @@
  *
  * This method will return a share mode flag from a STGM value.
- * The STGM value is assumed valid.
+ * The STGM value is assumed valid. 
  */
 static DWORD GetShareModeFromSTGM(DWORD stgm)
@@ -5943 +5954 @@
   /* All other cases */
   if (stgm & ~ (STGM_CREATE|STGM_CONVERT))
-    FIXME("unhandled storage mode : 0x%08lx\n",stgm & ~ (STGM_CREATE|STGM_CONVERT));
+        FIXME("unhandled storage mode : 0x%08lx\n",stgm & ~ (STGM_CREATE|STGM_CONVERT));
   return CREATE_NEW;
 }
@@ -5949 +5960 @@
 
 /*************************************************************************
- * OLECONVERT_LoadOLE10 [Internal]
- *
- * Loads the OLE10 STREAM to memory
+ * OLECONVERT_LoadOLE10 [Internal] 
+ *
+ * Loads the OLE10 STREAM to memory 
  *
  * PARAMS
@@ -5964 +5975 @@
  * NOTES
  *     This function is used by OleConvertOLESTREAMToIStorage only.
- *
+ *     
  *     Memory allocated for pData must be freed by the caller
  */
 HRESULT OLECONVERT_LoadOLE10(LPOLESTREAM pOleStream, OLECONVERT_OLESTREAM_DATA *pData, BOOL bStrem1)
 {
-    DWORD dwSize;
-    HRESULT hRes = S_OK;
-    int nTryCnt=0;
-    int max_try = 6;
-
-    pData->pData = NULL;
-    pData->pstrOleObjFileName = (CHAR *) NULL;
-
-    for( nTryCnt=0;nTryCnt < max_try; nTryCnt++)
-    {
-    /* Get the OleID */
-    dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)&(pData->dwOleID), sizeof(pData->dwOleID));
-    if(dwSize != sizeof(pData->dwOleID))
-    {
-        hRes = CONVERT10_E_OLESTREAM_GET;
-    }
-    else if(pData->dwOleID != OLESTREAM_ID)
-    {
-        hRes = CONVERT10_E_OLESTREAM_FMT;
-    }
-        else
-        {
-            hRes = S_OK;
-            break;
-        }
-    }
-
-    if(hRes == S_OK)
-    {
-        /* Get the TypeID...more info needed for this field */
-        dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)&(pData->dwTypeID), sizeof(pData->dwTypeID));
-        if(dwSize != sizeof(pData->dwTypeID))
-        {
-            hRes = CONVERT10_E_OLESTREAM_GET;
-        }
-    }
-    if(hRes == S_OK)
-    {
-        if(pData->dwTypeID != 0)
-        {
-            /* Get the lenght of the OleTypeName */
-            dwSize = pOleStream->lpstbl->Get(pOleStream, (void *) &(pData->dwOleTypeNameLength), sizeof(pData->dwOleTypeNameLength));
-            if(dwSize != sizeof(pData->dwOleTypeNameLength))
-            {
-                hRes = CONVERT10_E_OLESTREAM_GET;
-            }
-
-            if(hRes == S_OK)
-            {
-                if(pData->dwOleTypeNameLength > 0)
-                {
-                    /* Get the OleTypeName */
-                    dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)pData->strOleTypeName, pData->dwOleTypeNameLength);
-                    if(dwSize != pData->dwOleTypeNameLength)
-                    {
-                        hRes = CONVERT10_E_OLESTREAM_GET;
-                    }
-                }
-            }
-            if(bStrem1)
-            {
-                dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)&(pData->dwOleObjFileNameLength), sizeof(pData->dwOleObjFileNameLength));
-                if(dwSize != sizeof(pData->dwOleObjFileNameLength))
-                {
-                    hRes = CONVERT10_E_OLESTREAM_GET;
-                }
-            if(hRes == S_OK)
-            {
-                    if(pData->dwOleObjFileNameLength < 1) /* there is no file name exist */
-                        pData->dwOleObjFileNameLength = sizeof(pData->dwOleObjFileNameLength);
-                    pData->pstrOleObjFileName = (CHAR *)malloc(pData->dwOleObjFileNameLength);
-                    if(pData->pstrOleObjFileName)
-                    {
-                        dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)(pData->pstrOleObjFileName),pData->dwOleObjFileNameLength);
-                        if(dwSize != pData->dwOleObjFileNameLength)
-                        {
-                            hRes = CONVERT10_E_OLESTREAM_GET;
-                        }
-                    }
-                    else
-                        hRes = CONVERT10_E_OLESTREAM_GET;
-                }
-            }
-            else
-            {
-                /* Get the Width of the Metafile */
-                dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)&(pData->dwMetaFileWidth), sizeof(pData->dwMetaFileWidth));
-                if(dwSize != sizeof(pData->dwMetaFileWidth))
-                {
-                    hRes = CONVERT10_E_OLESTREAM_GET;
-                }
-            if(hRes == S_OK)
-            {
-                /* Get the Height of the Metafile */
-                dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)&(pData->dwMetaFileHeight), sizeof(pData->dwMetaFileHeight));
-                if(dwSize != sizeof(pData->dwMetaFileHeight))
-                {
-                    hRes = CONVERT10_E_OLESTREAM_GET;
-                }
-            }
-            }
-            if(hRes == S_OK)
-            {
-                /* Get the Lenght of the Data */
-                dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)&(pData->dwDataLength), sizeof(pData->dwDataLength));
-                if(dwSize != sizeof(pData->dwDataLength))
-                {
-                    hRes = CONVERT10_E_OLESTREAM_GET;
-                }
-            }
-
-            if(hRes == S_OK) /* I don't know what is this 8 byts information is we have to figure out */
-            {
-                if(!bStrem1) /* if it is a second OLE stream data */
-                {
-                    pData->dwDataLength -= 8;
-                    dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)(pData->strUnknown), sizeof(pData->strUnknown));
-                    if(dwSize != sizeof(pData->strUnknown))
-                    {
-                        hRes = CONVERT10_E_OLESTREAM_GET;
-                    }
-                }
-            }
-            if(hRes == S_OK)
-            {
-                if(pData->dwDataLength > 0)
-                {
-                    pData->pData = (BYTE *)HeapAlloc(GetProcessHeap(),0,pData->dwDataLength);
-
-                    /* Get Data (ex. IStorage, Metafile, or BMP) */
-                    if(pData->pData)
-                    {
-                        dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)pData->pData, pData->dwDataLength);
-                        if(dwSize != pData->dwDataLength)
-                        {
-                            hRes = CONVERT10_E_OLESTREAM_GET;
-                        }
-                    }
-                    else
-                    {
-                        hRes = CONVERT10_E_OLESTREAM_GET;
-                    }
-                }
-            }
-        }
-    }
-    return hRes;
+        DWORD dwSize;
+        HRESULT hRes = S_OK;
+        int nTryCnt=0;
+        int max_try = 6;
+
+        pData->pData = NULL;
+        pData->pstrOleObjFileName = (CHAR *) NULL;
+
+        for( nTryCnt=0;nTryCnt < max_try; nTryCnt++)
+        {
+        /* Get the OleID */
+        dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)&(pData->dwOleID), sizeof(pData->dwOleID));
+        if(dwSize != sizeof(pData->dwOleID))
+        {
+                hRes = CONVERT10_E_OLESTREAM_GET;
+        }
+        else if(pData->dwOleID != OLESTREAM_ID)
+        {
+                hRes = CONVERT10_E_OLESTREAM_FMT;
+        }
+                else
+                {
+                        hRes = S_OK;
+                        break;
+                }
+        }
+
+        if(hRes == S_OK)
+        {
+                /* Get the TypeID...more info needed for this field */
+                dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)&(pData->dwTypeID), sizeof(pData->dwTypeID));
+                if(dwSize != sizeof(pData->dwTypeID))
+                {
+                        hRes = CONVERT10_E_OLESTREAM_GET;
+                }
+        }
+        if(hRes == S_OK)
+        {
+                if(pData->dwTypeID != 0)
+                {
+                        /* Get the lenght of the OleTypeName */
+                        dwSize = pOleStream->lpstbl->Get(pOleStream, (void *) &(pData->dwOleTypeNameLength), sizeof(pData->dwOleTypeNameLength));
+                        if(dwSize != sizeof(pData->dwOleTypeNameLength))
+                        {
+                                hRes = CONVERT10_E_OLESTREAM_GET;
+                        }
+
+                        if(hRes == S_OK)
+                        {
+                                if(pData->dwOleTypeNameLength > 0)
+                                {
+                                        /* Get the OleTypeName */
+                                        dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)pData->strOleTypeName, pData->dwOleTypeNameLength);
+                                        if(dwSize != pData->dwOleTypeNameLength)
+                                        {
+                                                hRes = CONVERT10_E_OLESTREAM_GET;
+                                        }
+                                }
+                        }
+                        if(bStrem1)
+                        {
+                                dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)&(pData->dwOleObjFileNameLength), sizeof(pData->dwOleObjFileNameLength));
+                                if(dwSize != sizeof(pData->dwOleObjFileNameLength))
+                                {
+                                        hRes = CONVERT10_E_OLESTREAM_GET;
+                                }
+                        if(hRes == S_OK)
+                        {
+                                        if(pData->dwOleObjFileNameLength < 1) /* there is no file name exist */
+                                                pData->dwOleObjFileNameLength = sizeof(pData->dwOleObjFileNameLength);
+                                        pData->pstrOleObjFileName = (CHAR *)malloc(pData->dwOleObjFileNameLength);
+                                        if(pData->pstrOleObjFileName)
+                                        {
+                                                dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)(pData->pstrOleObjFileName),pData->dwOleObjFileNameLength);
+                                                if(dwSize != pData->dwOleObjFileNameLength)
+                                                {
+                                                        hRes = CONVERT10_E_OLESTREAM_GET;
+                                                }
+                                        }
+                                        else
+                                                hRes = CONVERT10_E_OLESTREAM_GET;
+                                }
+                        }
+                        else
+                        {
+                                /* Get the Width of the Metafile */
+                                dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)&(pData->dwMetaFileWidth), sizeof(pData->dwMetaFileWidth));
+                                if(dwSize != sizeof(pData->dwMetaFileWidth))
+                                {
+                                        hRes = CONVERT10_E_OLESTREAM_GET;
+                                }
+                        if(hRes == S_OK)
+                        {
+                                /* Get the Height of the Metafile */
+                                dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)&(pData->dwMetaFileHeight), sizeof(pData->dwMetaFileHeight));
+                                if(dwSize != sizeof(pData->dwMetaFileHeight))
+                                {
+                                        hRes = CONVERT10_E_OLESTREAM_GET;
+                                }
+                        }
+                        }
+                        if(hRes == S_OK)
+                        {
+                                /* Get the Lenght of the Data */
+                                dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)&(pData->dwDataLength), sizeof(pData->dwDataLength));
+                                if(dwSize != sizeof(pData->dwDataLength))
+                                {
+                                        hRes = CONVERT10_E_OLESTREAM_GET;
+                                }
+                        }
+
+                        if(hRes == S_OK) /* I don't know what is this 8 byts information is we have to figure out */
+                        {
+                                if(!bStrem1) /* if it is a second OLE stream data */
+                                {
+                                        pData->dwDataLength -= 8;
+                                        dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)(pData->strUnknown), sizeof(pData->strUnknown));
+                                        if(dwSize != sizeof(pData->strUnknown))
+                                        {
+                                                hRes = CONVERT10_E_OLESTREAM_GET;
+                                        }
+                                }
+                        }
+                        if(hRes == S_OK)
+                        {
+                                if(pData->dwDataLength > 0)
+                                {
+                                        pData->pData = (BYTE *)HeapAlloc(GetProcessHeap(),0,pData->dwDataLength);
+
+                                        /* Get Data (ex. IStorage, Metafile, or BMP) */
+                                        if(pData->pData)
+                                        {
+                                                dwSize = pOleStream->lpstbl->Get(pOleStream, (void *)pData->pData, pData->dwDataLength);
+                                                if(dwSize != pData->dwDataLength)
+                                                {
+                                                        hRes = CONVERT10_E_OLESTREAM_GET;
+                                                }
+                                        }
+                                        else
+                                        {
+                                                hRes = CONVERT10_E_OLESTREAM_GET;
+                                        }
+                                }
+                        }
+                }
+        }
+        return hRes;
 }
 
 /*************************************************************************
- * OLECONVERT_SaveOLE10 [Internal]
- *
- * Saves the OLE10 STREAM From memory
+ * OLECONVERT_SaveOLE10 [Internal] 
+ *
+ * Saves the OLE10 STREAM From memory 
  *
  * PARAMS
@@ -6133 +6144 @@
  * NOTES
  *     This function is used by OleConvertIStorageToOLESTREAM only.
- *
+ *     
  */
 HRESULT OLECONVERT_SaveOLE10(OLECONVERT_OLESTREAM_DATA *pData, LPOLESTREAM pOleStream)
@@ -6227 +6238 @@
 
 /*************************************************************************
- * OLECONVERT_GetOLE20FromOLE10[Internal]
+ * OLECONVERT_GetOLE20FromOLE10[Internal] 
  *
  * This function copies OLE10 Data (the IStorage in the OLESTREAM) to disk,
- * opens it, and copies the content to the dest IStorage for
+ * opens it, and copies the content to the dest IStorage for 
  * OleConvertOLESTREAMToIStorage
- *
+ * 
  *
  * PARAMS
@@ -6243 +6254 @@
  *
  * NOTES
- *
- *
+ *     
+ *     
  */
 void OLECONVERT_GetOLE20FromOLE10(LPSTORAGE pDestStorage, BYTE *pBuffer, DWORD nBufferLength)
@@ -6279 +6290 @@
 
 /*************************************************************************
- * OLECONVERT_WriteOLE20ToBuffer [Internal]
- *
- * Saves the OLE10 STREAM From memory
+ * OLECONVERT_WriteOLE20ToBuffer [Internal] 
+ *
+ * Saves the OLE10 STREAM From memory 
  *
  * PARAMS
@@ -6294 +6305 @@
  *
  *     Used by OleConvertIStorageToOLESTREAM only.
- *
+ *     
  */
 DWORD OLECONVERT_WriteOLE20ToBuffer(LPSTORAGE pStorage, BYTE **pData)
@@ -6306 +6317 @@
 
     *pData = NULL;
-
+    
     /* Create temp Storage */
     GetTempPathW(MAX_PATH, wstrTempDir);
@@ -6333 +6344 @@
 
 /*************************************************************************
- * OLECONVERT_CreateOleStream [Internal]
+ * OLECONVERT_CreateOleStream [Internal] 
  *
  * Creates the "\001OLE" stream in the IStorage if neccessary.
@@ -6348 +6359 @@
  *     This stream is still unknown, MS Word seems to have extra data
  *     but since the data is stored in the OLESTREAM there should be
- *     no need to recreate the stream.  If the stream is manually
+ *     no need to recreate the stream.  If the stream is manually 
  *     deleted it will create it with this default data.
- *
+ *     
  */
 void OLECONVERT_CreateOleStream(LPSTORAGE pStorage)
@@ -6357 +6368 @@
     IStream *pStream;
     WCHAR wstrStreamName[] = {1,'O', 'l', 'e', 0};
-    BYTE pOleStreamHeader [] =
-    {
-        0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00
+    BYTE pOleStreamHeader [] = 
+    {
+        0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00 
     };
-
+    
     /* Create stream if not present */
-    hRes = IStorage_CreateStream(pStorage, wstrStreamName,
+    hRes = IStorage_CreateStream(pStorage, wstrStreamName, 
         STGM_WRITE  | STGM_SHARE_EXCLUSIVE, 0, 0, &pStream );
 
@@ -6378 +6389 @@
 
 /*************************************************************************
- * OLECONVERT_CreateCompObjStream [Internal]
+ * OLECONVERT_CreateCompObjStream [Internal] 
  *
  * Creates a "\001CompObj" is the destination IStorage if necessary.
  *
  * PARAMS
- *     pStorage       [I] The dest IStorage to create the CompObj Stream
+ *     pStorage       [I] The dest IStorage to create the CompObj Stream 
  *                        if necessary.
  *     strOleTypeName [I] The ProgID
@@ -6395 +6406 @@
  *
  *     The stream data is stored in the OLESTREAM and there should be
- *     no need to recreate the stream.  If the stream is manually
+ *     no need to recreate the stream.  If the stream is manually 
  *     deleted it will attempt to create it by querying the registry.
  *
- *
+ *     
  */
 HRESULT OLECONVERT_CreateCompObjStream(LPSTORAGE pStorage, LPCSTR strOleTypeName)
@@ -6417 +6428 @@
 
     /*  Create a CompObj stream if it doesn't exist */
-    hStorageRes = IStorage_CreateStream(pStorage, wstrStreamName,
+    hStorageRes = IStorage_CreateStream(pStorage, wstrStreamName, 
         STGM_WRITE  | STGM_SHARE_EXCLUSIVE, 0, 0, &pStream );
     if(hStorageRes == S_OK)
@@ -6438 +6449 @@
             LONG hErr;
             /* Get the CLSID Default Name from the Registry */
-            hErr = RegOpenKeyA(HKEY_CLASSES_ROOT, IStorageCompObj.strProgIDName, &hKey);
+            hErr = RegOpenKeyA(HKEY_CLASSES_ROOT, IStorageCompObj.strProgIDName, &hKey); 
             if(hErr == ERROR_SUCCESS)
             {
@@ -6480 +6491 @@
 
 /*************************************************************************
- * OLECONVERT_CreateOlePresStream[Internal]
+ * OLECONVERT_CreateOlePresStream[Internal] 
  *
  * Creates the "\002OlePres000" Stream with the Metafile data
@@ -6487 +6498 @@
  *     pStorage     [I] The dest IStorage to create \002OLEPres000 stream in.
  *     dwExtentX    [I] Width of the Metafile
- *     dwExtentY    [I] Height of the Metafile
+ *     dwExtentY    [I] Height of the Metafile 
  *     pData        [I] Metafile data
  *     dwDataLength [I] Size of the Metafile data
@@ -6497 +6508 @@
  * NOTES
  *     This function is used by OleConvertOLESTREAMToIStorage only.
- *
+ *     
  */
 void OLECONVERT_CreateOlePresStream(LPSTORAGE pStorage, DWORD dwExtentX, DWORD dwExtentY , BYTE *pData, DWORD dwDataLength)
@@ -6504 +6515 @@
     IStream *pStream;
     WCHAR wstrStreamName[] = {2, 'O', 'l', 'e', 'P', 'r', 'e', 's', '0', '0', '0', 0};
-    BYTE pOlePresStreamHeader [] =
-    {
-        0xFF, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00,
-        0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+    BYTE pOlePresStreamHeader [] = 
+    {
+        0xFF, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 
+        0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
         0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00
     };
 
-    BYTE pOlePresStreamHeaderEmpty [] =
-    {
-        0x00, 0x00, 0x00, 0x00,
-        0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+    BYTE pOlePresStreamHeaderEmpty [] = 
+    {
+        0x00, 0x00, 0x00, 0x00, 
+        0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
         0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00
     };
-
+     
     /* Create the OlePres000 Stream */
-    hRes = IStorage_CreateStream(pStorage, wstrStreamName,
+    hRes = IStorage_CreateStream(pStorage, wstrStreamName, 
         STGM_CREATE | STGM_WRITE  | STGM_SHARE_EXCLUSIVE, 0, 0, &pStream );
 
@@ -6565 +6576 @@
 
 /*************************************************************************
- * OLECONVERT_CreateOle10NativeStream [Internal]
+ * OLECONVERT_CreateOle10NativeStream [Internal] 
  *
  * Creates the "\001Ole10Native" Stream (should contain a BMP)
@@ -6581 +6592 @@
  *
  *     Might need to verify the data and return appropriate error message
- *
+ *     
  */
 void OLECONVERT_CreateOle10NativeStream(LPSTORAGE pStorage, BYTE *pData, DWORD dwDataLength)
@@ -6588 +6599 @@
     IStream *pStream;
     WCHAR wstrStreamName[] = {1, 'O', 'l', 'e', '1', '0', 'N', 'a', 't', 'i', 'v', 'e', 0};
-
+    
     /* Create the Ole10Native Stream */
-    hRes = IStorage_CreateStream(pStorage, wstrStreamName,
+    hRes = IStorage_CreateStream(pStorage, wstrStreamName, 
         STGM_CREATE | STGM_WRITE  | STGM_SHARE_EXCLUSIVE, 0, 0, &pStream );
 
@@ -6604 +6615 @@
 
 /*************************************************************************
- * OLECONVERT_GetOLE10ProgID [Internal]
+ * OLECONVERT_GetOLE10ProgID [Internal] 
  *
  * Finds the ProgID (or OleTypeID) from the IStorage
@@ -6620 +6631 @@
  *     This function is used by OleConvertIStorageToOLESTREAM only.
  *
- *
+ *     
  */
 HRESULT OLECONVERT_GetOLE10ProgID(LPSTORAGE pStorage, char *strProgID, DWORD *dwSize)
@@ -6631 +6642 @@
 
     /* Open the CompObj Stream */
-    hRes = IStorage_OpenStream(pStorage, wstrStreamName, NULL,
+    hRes = IStorage_OpenStream(pStorage, wstrStreamName, NULL,  
         STGM_READ  | STGM_SHARE_EXCLUSIVE, 0, &pStream );
     if(hRes == S_OK)
@@ -6668 +6679 @@
             *dwSize = WideCharToMultiByte(CP_ACP, 0, wstrProgID, -1, strProgID, *dwSize, NULL, FALSE);
         }
-
+ 
     }
     return hRes;
@@ -6674 +6685 @@
 
 /*************************************************************************
- * OLECONVERT_GetOle10PresData [Internal]
+ * OLECONVERT_GetOle10PresData [Internal] 
  *
  * Converts IStorage "/001Ole10Native" stream to a OLE10 Stream
@@ -6689 +6700 @@
  *
  *     Memory allocated for pData must be freed by the caller
- *
- *
+ *      
+ *     
  */
 void OLECONVERT_GetOle10PresData(LPSTORAGE pStorage, OLECONVERT_OLESTREAM_DATA *pOleStreamData)
@@ -6710 +6721 @@
 
     /* Open Ole10Native Stream */
-    hRes = IStorage_OpenStream(pStorage, wstrStreamName, NULL,
+    hRes = IStorage_OpenStream(pStorage, wstrStreamName, NULL,  
         STGM_READ  | STGM_SHARE_EXCLUSIVE, 0, &pStream );
     if(hRes == S_OK)
@@ -6729 +6740 @@
 
 /*************************************************************************
- * OLECONVERT_GetOle20PresData[Internal]
+ * OLECONVERT_GetOle20PresData[Internal] 
  *
  * Converts IStorage "/002OlePres000" stream to a OLE10 Stream
@@ -6742 +6753 @@
  * NOTES
  *     This function is used by OleConvertIStorageToOLESTREAM only.
- *
+ *     
  *     Memory allocated for pData must be freed by the caller
  */
@@ -6769 +6780 @@
 
     /* Open OlePress000 stream */
-    hRes = IStorage_OpenStream(pStorage, wstrStreamName, NULL,
+    hRes = IStorage_OpenStream(pStorage, wstrStreamName, NULL,  
         STGM_READ  | STGM_SHARE_EXCLUSIVE, 0, &pStream );
     if(hRes == S_OK)
@@ -6817 +6828 @@
 
 /*************************************************************************
- * OleConvertOLESTREAMToIStorage [OLE32.87]
+ * OleConvertOLESTREAMToIStorage [OLE32.87] 
  *
  * Read info on MSDN
@@ -6826 +6837 @@
  *      Still some unknowns for the IStorage: "\002OlePres000", "\001CompObj",
  *      and "\001OLE" streams
- *
+ *     
  */
 HRESULT WINAPI OleConvertOLESTREAMToIStorage (
-    LPOLESTREAM pOleStream,
-    LPSTORAGE pstg,
+    LPOLESTREAM pOleStream, 
+    LPSTORAGE pstg, 
     const DVTARGETDEVICE* ptd)
 {
@@ -6902 +6913 @@
         }
         if(pOleStreamData[i].pstrOleObjFileName != NULL)
-    {
-            HeapFree(GetProcessHeap(),0,pOleStreamData[i].pstrOleObjFileName);
-            pOleStreamData[i].pstrOleObjFileName = NULL;
-    }
+        {
+                HeapFree(GetProcessHeap(),0,pOleStreamData[i].pstrOleObjFileName);
+                pOleStreamData[i].pstrOleObjFileName = NULL;
+        }
     }
     return hRes;
@@ -6921 +6932 @@
  *      Still some unknowns for the IStorage: "\002OlePres000", "\001CompObj",
  *      and "\001OLE" streams.
- *
+ *     
  */
 HRESULT WINAPI OleConvertIStorageToOLESTREAM (
-    LPSTORAGE pstg,
+    LPSTORAGE pstg, 
     LPOLESTREAM pOleStream)
 {
@@ -6949 +6960 @@
     {
         /*Was it originaly Ole10 */
-        hRes = IStorage_OpenStream(pstg, wstrStreamName, 0, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &pStream);
+        hRes = IStorage_OpenStream(pstg, wstrStreamName, 0, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &pStream);    
         if(hRes == S_OK)
         {
@@ -6984 +6995 @@
 
 /***********************************************************************
- *      GetConvertStg (OLE32.68)
+ *              GetConvertStg (OLE32.68)
  */
 HRESULT WINAPI GetConvertStg(LPGUID guid) {
@@ -6998 +7009 @@
  */
 HRESULT WINAPI StgIsStorageFile16(LPCOLESTR16 fn) {
-    HFILE       hf;
-    OFSTRUCT    ofs;
-    BYTE        magic[24];
-
-    TRACE("(\'%s\')\n",fn);
-    hf = OpenFile(fn,&ofs,OF_SHARE_DENY_NONE);
-    if (hf==HFILE_ERROR)
-        return STG_E_FILENOTFOUND;
-    if (24!=_lread(hf,magic,24)) {
-        WARN(" too short\n");
-        _lclose(hf);
-        return S_FALSE;
-    }
-    if (!memcmp(magic,STORAGE_magic,8)) {
-        WARN(" -> YES\n");
-        _lclose(hf);
-        return S_OK;
-    }
-    if (!memcmp(magic,STORAGE_notmagic,8)) {
-        WARN(" -> NO\n");
-        _lclose(hf);
-        return S_FALSE;
-    }
-    if (!memcmp(magic,STORAGE_oldmagic,8)) {
-        WARN(" -> old format\n");
-        _lclose(hf);
-        return STG_E_OLDFORMAT;
-    }
-    WARN(" -> Invalid header.\n");
-    _lclose(hf);
-    return STG_E_INVALIDHEADER;
+        HFILE           hf;
+        OFSTRUCT        ofs;
+        BYTE            magic[24];
+
+        TRACE("(\'%s\')\n",fn);
+        hf = OpenFile(fn,&ofs,OF_SHARE_DENY_NONE);
+        if (hf==HFILE_ERROR)
+                return STG_E_FILENOTFOUND;
+        if (24!=_lread(hf,magic,24)) {
+                WARN(" too short\n");
+                _lclose(hf);
+                return S_FALSE;
+        }
+        if (!memcmp(magic,STORAGE_magic,8)) {
+                WARN(" -> YES\n");
+                _lclose(hf);
+                return S_OK;
+        }
+        if (!memcmp(magic,STORAGE_notmagic,8)) {
+                WARN(" -> NO\n");
+                _lclose(hf);
+                return S_FALSE;
+        }
+        if (!memcmp(magic,STORAGE_oldmagic,8)) {
+                WARN(" -> old format\n");
+                _lclose(hf);
+                return STG_E_OLDFORMAT;
+        }
+        WARN(" -> Invalid header.\n");
+        _lclose(hf);
+        return STG_E_INVALIDHEADER;
 }
 
@@ -7034 +7045 @@
  * StgIsStorageFile [OLE32.146]
  */
-HRESULT WINAPI
-StgIsStorageFile(LPCOLESTR fn)
-{
-    LPOLESTR16  xfn = HEAP_strdupWtoA(GetProcessHeap(),0,fn);
-    HRESULT ret = StgIsStorageFile16(xfn);
-
-    HeapFree(GetProcessHeap(),0,xfn);
-    return ret;
+HRESULT WINAPI 
+StgIsStorageFile(LPCOLESTR fn) 
+{
+        LPOLESTR16      xfn = HEAP_strdupWtoA(GetProcessHeap(),0,fn);
+        HRESULT ret = StgIsStorageFile16(xfn);
+
+        HeapFree(GetProcessHeap(),0,xfn);
+        return ret;
 }
 #endif

trunk/src/oleaut32/connpt.c

@@ -72 +72 @@
   CONNECTDATA *pCD;
   DWORD nConns;
-
+  
   /* Next connection to enumerate from */
   DWORD nCur;
@@ -79 +79 @@
 
 static EnumConnectionsImpl *EnumConnectionsImpl_Construct(IUnknown *pUnk,
-                              DWORD nSinks,
-                              CONNECTDATA *pCD);
+                                                          DWORD nSinks,
+                                                          CONNECTDATA *pCD);
 
 
@@ -87 +87 @@
  */
 static ConnectionPointImpl *ConnectionPointImpl_Construct(IUnknown *pUnk,
-                              REFIID riid)
+                                                          REFIID riid)
 {
   ConnectionPointImpl *Obj;
@@ -97 +97 @@
   Obj->iid =  *riid;
   Obj->maxSinks = MAXSINKS;
-  Obj->sinks = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
-             sizeof(IUnknown*) * MAXSINKS);
+  Obj->sinks = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 
+                         sizeof(IUnknown*) * MAXSINKS);
   Obj->nSinks = 0;
   return Obj;
@@ -139 +139 @@
   if ( (This==0) || (ppvObject==0) )
     return E_INVALIDARG;
-
+  
   /*
    * Initialize the return parameter.
    */
   *ppvObject = 0;
-
+  
   /*
    * Compare the riid with the interface IDs implemented by this object.
    */
-  if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0)
+  if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) 
   {
     *ppvObject = (IConnectionPoint*)This;
   }
-  else if (memcmp(&IID_IConnectionPoint, riid, sizeof(IID_IConnectionPoint)) == 0)
+  else if (memcmp(&IID_IConnectionPoint, riid, sizeof(IID_IConnectionPoint)) == 0) 
   {
     *ppvObject = (IConnectionPoint*)This;
   }
-
+  
   /*
    * Check that we obtained an interface.
@@ -165 +165 @@
     return E_NOINTERFACE;
   }
-
+  
   /*
    * Query Interface always increases the reference count by one when it is
@@ -189 +189 @@
   return This->ref;
 }
-
+        
 /************************************************************************
  * ConnectionPointImpl_Release (IUnknown)
@@ -195 +195 @@
  * See Windows documentation for more details on IUnknown methods.
  */
-static ULONG WINAPI ConnectionPointImpl_Release(
+static ULONG WINAPI ConnectionPointImpl_Release( 
       IConnectionPoint* iface)
 {
@@ -215 +215 @@
     return 0;
   }
-
+  
   return This->ref;
 }
@@ -224 +224 @@
  */
 static HRESULT WINAPI ConnectionPointImpl_GetConnectionInterface(
-                           IConnectionPoint *iface,
-                           IID              *piid)
+                                               IConnectionPoint *iface,
+                                               IID              *piid)
 {
   ICOM_THIS(ConnectionPointImpl, iface);
@@ -238 +238 @@
  */
 static HRESULT WINAPI ConnectionPointImpl_GetConnectionPointContainer(
-                      IConnectionPoint           *iface,
-                      IConnectionPointContainer  **ppCPC)
+                                      IConnectionPoint           *iface,
+                                      IConnectionPointContainer  **ppCPC)
 {
   ICOM_THIS(ConnectionPointImpl, iface);
@@ -245 +245 @@
 
   return IUnknown_QueryInterface(This->Obj,
-                 &IID_IConnectionPointContainer,
-                 (LPVOID)ppCPC);
+                                 &IID_IConnectionPointContainer,
+                                 (LPVOID)ppCPC);
 }
 
@@ -254 +254 @@
  */
 static HRESULT WINAPI ConnectionPointImpl_Advise(IConnectionPoint *iface,
-                         IUnknown *lpUnk,
-                         DWORD *pdwCookie)
+                                                 IUnknown *lpUnk,
+                                                 DWORD *pdwCookie)
 {
   DWORD i;
@@ -273 +273 @@
     This->maxSinks += MAXSINKS;
     This->sinks = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->sinks,
-                  This->maxSinks * sizeof(IUnknown *));
+                              This->maxSinks * sizeof(IUnknown *));
   }
   This->sinks[i] = lpSink;
@@ -287 +287 @@
  */
 static HRESULT WINAPI ConnectionPointImpl_Unadvise(IConnectionPoint *iface,
-                           DWORD dwCookie)
+                                                   DWORD dwCookie)
 {
   ICOM_THIS(ConnectionPointImpl, iface);
@@ -307 +307 @@
  */
 static HRESULT WINAPI ConnectionPointImpl_EnumConnections(
-                            IConnectionPoint *iface,
-                            LPENUMCONNECTIONS *ppEnum)
-{
+                                                    IConnectionPoint *iface,
+                                                    LPENUMCONNECTIONS *ppEnum)
+{ 
   ICOM_THIS(ConnectionPointImpl, iface);
   CONNECTDATA *pCD;
@@ -317 +317 @@
 
   TRACE("(%p)->(%p)\n", This, ppEnum);
-
+  
   *ppEnum = NULL;
 
@@ -339 +339 @@
   EnumObj = EnumConnectionsImpl_Construct((IUnknown*)This, This->nSinks, pCD);
   hr = IEnumConnections_QueryInterface((IEnumConnections*)EnumObj,
-                  &IID_IEnumConnections, (LPVOID)ppEnum);
+                                  &IID_IEnumConnections, (LPVOID)ppEnum);
   IEnumConnections_Release((IEnumConnections*)EnumObj);
 
@@ -367 +367 @@
  */
 static EnumConnectionsImpl *EnumConnectionsImpl_Construct(IUnknown *pUnk,
-                              DWORD nSinks,
-                              CONNECTDATA *pCD)
+                                                          DWORD nSinks,
+                                                          CONNECTDATA *pCD)
 {
   EnumConnectionsImpl *Obj = HeapAlloc(GetProcessHeap(), 0, sizeof(*Obj));
@@ -420 +420 @@
   if ( (This==0) || (ppvObject==0) )
     return E_INVALIDARG;
-
+  
   /*
    * Initialize the return parameter.
    */
   *ppvObject = 0;
-
+  
   /*
    * Compare the riid with the interface IDs implemented by this object.
    */
-  if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0)
+  if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) 
   {
     *ppvObject = (IEnumConnections*)This;
   }
-  else if (memcmp(&IID_IEnumConnections, riid, sizeof(IID_IEnumConnections)) == 0)
+  else if (memcmp(&IID_IEnumConnections, riid, sizeof(IID_IEnumConnections)) == 0) 
   {
     *ppvObject = (IEnumConnections*)This;
   }
-
+  
   /*
    * Check that we obtained an interface.
@@ -446 +446 @@
     return E_NOINTERFACE;
   }
-
+  
   /*
    * Query Interface always increases the reference count by one when it is
@@ -470 +470 @@
   return This->ref;
 }
-
+        
 /************************************************************************
  * EnumConnectionsImpl_Release (IUnknown)
@@ -497 +497 @@
     return 0;
   }
-
+  
   return This->ref;
 }
@@ -506 +506 @@
  */
 static HRESULT WINAPI EnumConnectionsImpl_Next(IEnumConnections* iface,
-                           ULONG cConn, LPCONNECTDATA pCD,
-                           ULONG *pEnum)
+                                               ULONG cConn, LPCONNECTDATA pCD,
+                                               ULONG *pEnum)
 {
   ICOM_THIS(EnumConnectionsImpl, iface);
@@ -542 +542 @@
  */
 static HRESULT WINAPI EnumConnectionsImpl_Skip(IEnumConnections* iface,
-                           ULONG cSkip)
+                                               ULONG cSkip)
 {
   ICOM_THIS(EnumConnectionsImpl, iface);
@@ -576 +576 @@
  */
 static HRESULT WINAPI EnumConnectionsImpl_Clone(IEnumConnections* iface,
-                        LPENUMCONNECTIONS *ppEnum)
+                                                LPENUMCONNECTIONS *ppEnum)
 {
   ICOM_THIS(EnumConnectionsImpl, iface);
   EnumConnectionsImpl *newObj;
   TRACE("(%p)->(%p)\n", This, ppEnum);
-
+  
   newObj = EnumConnectionsImpl_Construct(This->pUnk, This->nConns, This->pCD);
   newObj->nCur = This->nCur;
@@ -588 +588 @@
   return S_OK;
 }
-
+  
 static ICOM_VTABLE(IEnumConnections) EnumConnectionsImpl_VTable =
 {
@@ -616 +616 @@
  */
 HRESULT CreateConnectionPoint(IUnknown *pUnk, REFIID riid,
-                  IConnectionPoint **pCP)
+                              IConnectionPoint **pCP)
 {
   ConnectionPointImpl *Obj;
@@ -624 +624 @@
   if(!Obj) return E_OUTOFMEMORY;
 
-  hr = IConnectionPoint_QueryInterface((IConnectionPoint *)Obj,
-                       &IID_IConnectionPoint, (LPVOID)pCP);
+  hr = IConnectionPoint_QueryInterface((IConnectionPoint *)Obj, 
+                                       &IID_IConnectionPoint, (LPVOID)pCP);
   IConnectionPoint_Release((IConnectionPoint *)Obj);
   return hr;

trunk/src/oleaut32/dispatch.c

@@ -37 +37 @@
  *
  * NOTES
- *      - Defer method invocation to ITypeInfo::Invoke()
+ *              - Defer method invocation to ITypeInfo::Invoke()
  *
  * RETURNS
  *
- *      S_OK on success.
+ *              S_OK on success.
  */
 HRESULT WINAPI
@@ -76 +76 @@
  *         DispGetIDsOfNames (OLEAUT32.29)
  *
- * Convert a set of names to dispids, based on information
+ * Convert a set of names to dispids, based on information 
  * contained in object's type library.
- *
+ * 
  * NOTES
- *      - Defers to ITypeInfo::GetIDsOfNames()
+ *              - Defers to ITypeInfo::GetIDsOfNames()
  *
  * RETURNS
  *
- *      S_OK on success.
+ *              S_OK on success.
  */
 HRESULT WINAPI
@@ -109 +109 @@
  *
  * NOTES
- *      Coercion is done using system (0) locale.
+ *              Coercion is done using system (0) locale.
  *
  * RETURNS
  *
- *      S_OK on success.
+ *              S_OK on success.
  */
 HRESULT WINAPI DispGetParam(DISPPARAMS* pdispparams, UINT position,

trunk/src/oleaut32/initterm.cpp

@@ -59 +59 @@
    {
    case DLL_PROCESS_ATTACH:
-    return TRUE;
+        return TRUE;
 
    case DLL_THREAD_ATTACH:
    case DLL_THREAD_DETACH:
-    return TRUE;
+        return TRUE;
 
    case DLL_PROCESS_DETACH:
-    ctordtorTerm();
-    ClosePrivateLogFiles();
-    return TRUE;
+        ctordtorTerm();
+        ClosePrivateLogFiles();
+        return TRUE;
    }
    return FALSE;
@@ -95 +95 @@
       case 0 :
       {
-     loadNr = globLoadNr++;
+         loadNr = globLoadNr++;
 
-     DosQueryModuleName(hModule, sizeof(oleaut32Path), oleaut32Path);
-     char *endofpath = strrchr(oleaut32Path, '\\');
-     *(endofpath+1) = 0;
+         DosQueryModuleName(hModule, sizeof(oleaut32Path), oleaut32Path);
+         char *endofpath = strrchr(oleaut32Path, '\\');
+         *(endofpath+1) = 0;
 
          ctordtorInit();
@@ -105 +105 @@
          CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
 
-     dllHandle = RegisterLxDll(hModule, LibMain, (PVOID)&_Resource_PEResTab);
-         if(dllHandle == 0)
-        return 0UL;
+         dllHandle = RegisterLxDll(hModule, LibMain, (PVOID)&_Resource_PEResTab);
+         if(dllHandle == 0) 
+                return 0UL;
 
 #ifdef DEFAULT_LOGGING_OFF
-         if(getenv("WIN32LOG_ENABLED")) {
+         if(getenv("WIN32LOG_ENABLED")) {
 #else
-         if(!getenv("NOWIN32LOG")) {
+         if(!getenv("NOWIN32LOG")) {
 #endif
-            OpenPrivateLogFiles();
-     }
+                OpenPrivateLogFiles();
+         }
          Hash_Initialise();
 
@@ -122 +122 @@
       case 1 :
          if(dllHandle) {
-        UnregisterLxDll(dllHandle);
+                UnregisterLxDll(dllHandle);
          }
          break;

trunk/src/oleaut32/ole2disp.c

@@ -1 +1 @@
 /*
- *  OLE2DISP library
+ *      OLE2DISP library
  *
- *  Copyright 1995  Martin von Loewis
+ *      Copyright 1995  Martin von Loewis
  */
 #ifdef __WIN32OS2__
@@ -31 +31 @@
 
 /******************************************************************************
- *      BSTR_AllocBytes [Internal]
+ *              BSTR_AllocBytes [Internal]
  */
 static BSTR16 BSTR_AllocBytes(int n)
@@ -56 +56 @@
 
 /******************************************************************************
- *      SysAllocString16    [OLE2DISP.2]
+ *              SysAllocString16        [OLE2DISP.2]
  */
 BSTR16 WINAPI SysAllocString16(LPCOLESTR16 in)
 {
-    BSTR16 out;
-
+        BSTR16 out;
+    
+        if (!in) return 0;
+    
+        out = BSTR_AllocBytes(strlen(in)+1);
+        if(!out)return 0;
+        strcpy(BSTR_GetAddr(out),in);
+        return out;
+}
+#endif
+
+/******************************************************************************
+ *              SysAllocString  [OLEAUT32.2]
+ */
+BSTR WINAPI SysAllocString(LPCOLESTR in)
+{
     if (!in) return 0;
-
-    out = BSTR_AllocBytes(strlen(in)+1);
-    if(!out)return 0;
-    strcpy(BSTR_GetAddr(out),in);
-    return out;
-}
-#endif
-
-/******************************************************************************
- *      SysAllocString  [OLEAUT32.2]
- */
-BSTR WINAPI SysAllocString(LPCOLESTR in)
-{
-    if (!in) return 0;
-
+    
     /* Delegate this to the SysAllocStringLen32 method. */
     return SysAllocStringLen(in, lstrlenW(in));
@@ -84 +84 @@
 #ifndef __WIN32OS2__
 /******************************************************************************
- *      SysReAllocString16  [OLE2DISP.3]
+ *              SysReAllocString16      [OLE2DISP.3]
  */
 INT16 WINAPI SysReAllocString16(LPBSTR16 old,LPCOLESTR16 in)
 {
-    BSTR16 new=SysAllocString16(in);
-    BSTR_Free(*old);
-    *old=new;
-    return 1;
-}
-#endif
-
-/******************************************************************************
- *      SysReAllocString    [OLEAUT32.3]
+        BSTR16 new=SysAllocString16(in);
+        BSTR_Free(*old);
+        *old=new;
+        return 1;
+}
+#endif
+
+/******************************************************************************
+ *              SysReAllocString        [OLEAUT32.3]
  */
 INT WINAPI SysReAllocString(LPBSTR old,LPCOLESTR in)
@@ -103 +103 @@
      * Sanity check
      */
-    if (old==NULL)
+    if (old==NULL) 
       return 0;
 
@@ -109 +109 @@
      * Make sure we free the old string.
      */
-    if (*old!=NULL)
+    if (*old!=NULL)      
       SysFreeString(*old);
 
@@ -122 +122 @@
 #ifndef __WIN32OS2__
 /******************************************************************************
- *      SysAllocStringLen16 [OLE2DISP.4]
+ *              SysAllocStringLen16     [OLE2DISP.4]
  */
 BSTR16 WINAPI SysAllocStringLen16(const char *in, int len)
 {
-    BSTR16 out=BSTR_AllocBytes(len+1);
-
-    if (!out)
-        return 0;
+        BSTR16 out=BSTR_AllocBytes(len+1);
+
+        if (!out)
+                return 0;
 
     /*
@@ -137 +137 @@
      */
     if (in != 0)
-    strcpy(BSTR_GetAddr(out),in);
+        strcpy(BSTR_GetAddr(out),in);
     else
       memset(BSTR_GetAddr(out), 0, len+1);
 
-    return out;
+        return out;
 }
 #endif
@@ -152 +152 @@
  * he describes it as a "DWORD count of characters". By experimenting with
  * a windows application, this count seems to be a DWORD count of bytes in
- * the string. Meaning that the count is double the number of wide
+ * the string. Meaning that the count is double the number of wide 
  * characters in the string.
  */
@@ -214 +214 @@
 #ifndef __WIN32OS2__
 /******************************************************************************
- *      SysReAllocStringLen16   [OLE2DISP.5]
+ *              SysReAllocStringLen16   [OLE2DISP.5]
  */
 int WINAPI SysReAllocStringLen16(BSTR16 *old,const char *in,int len)
 {
-    BSTR16 new=SysAllocStringLen16(in,len);
-    BSTR_Free(*old);
-    *old=new;
+        BSTR16 new=SysAllocStringLen16(in,len);
+        BSTR_Free(*old);
+        *old=new;
+        return 1;
+}
+#endif
+
+ 
+/******************************************************************************
+ *             SysReAllocStringLen   [OLEAUT32.5]
+ */
+int WINAPI SysReAllocStringLen(BSTR* old, const OLECHAR* in, unsigned int len)
+{
+    /*
+     * Sanity check
+     */
+    if (old==NULL) 
+      return 0;
+
+    /*
+     * Make sure we free the old string.
+     */
+    if (*old!=NULL)      
+      SysFreeString(*old);
+
+    /*
+     * Allocate the new string
+     */
+    *old = SysAllocStringLen(in, len);
+
     return 1;
 }
-#endif
-
-
-/******************************************************************************
- *             SysReAllocStringLen   [OLEAUT32.5]
- */
-int WINAPI SysReAllocStringLen(BSTR* old, const OLECHAR* in, unsigned int len)
-{
-    /*
-     * Sanity check
-     */
-    if (old==NULL)
-      return 0;
-
-    /*
-     * Make sure we free the old string.
-     */
-    if (*old!=NULL)
-      SysFreeString(*old);
-
-    /*
-     * Allocate the new string
-     */
-    *old = SysAllocStringLen(in, len);
-
-    return 1;
-}
-
-#ifndef __WIN32OS2__
-/******************************************************************************
- *      SysFreeString16 [OLE2DISP.6]
+
+#ifndef __WIN32OS2__
+/******************************************************************************
+ *              SysFreeString16 [OLE2DISP.6]
  */
 void WINAPI SysFreeString16(BSTR16 in)
 {
-    BSTR_Free(in);
-}
-#endif
-
-/******************************************************************************
- *      SysFreeString   [OLEAUT32.6]
+        BSTR_Free(in);
+}
+#endif
+
+/******************************************************************************
+ *              SysFreeString   [OLEAUT32.6]
  */
 void WINAPI SysFreeString(BSTR in)
 {
     DWORD* bufferPointer;
-
+    
     /* NULL is a valid parameter */
     if(!in) return;
@@ -288 +288 @@
 #ifndef __WIN32OS2__
 /******************************************************************************
- *      SysStringLen16  [OLE2DISP.7]
+ *              SysStringLen16  [OLE2DISP.7]
  */
 int WINAPI SysStringLen16(BSTR16 str)
 {
-    return strlen(BSTR_GetAddr(str));
+        return strlen(BSTR_GetAddr(str));
 }
 #endif
@@ -310 +310 @@
      if (!str) return 0;
     /*
-     * The length of the string (in bytes) is contained in a DWORD placed
+     * The length of the string (in bytes) is contained in a DWORD placed 
      * just before the BSTR pointer
      */
@@ -334 +334 @@
      if (!str) return 0;
     /*
-     * The length of the string (in bytes) is contained in a DWORD placed
+     * The length of the string (in bytes) is contained in a DWORD placed 
      * just before the BSTR pointer
      */
@@ -349 +349 @@
  */
 HRESULT WINAPI CreateDispTypeInfo16(
-    INTERFACEDATA *pidata,
-    LCID lcid,
-    ITypeInfo **pptinfo)
-{
-    FIXME("(%p,%ld,%p),stub\n",pidata,lcid,pptinfo);
-    return 0;
+        INTERFACEDATA *pidata,
+        LCID lcid,
+        ITypeInfo **pptinfo)
+{
+        FIXME("(%p,%ld,%p),stub\n",pidata,lcid,pptinfo);
+        return 0;
 }
 #endif
@@ -362 +362 @@
  */
 HRESULT WINAPI CreateDispTypeInfo(
-    INTERFACEDATA *pidata,
-    LCID lcid,
-    ITypeInfo **pptinfo)
-{
-    FIXME("(%p,%ld,%p),stub\n",pidata,lcid,pptinfo);
-    return 0;
+        INTERFACEDATA *pidata,
+        LCID lcid,
+        ITypeInfo **pptinfo)
+{
+        FIXME("(%p,%ld,%p),stub\n",pidata,lcid,pptinfo);
+        return 0;
 }
 
@@ -377 +377 @@
         IUnknown* punkOuter,
         void* pvThis,
-    ITypeInfo* ptinfo,
-    IUnknown** ppunkStdDisp)
-{
-    FIXME("(%p,%p,%p,%p),stub\n",punkOuter, pvThis, ptinfo,
+        ITypeInfo* ptinfo,
+        IUnknown** ppunkStdDisp)
+{
+        FIXME("(%p,%p,%p,%p),stub\n",punkOuter, pvThis, ptinfo,
                ppunkStdDisp);
-    return 0;
+        return 0;
 }
 #endif
@@ -392 +392 @@
         IUnknown* punkOuter,
         void* pvThis,
-    ITypeInfo* ptinfo,
-    IUnknown** ppunkStdDisp)
-{
-    FIXME("(%p,%p,%p,%p),stub\n",punkOuter, pvThis, ptinfo,
+        ITypeInfo* ptinfo,
+        IUnknown** ppunkStdDisp)
+{
+        FIXME("(%p,%p,%p,%p),stub\n",punkOuter, pvThis, ptinfo,
                ppunkStdDisp);
-    return 0;
+        return 0;
 }
 
@@ -405 +405 @@
  */
 HRESULT WINAPI RegisterActiveObject16(
-    IUnknown *punk, REFCLSID rclsid, DWORD dwFlags, unsigned long *pdwRegister
+        IUnknown *punk, REFCLSID rclsid, DWORD dwFlags, unsigned long *pdwRegister
 ) {
-    FIXME("(%p,%s,0x%08lx,%p):stub\n",punk,debugstr_guid(rclsid),dwFlags,pdwRegister);
-    return 0;
-}
-#endif
-
-/******************************************************************************
- *      OleTranslateColor   [OLEAUT32.421]
+        FIXME("(%p,%s,0x%08lx,%p):stub\n",punk,debugstr_guid(rclsid),dwFlags,pdwRegister);
+        return 0;
+}
+#endif
+
+/******************************************************************************
+ *              OleTranslateColor       [OLEAUT32.421]
  *
  * Converts an OLE_COLOR to a COLORREF.
  * See the documentation for conversion rules.
- * pColorRef can be NULL. In that case the user only wants to test the
+ * pColorRef can be NULL. In that case the user only wants to test the 
  * conversion.
  */

trunk/src/oleaut32/oleaut.c

@@ -1 +1 @@
 /*
- *  OLEAUT32
+ *      OLEAUT32
  *
  */
@@ -17 +17 @@
 DEFAULT_DEBUG_CHANNEL(ole);
 
-static WCHAR    _delimiter[2] = {'!',0}; /* default delimiter apparently */
-static WCHAR    *pdelimiter = &_delimiter[0];
+static WCHAR    _delimiter[2] = {'!',0}; /* default delimiter apparently */
+static WCHAR    *pdelimiter = &_delimiter[0];
 
 /***********************************************************************
- *      RegisterActiveObject (OLEAUT32.33)
+ *              RegisterActiveObject (OLEAUT32.33)
  */
 HRESULT WINAPI RegisterActiveObject(
-    LPUNKNOWN punk,REFCLSID rcid,DWORD dwFlags,LPDWORD pdwRegister
+        LPUNKNOWN punk,REFCLSID rcid,DWORD dwFlags,LPDWORD pdwRegister
 ) {
-    WCHAR           guidbuf[80];
-    HRESULT         ret;
-    LPRUNNINGOBJECTTABLE    runobtable;
-    LPMONIKER       moniker;
+        WCHAR                   guidbuf[80];
+        HRESULT                 ret;
+        LPRUNNINGOBJECTTABLE    runobtable;
+        LPMONIKER               moniker;
 
-    StringFromGUID2(rcid,guidbuf,39);
+        StringFromGUID2(rcid,guidbuf,39);
 #ifdef __WIN32OS2__
         dprintf(("RegisterActiveObject %x %ls (%x) %x %x", punk, guidbuf, rcid, dwFlags, pdwRegister));
 #endif
-    ret = CreateItemMoniker(pdelimiter,guidbuf,&moniker);
-    if (FAILED(ret))
-        return ret;
-    ret = GetRunningObjectTable(0,&runobtable);
-    if (FAILED(ret)) {
-        IMoniker_Release(moniker);
-        return ret;
-    }
-    ret = IRunningObjectTable_Register(runobtable,dwFlags,punk,moniker,pdwRegister);
-    IRunningObjectTable_Release(runobtable);
-    IMoniker_Release(moniker);
-    return ret;
+        ret = CreateItemMoniker(pdelimiter,guidbuf,&moniker);
+        if (FAILED(ret)) 
+                return ret;
+        ret = GetRunningObjectTable(0,&runobtable);
+        if (FAILED(ret)) {
+                IMoniker_Release(moniker);
+                return ret;
+        }
+        ret = IRunningObjectTable_Register(runobtable,dwFlags,punk,moniker,pdwRegister);
+        IRunningObjectTable_Release(runobtable);
+        IMoniker_Release(moniker);
+        return ret;
 }
 
 /***********************************************************************
- *      RevokeActiveObject (OLEAUT32.34)
+ *              RevokeActiveObject (OLEAUT32.34)
  */
 HRESULT WINAPI RevokeActiveObject(DWORD xregister,LPVOID reserved)
 {
-    LPRUNNINGOBJECTTABLE    runobtable;
-    HRESULT         ret;
+        LPRUNNINGOBJECTTABLE    runobtable;
+        HRESULT                 ret;
 
 #ifdef __WIN32OS2__
@@ -61 +61 @@
 #endif
 
-    ret = GetRunningObjectTable(0,&runobtable);
-    if (FAILED(ret)) return ret;
-    ret = IRunningObjectTable_Revoke(runobtable,xregister);
-    if (SUCCEEDED(ret)) ret = S_OK;
-    IRunningObjectTable_Release(runobtable);
-    return ret;
+        ret = GetRunningObjectTable(0,&runobtable);
+        if (FAILED(ret)) return ret;
+        ret = IRunningObjectTable_Revoke(runobtable,xregister);
+        if (SUCCEEDED(ret)) ret = S_OK;
+        IRunningObjectTable_Release(runobtable);
+        return ret;
 }
 
 /***********************************************************************
- *      GetActiveObject (OLEAUT32.35)
+ *              GetActiveObject (OLEAUT32.35)
  */
 HRESULT WINAPI GetActiveObject(REFCLSID rcid,LPVOID preserved,LPUNKNOWN *ppunk)
 {
-    WCHAR           guidbuf[80];
-    HRESULT         ret;
-    LPRUNNINGOBJECTTABLE    runobtable;
-    LPMONIKER       moniker;
+        WCHAR                   guidbuf[80];
+        HRESULT                 ret;
+        LPRUNNINGOBJECTTABLE    runobtable;
+        LPMONIKER               moniker;
 
-    StringFromGUID2(rcid,guidbuf,39);
+        StringFromGUID2(rcid,guidbuf,39);
 #ifdef __WIN32OS2__
         dprintf(("GetActiveObject %ls (%x) %x %x", guidbuf, rcid, preserved, ppunk));
 #endif
-    ret = CreateItemMoniker(pdelimiter,guidbuf,&moniker);
-    if (FAILED(ret))
-        return ret;
-    ret = GetRunningObjectTable(0,&runobtable);
-    if (FAILED(ret)) {
-        IMoniker_Release(moniker);
-        return ret;
-    }
-    ret = IRunningObjectTable_GetObject(runobtable,moniker,ppunk);
-    IRunningObjectTable_Release(runobtable);
-    IMoniker_Release(moniker);
-    return ret;
+        ret = CreateItemMoniker(pdelimiter,guidbuf,&moniker);
+        if (FAILED(ret)) 
+                return ret;
+        ret = GetRunningObjectTable(0,&runobtable);
+        if (FAILED(ret)) {
+                IMoniker_Release(moniker);
+                return ret;
+        }
+        ret = IRunningObjectTable_GetObject(runobtable,moniker,ppunk);
+        IRunningObjectTable_Release(runobtable);
+        IMoniker_Release(moniker);
+        return ret;
 }
 
@@ -101 +101 @@
  *
  * known OLEAUT32.DLL versions:
- * OLE 2.1  NT              1993-95 10     3023
- * OLE 2.1                  10     3027
- * OLE 2.20 W95/NT          1993-96 20     4112
- * OLE 2.20 W95/NT          1993-96 20     4118
- * OLE 2.20 W95/NT          1993-96 20     4122
- * OLE 2.30 W95/NT          1993-98 30     4265
- * OLE 2.40 NT??            1993-98 40     4267
- * OLE 2.40 W98 SE orig. file       1993-98 40     4275
+ * OLE 2.1  NT                          1993-95 10     3023
+ * OLE 2.1                                      10     3027
+ * OLE 2.20 W95/NT                      1993-96 20     4112
+ * OLE 2.20 W95/NT                      1993-96 20     4118
+ * OLE 2.20 W95/NT                      1993-96 20     4122
+ * OLE 2.30 W95/NT                      1993-98 30     4265
+ * OLE 2.40 NT??                        1993-98 40     4267
+ * OLE 2.40 W98 SE orig. file           1993-98 40     4275
  */
 UINT WINAPI OaBuildVersion()
@@ -120 +120 @@
     {
     case 0x80000a03:  /* WIN31 */
-        return MAKELONG(4049, 20); /* from Win32s 1.1e */
+                return MAKELONG(4049, 20); /* from Win32s 1.1e */
     case 0x80000004:  /* WIN95 */
-        return MAKELONG(4265, 30);
+                return MAKELONG(4265, 30);
     case 0x80000a04:  /* WIN98 */
-        return MAKELONG(4275, 40); /* value of W98 SE; orig. W98 AFAIK has 4265, 30 just as W95 */
+                return MAKELONG(4275, 40); /* value of W98 SE; orig. W98 AFAIK has 4265, 30 just as W95 */
     case 0x00003303:  /* NT351 */
-        return MAKELONG(4265, 30); /* value borrowed from Win95 */
+                return MAKELONG(4265, 30); /* value borrowed from Win95 */
     case 0x00000004:  /* NT40 */
 #ifdef __WIN32OS2__
                 return 0x2810b5; //returned by NT4, SP6
 #else
-        return MAKELONG(4122, 20); /* ouch ! Quite old, I guess */
+                return MAKELONG(4122, 20); /* ouch ! Quite old, I guess */
 #endif
     default:
-        ERR("Version value not known yet. Please investigate it !\n");
-        return 0x0;
+                ERR("Version value not known yet. Please investigate it !\n");
+                return 0x0;
     }
 }
@@ -141 +141 @@
 #ifndef __WIN32OS2__
 /***********************************************************************
- *      DllRegisterServer
+ *              DllRegisterServer
  */
-HRESULT WINAPI OLEAUT32_DllRegisterServer() {
+HRESULT WINAPI OLEAUT32_DllRegisterServer() { 
     FIXME("stub!\n");
     return S_OK;
@@ -149 +149 @@
 
 /***********************************************************************
- *      DllUnregisterServer
+ *              DllUnregisterServer
  */
 HRESULT WINAPI OLEAUT32_DllUnregisterServer() {

trunk/src/oleaut32/olefont.c

@@ -46 +46 @@
 {
   /*
-   * This class supports many interfaces. IUnknown, IFont,
+   * This class supports many interfaces. IUnknown, IFont, 
    * IDispatch, IDispFont IPersistStream and IConnectionPointContainer.
    * The first two are supported by the first vtable, the next two are
@@ -85 +85 @@
 
 /*
- * Here, I define utility macros to help with the casting of the
+ * Here, I define utility macros to help with the casting of the 
  * "this" parameter.
  * There is a version to accomodate all of the VTables implemented
@@ -91 +91 @@
  */
 #define _ICOM_THIS(class,name) class* this = (class*)name;
-#define _ICOM_THIS_From_IDispatch(class, name) class* this = (class*)(((char*)name)-sizeof(void*));
-#define _ICOM_THIS_From_IPersistStream(class, name) class* this = (class*)(((char*)name)-2*sizeof(void*));
-#define _ICOM_THIS_From_IConnectionPointContainer(class, name) class* this = (class*)(((char*)name)-3*sizeof(void*));
+#define _ICOM_THIS_From_IDispatch(class, name) class* this = (class*)(((char*)name)-sizeof(void*)); 
+#define _ICOM_THIS_From_IPersistStream(class, name) class* this = (class*)(((char*)name)-2*sizeof(void*)); 
+#define _ICOM_THIS_From_IConnectionPointContainer(class, name) class* this = (class*)(((char*)name)-3*sizeof(void*)); 
 
 
@@ -134 +134 @@
  * interface
  */
-static HRESULT WINAPI OLEFontImpl_IDispatch_QueryInterface(IDispatch* iface,
-                            REFIID     riid,
-                            VOID**     ppvoid);
+static HRESULT WINAPI OLEFontImpl_IDispatch_QueryInterface(IDispatch* iface, 
+                                                    REFIID     riid, 
+                                                    VOID**     ppvoid);
 static ULONG   WINAPI OLEFontImpl_IDispatch_AddRef(IDispatch* iface);
 static ULONG   WINAPI OLEFontImpl_IDispatch_Release(IDispatch* iface);
-static HRESULT WINAPI OLEFontImpl_GetTypeInfoCount(IDispatch*    iface,
-                               unsigned int* pctinfo);
-static HRESULT WINAPI OLEFontImpl_GetTypeInfo(IDispatch*  iface,
-                              UINT      iTInfo,
-                              LCID        lcid,
-                              ITypeInfo** ppTInfo);
+static HRESULT WINAPI OLEFontImpl_GetTypeInfoCount(IDispatch*    iface, 
+                                                   unsigned int* pctinfo);
+static HRESULT WINAPI OLEFontImpl_GetTypeInfo(IDispatch*  iface, 
+                                              UINT      iTInfo,
+                                              LCID        lcid, 
+                                              ITypeInfo** ppTInfo);
 static HRESULT WINAPI OLEFontImpl_GetIDsOfNames(IDispatch*  iface,
-                            REFIID      riid,
-                            LPOLESTR* rgszNames,
-                            UINT      cNames,
-                            LCID        lcid,
-                            DISPID*     rgDispId);
+                                                REFIID      riid, 
+                                                LPOLESTR* rgszNames, 
+                                                UINT      cNames, 
+                                                LCID        lcid,
+                                                DISPID*     rgDispId);
 static HRESULT WINAPI OLEFontImpl_Invoke(IDispatch*  iface,
-                         DISPID      dispIdMember,
-                         REFIID      riid,
-                         LCID        lcid,
-                         WORD        wFlags,
-                         DISPPARAMS* pDispParams,
-                         VARIANT*    pVarResult,
-                         EXCEPINFO*  pExepInfo,
-                         UINT*     puArgErr);
+                                         DISPID      dispIdMember, 
+                                         REFIID      riid, 
+                                         LCID        lcid, 
+                                         WORD        wFlags,
+                                         DISPPARAMS* pDispParams,
+                                         VARIANT*    pVarResult, 
+                                         EXCEPINFO*  pExepInfo,
+                                         UINT*     puArgErr); 
 
 /***********************************************************************
@@ -165 +165 @@
  * interface
  */
-static HRESULT WINAPI OLEFontImpl_IPersistStream_QueryInterface(IPersistStream* iface,
-                            REFIID     riid,
-                            VOID**     ppvoid);
+static HRESULT WINAPI OLEFontImpl_IPersistStream_QueryInterface(IPersistStream* iface, 
+                                                    REFIID     riid, 
+                                                    VOID**     ppvoid);
 static ULONG   WINAPI OLEFontImpl_IPersistStream_AddRef(IPersistStream* iface);
 static ULONG   WINAPI OLEFontImpl_IPersistStream_Release(IPersistStream* iface);
-static HRESULT WINAPI OLEFontImpl_GetClassID(IPersistStream* iface,
-                         CLSID*                pClassID);
+static HRESULT WINAPI OLEFontImpl_GetClassID(IPersistStream* iface, 
+                                             CLSID*                pClassID);
 static HRESULT WINAPI OLEFontImpl_IsDirty(IPersistStream*  iface);
 static HRESULT WINAPI OLEFontImpl_Load(IPersistStream*  iface,
-                       IStream*         pLoadStream);
+                                       IStream*         pLoadStream);
 static HRESULT WINAPI OLEFontImpl_Save(IPersistStream*  iface,
-                       IStream*         pOutStream,
-                       BOOL             fClearDirty);
+                                       IStream*         pOutStream,
+                                       BOOL             fClearDirty); 
 static HRESULT WINAPI OLEFontImpl_GetSizeMax(IPersistStream*  iface,
-                         ULARGE_INTEGER*  pcbSize);
+                                             ULARGE_INTEGER*  pcbSize); 
 
 /***********************************************************************
@@ -186 +186 @@
  */
 static HRESULT WINAPI OLEFontImpl_IConnectionPointContainer_QueryInterface(
-                        IConnectionPointContainer* iface,
-                        REFIID     riid,
-                        VOID**     ppvoid);
+                                            IConnectionPointContainer* iface, 
+                                            REFIID     riid, 
+                                            VOID**     ppvoid);
 static ULONG   WINAPI OLEFontImpl_IConnectionPointContainer_AddRef(
-                        IConnectionPointContainer* iface);
+                                            IConnectionPointContainer* iface);
 static ULONG   WINAPI OLEFontImpl_IConnectionPointContainer_Release(
-                        IConnectionPointContainer* iface);
+                                            IConnectionPointContainer* iface);
 static HRESULT WINAPI OLEFontImpl_EnumConnectionPoints(
-                        IConnectionPointContainer* iface,
-                        IEnumConnectionPoints **ppEnum);
+                                            IConnectionPointContainer* iface,
+                                            IEnumConnectionPoints **ppEnum);
 static HRESULT WINAPI OLEFontImpl_FindConnectionPoint(
-                        IConnectionPointContainer* iface,
-                        REFIID riid,
-                        IConnectionPoint **ppCp);
+                                            IConnectionPointContainer* iface,
+                                            REFIID riid,
+                                            IConnectionPoint **ppCp);
 
 /*
@@ -227 +227 @@
   OLEFontImpl_put_Charset,
   OLEFontImpl_get_hFont,
-  OLEFontImpl_Clone,
+  OLEFontImpl_Clone, 
   OLEFontImpl_IsEqual,
   OLEFontImpl_SetRatio,
@@ -273 +273 @@
 
 /******************************************************************************
- *      OleCreateFontIndirect   [OLEAUT32.420]
+ *              OleCreateFontIndirect   [OLEAUT32.420]
  */
 HRESULT WINAPI OleCreateFontIndirect(
@@ -331 +331 @@
 
   IConnectionPoint_EnumConnections(this->pCP, &pEnum);
-
+  
   while(IEnumConnections_Next(pEnum, 1, &CD, NULL) == S_OK) {
     IPropertyNotifySink *sink;
@@ -343 +343 @@
   return;
 }
-
+  
 /************************************************************************
  * OLEFontImpl_Construct
@@ -364 +364 @@
   if (newObject==0)
     return newObject;
-
+  
   /*
    * Initialize the virtual function table.
@@ -372 +372 @@
   newObject->lpvtbl3 = &OLEFontImpl_IPersistStream_VTable;
   newObject->lpvtbl4 = &OLEFontImpl_IConnectionPointContainer_VTable;
-
-  /*
-   * Start with one reference count. The caller of this function
+  
+  /*
+   * Start with one reference count. The caller of this function 
    * must release the interface pointer when it is done.
    */
@@ -386 +386 @@
   newObject->description.cbSizeofstruct = sizeof(FONTDESC);
   newObject->description.lpstrName = HeapAlloc(GetProcessHeap(),
-                           0,
-                           (lstrlenW(fontDesc->lpstrName)+1) * sizeof(WCHAR));
+                                               0, 
+                                               (lstrlenW(fontDesc->lpstrName)+1) * sizeof(WCHAR));
   strcpyW(newObject->description.lpstrName, fontDesc->lpstrName);
   newObject->description.cySize         = fontDesc->cySize;
@@ -448 +448 @@
   if ( (this==0) || (ppvObject==0) )
     return E_INVALIDARG;
-
+  
   /*
    * Initialize the return parameter.
    */
   *ppvObject = 0;
-
+  
   /*
    * Compare the riid with the interface IDs implemented by this object.
    */
-  if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0)
+  if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) 
   {
     *ppvObject = (IFont*)this;
   }
-  else if (memcmp(&IID_IFont, riid, sizeof(IID_IFont)) == 0)
+  else if (memcmp(&IID_IFont, riid, sizeof(IID_IFont)) == 0) 
   {
     *ppvObject = (IFont*)this;
   }
-  else if (memcmp(&IID_IDispatch, riid, sizeof(IID_IDispatch)) == 0)
+  else if (memcmp(&IID_IDispatch, riid, sizeof(IID_IDispatch)) == 0) 
   {
     *ppvObject = (IDispatch*)&(this->lpvtbl2);
   }
-  else if (memcmp(&IID_IFontDisp, riid, sizeof(IID_IFontDisp)) == 0)
+  else if (memcmp(&IID_IFontDisp, riid, sizeof(IID_IFontDisp)) == 0) 
   {
     *ppvObject = (IDispatch*)&(this->lpvtbl2);
   }
-  else if (memcmp(&IID_IPersistStream, riid, sizeof(IID_IPersistStream)) == 0)
+  else if (memcmp(&IID_IPersistStream, riid, sizeof(IID_IPersistStream)) == 0) 
   {
     *ppvObject = (IPersistStream*)&(this->lpvtbl3);
   }
   else if (memcmp(&IID_IConnectionPointContainer, riid,
-          sizeof(IID_IConnectionPointContainer)) == 0)
+                  sizeof(IID_IConnectionPointContainer)) == 0) 
   {
     *ppvObject = (IPersistStream*)&(this->lpvtbl4);
   }
-
+  
   /*
    * Check that we obtained an interface.
@@ -491 +491 @@
     return E_NOINTERFACE;
   }
-
+  
   /*
    * Query Interface always increases the reference count by one when it is
@@ -500 +500 @@
   return S_OK;;
 }
-
+        
 /************************************************************************
  * OLEFontImpl_AddRef (IUnknown)
@@ -506 +506 @@
  * See Windows documentation for more details on IUnknown methods.
  */
-ULONG WINAPI OLEFontImpl_AddRef(
+ULONG WINAPI OLEFontImpl_AddRef( 
   IFont* iface)
 {
@@ -515 +515 @@
   return this->ref;
 }
-
+        
 /************************************************************************
  * OLEFontImpl_Release (IUnknown)
@@ -521 +521 @@
  * See Windows documentation for more details on IUnknown methods.
  */
-ULONG WINAPI OLEFontImpl_Release(
+ULONG WINAPI OLEFontImpl_Release( 
       IFont* iface)
 {
@@ -541 +541 @@
     return 0;
   }
-
+  
   return this->ref;
 }
-
+        
 /************************************************************************
  * OLEFontImpl_get_Name (IFont)
@@ -551 +551 @@
  */
 static HRESULT WINAPI OLEFontImpl_get_Name(
-  IFont*  iface,
+  IFont*  iface, 
   BSTR* pname)
 {
@@ -576 +576 @@
  */
 static HRESULT WINAPI OLEFontImpl_put_Name(
-  IFont* iface,
+  IFont* iface, 
   BSTR name)
 {
@@ -585 +585 @@
   {
     this->description.lpstrName = HeapAlloc(GetProcessHeap(),
-                        0,
-                        (lstrlenW(name)+1) * sizeof(WCHAR));
+                                            0, 
+                                            (lstrlenW(name)+1) * sizeof(WCHAR));
   }
   else
   {
     this->description.lpstrName = HeapReAlloc(GetProcessHeap(),
-                          0,
-                          this->description.lpstrName,
-                          (lstrlenW(name)+1) * sizeof(WCHAR));
+                                              0, 
+                                              this->description.lpstrName,
+                                              (lstrlenW(name)+1) * sizeof(WCHAR));
   }
 
@@ -611 +611 @@
  */
 static HRESULT WINAPI OLEFontImpl_get_Size(
-  IFont* iface,
+  IFont* iface, 
   CY*    psize)
 {
@@ -635 +635 @@
  */
 static HRESULT WINAPI OLEFontImpl_put_Size(
-  IFont* iface,
+  IFont* iface, 
   CY     size)
 {
@@ -653 +653 @@
  */
 static HRESULT WINAPI OLEFontImpl_get_Bold(
-  IFont*  iface,
+  IFont*  iface, 
   BOOL* pbold)
 {
@@ -692 +692 @@
  */
 static HRESULT WINAPI OLEFontImpl_get_Italic(
-  IFont*  iface,
+  IFont*  iface, 
   BOOL* pitalic)
 {
@@ -714 +714 @@
  */
 static HRESULT WINAPI OLEFontImpl_put_Italic(
-  IFont* iface,
+  IFont* iface, 
   BOOL italic)
 {
@@ -732 +732 @@
  */
 static HRESULT WINAPI OLEFontImpl_get_Underline(
-  IFont*  iface,
+  IFont*  iface, 
   BOOL* punderline)
 {
@@ -773 +773 @@
  */
 static HRESULT WINAPI OLEFontImpl_get_Strikethrough(
-  IFont*  iface,
+  IFont*  iface, 
   BOOL* pstrikethrough)
 {
@@ -796 +796 @@
  */
 static HRESULT WINAPI OLEFontImpl_put_Strikethrough(
- IFont* iface,
+ IFont* iface, 
  BOOL strikethrough)
 {
@@ -814 +814 @@
  */
 static HRESULT WINAPI OLEFontImpl_get_Weight(
-  IFont* iface,
+  IFont* iface, 
   short* pweight)
 {
@@ -837 +837 @@
  */
 static HRESULT WINAPI OLEFontImpl_put_Weight(
-  IFont* iface,
+  IFont* iface, 
   short  weight)
 {
@@ -855 +855 @@
  */
 static HRESULT WINAPI OLEFontImpl_get_Charset(
-  IFont* iface,
+  IFont* iface, 
   short* pcharset)
 {
@@ -878 +878 @@
  */
 static HRESULT WINAPI OLEFontImpl_put_Charset(
-  IFont* iface,
+  IFont* iface, 
   short charset)
 {
@@ -912 +912 @@
     INT      fontHeight;
     CY       cySize;
-
+    
     /*
      * The height of the font returned by the get_Size property is the
@@ -982 +982 @@
    */
   newObject->description.lpstrName = HeapAlloc(
-    GetProcessHeap(),0,
-    (1+strlenW(this->description.lpstrName))*2
+        GetProcessHeap(),0,
+        (1+strlenW(this->description.lpstrName))*2
   );
   /* We need to clone the HFONT too. This is just cut & paste from above */
@@ -994 +994 @@
 
   logFont.lfHeight          = ((fontHeight%10000L)>5000L) ? (-fontHeight/10000L)-1 :
-                                (-fontHeight/10000L);
+                                                            (-fontHeight/10000L);
   logFont.lfItalic          = this->description.fItalic;
   logFont.lfUnderline       = this->description.fUnderline;
@@ -1023 +1023 @@
  */
 static HRESULT WINAPI OLEFontImpl_IsEqual(
-  IFont* iface,
+  IFont* iface, 
   IFont* pFontOther)
 {
@@ -1055 +1055 @@
  */
 static HRESULT      WINAPI OLEFontImpl_QueryTextMetrics(
-  IFont*         iface,
+  IFont*         iface, 
   TEXTMETRICOLE* ptm)
 {
@@ -1068 +1068 @@
  */
 static HRESULT WINAPI OLEFontImpl_AddRefHfont(
-  IFont*  iface,
+  IFont*  iface, 
   HFONT hfont)
 {
@@ -1107 +1107 @@
   {
     DeleteObject(this->gdiFont);
-    this->gdiFont = 0;
+    this->gdiFont = 0; 
   }
 
@@ -1174 +1174 @@
  */
 static HRESULT WINAPI OLEFontImpl_GetTypeInfoCount(
-  IDispatch*    iface,
+  IDispatch*    iface, 
   unsigned int* pctinfo)
 {
@@ -1189 +1189 @@
  */
 static HRESULT WINAPI OLEFontImpl_GetTypeInfo(
-  IDispatch*  iface,
+  IDispatch*  iface, 
   UINT      iTInfo,
-  LCID        lcid,
+  LCID        lcid, 
   ITypeInfo** ppTInfo)
 {
@@ -1207 +1207 @@
 static HRESULT WINAPI OLEFontImpl_GetIDsOfNames(
   IDispatch*  iface,
-  REFIID      riid,
-  LPOLESTR* rgszNames,
-  UINT      cNames,
+  REFIID      riid, 
+  LPOLESTR* rgszNames, 
+  UINT      cNames, 
   LCID        lcid,
   DISPID*     rgDispId)
@@ -1226 +1226 @@
 static HRESULT WINAPI OLEFontImpl_Invoke(
   IDispatch*  iface,
-  DISPID      dispIdMember,
-  REFIID      riid,
-  LCID        lcid,
+  DISPID      dispIdMember, 
+  REFIID      riid, 
+  LCID        lcid, 
   WORD        wFlags,
   DISPPARAMS* pDispParams,
-  VARIANT*    pVarResult,
+  VARIANT*    pVarResult, 
   EXCEPINFO*  pExepInfo,
   UINT*     puArgErr)
@@ -1289 +1289 @@
  */
 static HRESULT WINAPI OLEFontImpl_GetClassID(
-  IPersistStream* iface,
+  IPersistStream* iface, 
   CLSID*                pClassID)
 {
@@ -1343 +1343 @@
 
   _ICOM_THIS_From_IPersistStream(OLEFontImpl, iface);
-
+  
   /*
    * Read the version byte
@@ -1372 +1372 @@
   this->description.fStrikethrough = (bAttributes & FONTPERSIST_STRIKETHROUGH) != 0;
   this->description.fUnderline     = (bAttributes & FONTPERSIST_UNDERLINE) != 0;
-
+    
   /*
    * Weight
@@ -1408 +1408 @@
     HeapFree(GetProcessHeap(), 0, this->description.lpstrName);
 
-  this->description.lpstrName = HEAP_strdupAtoW(GetProcessHeap(),
-                            HEAP_ZERO_MEMORY,
-                            readBuffer);
+  this->description.lpstrName = HEAP_strdupAtoW(GetProcessHeap(), 
+                                                    HEAP_ZERO_MEMORY,
+                                                    readBuffer);
 
   return S_OK;
@@ -1430 +1430 @@
   BYTE  bAttributes;
   BYTE  bStringSize;
-
+  
   _ICOM_THIS_From_IPersistStream(OLEFontImpl, iface);
 
@@ -1459 +1459 @@
   if (this->description.fStrikethrough)
     bAttributes |= FONTPERSIST_STRIKETHROUGH;
-
+  
   if (this->description.fUnderline)
     bAttributes |= FONTPERSIST_UNDERLINE;
@@ -1467 +1467 @@
   if (cbWritten!=1)
     return E_FAIL;
-
+  
   /*
    * Weight
@@ -1499 +1499 @@
   if (bStringSize!=0)
   {
-    writeBuffer = HEAP_strdupWtoA(GetProcessHeap(),
-                  HEAP_ZERO_MEMORY,
-                  this->description.lpstrName);
+    writeBuffer = HEAP_strdupWtoA(GetProcessHeap(), 
+                                  HEAP_ZERO_MEMORY,
+                                  this->description.lpstrName);
 
     if (writeBuffer==0)
@@ -1507 +1507 @@
 
     IStream_Write(pOutStream, writeBuffer, bStringSize, &cbWritten);
-
+    
     HeapFree(GetProcessHeap(), 0, writeBuffer);
 
@@ -1620 +1620 @@
   if(memcmp(riid, &IID_IPropertyNotifySink, sizeof(IID_IPropertyNotifySink)) == 0) {
     return IConnectionPoint_QueryInterface(this->pCP, &IID_IConnectionPoint,
-                       (LPVOID)ppCp);
+                                           (LPVOID)ppCp);
   } else {
     FIXME("Tried to find connection point on %s\n", debugstr_guid(riid));
@@ -1637 +1637 @@
 } IClassFactoryImpl;
 
-static HRESULT WINAPI
+static HRESULT WINAPI 
 SFCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
-    ICOM_THIS(IClassFactoryImpl,iface);
-
-    FIXME("(%p)->(%s,%p),stub!\n",This,debugstr_guid(riid),ppobj);
-    return E_NOINTERFACE;
+        ICOM_THIS(IClassFactoryImpl,iface);
+
+        FIXME("(%p)->(%s,%p),stub!\n",This,debugstr_guid(riid),ppobj);
+        return E_NOINTERFACE;
 }
 
 static ULONG WINAPI
 SFCF_AddRef(LPCLASSFACTORY iface) {
-    ICOM_THIS(IClassFactoryImpl,iface);
-    return ++(This->ref);
+        ICOM_THIS(IClassFactoryImpl,iface);
+        return ++(This->ref);
 }
 
 static ULONG WINAPI SFCF_Release(LPCLASSFACTORY iface) {
-    ICOM_THIS(IClassFactoryImpl,iface);
-    /* static class, won't be  freed */
-    return --(This->ref);
+        ICOM_THIS(IClassFactoryImpl,iface);
+        /* static class, won't be  freed */
+        return --(This->ref);
 }
 
 static HRESULT WINAPI SFCF_CreateInstance(
-    LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj
+        LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj
 ) {
-    ICOM_THIS(IClassFactoryImpl,iface);
-
-    if (IsEqualGUID(riid,&IID_IFont)) {
-        FONTDESC fd;
-
-        WCHAR fname[] = { 'S','y','s','t','e','m',0 };
-
-        fd.cbSizeofstruct = sizeof(fd);
-        fd.lpstrName      = fname;
-        fd.cySize.s.Lo    = 80000;
-        fd.cySize.s.Hi    = 0;
-        fd.sWeight        = 0;
-        fd.sCharset       = 0;
-        fd.fItalic        = 0;
-        fd.fUnderline     = 0;
-        fd.fStrikethrough = 0;
-        return OleCreateFontIndirect(&fd,riid,ppobj);
-    }
-
-    FIXME("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj);
-    return E_NOINTERFACE;
+        ICOM_THIS(IClassFactoryImpl,iface);
+
+        if (IsEqualGUID(riid,&IID_IFont)) {
+            FONTDESC fd;
+
+            WCHAR fname[] = { 'S','y','s','t','e','m',0 };
+
+            fd.cbSizeofstruct = sizeof(fd);
+            fd.lpstrName      = fname;
+            fd.cySize.s.Lo    = 80000;
+            fd.cySize.s.Hi    = 0;
+            fd.sWeight        = 0;
+            fd.sCharset       = 0;
+            fd.fItalic        = 0;
+            fd.fUnderline     = 0;
+            fd.fStrikethrough = 0;
+            return OleCreateFontIndirect(&fd,riid,ppobj);
+        }
+
+        FIXME("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj);
+        return E_NOINTERFACE;
 }
 
 static HRESULT WINAPI SFCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
-    ICOM_THIS(IClassFactoryImpl,iface);
-    FIXME("(%p)->(%d),stub!\n",This,dolock);
-    return S_OK;
+        ICOM_THIS(IClassFactoryImpl,iface);
+        FIXME("(%p)->(%d),stub!\n",This,dolock);
+        return S_OK;
 }
 
 static ICOM_VTABLE(IClassFactory) SFCF_Vtbl = {
-    ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
-    SFCF_QueryInterface,
-    SFCF_AddRef,
-    SFCF_Release,
-    SFCF_CreateInstance,
-    SFCF_LockServer
+        ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+        SFCF_QueryInterface,
+        SFCF_AddRef,
+        SFCF_Release,
+        SFCF_CreateInstance,
+        SFCF_LockServer
 };
 static IClassFactoryImpl STDFONT_CF = {&SFCF_Vtbl, 1 };

trunk/src/oleaut32/olepicture.c

@@ -50 +50 @@
 #ifdef HAVE_LIBJPEG
 /* This is a hack, so jpeglib.h does not redefine INT32 and the like*/
-#define XMD_H
+#define XMD_H 
 #ifdef HAVE_JPEGLIB_H
 # include <jpeglib.h>
@@ -90 +90 @@
   /* We own the object and must destroy it ourselves */
     BOOL fOwn;
-
+  
   /* Picture description */
     PICTDESC desc;
@@ -105 +105 @@
 
     BOOL keepOrigFormat;
-    HDC hDCCur;
+    HDC hDCCur;
 } OLEPictureImpl;
 
@@ -174 +174 @@
   if (newObject==0)
     return newObject;
-
+  
   /*
    * Initialize the virtual function table.
@@ -186 +186 @@
 
   /*
-   * Start with one reference count. The caller of this function
+   * Start with one reference count. The caller of this function 
    * must release the interface pointer when it is done.
    */
-  newObject->ref    = 1;
-  newObject->hDCCur = 0;
-
-  newObject->fOwn   = fOwn;
+  newObject->ref        = 1;
+  newObject->hDCCur     = 0;
+
+  newObject->fOwn       = fOwn;
 
   /* dunno about original value */
@@ -199 +199 @@
   if (pictDesc) {
       if(pictDesc->cbSizeofstruct != sizeof(PICTDESC)) {
-      FIXME("struct size = %d\n", pictDesc->cbSizeofstruct);
+          FIXME("struct size = %d\n", pictDesc->cbSizeofstruct);
       }
       memcpy(&newObject->desc, pictDesc, sizeof(PICTDESC));
@@ -206 +206 @@
       switch(pictDesc->picType) {
       case PICTYPE_BITMAP:
-    OLEPictureImpl_SetBitmap(newObject);
-    break;
+        OLEPictureImpl_SetBitmap(newObject);
+        break;
 
       case PICTYPE_METAFILE:
-    TRACE("metafile handle %08x\n", pictDesc->u.wmf.hmeta);
-    newObject->himetricWidth = pictDesc->u.wmf.xExt;
-    newObject->himetricHeight = pictDesc->u.wmf.yExt;
-    break;
+        TRACE("metafile handle %08x\n", pictDesc->u.wmf.hmeta);
+        newObject->himetricWidth = pictDesc->u.wmf.xExt;
+        newObject->himetricHeight = pictDesc->u.wmf.yExt;
+        break;
 
       case PICTYPE_ICON:
       case PICTYPE_ENHMETAFILE:
       default:
-    FIXME("Unsupported type %d\n", pictDesc->picType);
-    newObject->himetricWidth = newObject->himetricHeight = 0;
-    break;
+        FIXME("Unsupported type %d\n", pictDesc->picType);
+        newObject->himetricWidth = newObject->himetricHeight = 0;
+        break;
       }
   } else {
       newObject->desc.picType = PICTYPE_UNINITIALIZED;
   }
-
+    
   TRACE("returning %p\n", newObject);
   return newObject;
@@ -237 +237 @@
  * this object.  */
 static void OLEPictureImpl_Destroy(OLEPictureImpl* Obj)
-{
+{ 
   TRACE("(%p)\n", Obj);
 
@@ -282 +282 @@
   if ( (This==0) || (ppvObject==0) )
     return E_INVALIDARG;
-
+  
   /*
    * Initialize the return parameter.
    */
   *ppvObject = 0;
-
+  
   /*
    * Compare the riid with the interface IDs implemented by this object.
    */
-  if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0)
+  if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) 
   {
     *ppvObject = (IPicture*)This;
   }
-  else if (memcmp(&IID_IPicture, riid, sizeof(IID_IPicture)) == 0)
+  else if (memcmp(&IID_IPicture, riid, sizeof(IID_IPicture)) == 0) 
   {
     *ppvObject = (IPicture*)This;
   }
-  else if (memcmp(&IID_IDispatch, riid, sizeof(IID_IDispatch)) == 0)
+  else if (memcmp(&IID_IDispatch, riid, sizeof(IID_IDispatch)) == 0) 
   {
     *ppvObject = (IDispatch*)&(This->lpvtbl2);
   }
-  else if (memcmp(&IID_IPictureDisp, riid, sizeof(IID_IPictureDisp)) == 0)
+  else if (memcmp(&IID_IPictureDisp, riid, sizeof(IID_IPictureDisp)) == 0) 
   {
     *ppvObject = (IDispatch*)&(This->lpvtbl2);
   }
-  else if (memcmp(&IID_IPersistStream, riid, sizeof(IID_IPersistStream)) == 0)
+  else if (memcmp(&IID_IPersistStream, riid, sizeof(IID_IPersistStream)) == 0) 
   {
   *ppvObject = (IPersistStream*)&(This->lpvtbl3);
   }
-  else if (memcmp(&IID_IConnectionPointContainer, riid, sizeof(IID_IConnectionPointContainer)) == 0)
+  else if (memcmp(&IID_IConnectionPointContainer, riid, sizeof(IID_IConnectionPointContainer)) == 0) 
   {
   *ppvObject = (IConnectionPointContainer*)&(This->lpvtbl4);
@@ -323 +323 @@
     return E_NOINTERFACE;
   }
-
+  
   /*
    * Query Interface always increases the reference count by one when it is
@@ -362 +362 @@
  * See Windows documentation for more details on IUnknown methods.
  */
-static ULONG WINAPI OLEPictureImpl_AddRef(
+static ULONG WINAPI OLEPictureImpl_AddRef( 
   IPicture* iface)
 {
@@ -371 +371 @@
   return This->ref;
 }
-
+        
 /************************************************************************
  * OLEPictureImpl_Release (IUnknown)
@@ -377 +377 @@
  * See Windows documentation for more details on IUnknown methods.
  */
-static ULONG WINAPI OLEPictureImpl_Release(
+static ULONG WINAPI OLEPictureImpl_Release( 
       IPicture* iface)
 {
@@ -397 +397 @@
     return 0;
   }
-
+  
   return This->ref;
 }
@@ -404 +404 @@
 /************************************************************************
  * OLEPictureImpl_get_Handle
- */
+ */ 
 static HRESULT WINAPI OLEPictureImpl_get_Handle(IPicture *iface,
-                        OLE_HANDLE *phandle)
+                                                OLE_HANDLE *phandle)
 {
   ICOM_THIS(OLEPictureImpl, iface);
@@ -433 +433 @@
 /************************************************************************
  * OLEPictureImpl_get_hPal
- */
+ */ 
 static HRESULT WINAPI OLEPictureImpl_get_hPal(IPicture *iface,
-                          OLE_HANDLE *phandle)
+                                              OLE_HANDLE *phandle)
 {
   ICOM_THIS(OLEPictureImpl, iface);
@@ -444 +444 @@
 /************************************************************************
  * OLEPictureImpl_get_Type
- */
+ */ 
 static HRESULT WINAPI OLEPictureImpl_get_Type(IPicture *iface,
-                          short *ptype)
+                                              short *ptype)
 {
   ICOM_THIS(OLEPictureImpl, iface);
@@ -456 +456 @@
 /************************************************************************
  * OLEPictureImpl_get_Width
- */
+ */ 
 static HRESULT WINAPI OLEPictureImpl_get_Width(IPicture *iface,
-                           OLE_XSIZE_HIMETRIC *pwidth)
+                                               OLE_XSIZE_HIMETRIC *pwidth)
 {
   ICOM_THIS(OLEPictureImpl, iface);
@@ -468 +468 @@
 /************************************************************************
  * OLEPictureImpl_get_Height
- */
+ */ 
 static HRESULT WINAPI OLEPictureImpl_get_Height(IPicture *iface,
-                        OLE_YSIZE_HIMETRIC *pheight)
+                                                OLE_YSIZE_HIMETRIC *pheight)
 {
   ICOM_THIS(OLEPictureImpl, iface);
@@ -480 +480 @@
 /************************************************************************
  * OLEPictureImpl_Render
- */
+ */ 
 static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc,
-                        long x, long y, long cx, long cy,
-                        OLE_XPOS_HIMETRIC xSrc,
-                        OLE_YPOS_HIMETRIC ySrc,
-                        OLE_XSIZE_HIMETRIC cxSrc,
-                        OLE_YSIZE_HIMETRIC cySrc,
-                        LPCRECT prcWBounds)
+                                            long x, long y, long cx, long cy,
+                                            OLE_XPOS_HIMETRIC xSrc,
+                                            OLE_YPOS_HIMETRIC ySrc,
+                                            OLE_XSIZE_HIMETRIC cxSrc,
+                                            OLE_YSIZE_HIMETRIC cySrc,
+                                            LPCRECT prcWBounds)
 {
   ICOM_THIS(OLEPictureImpl, iface);
   TRACE("(%p)->(%08x, (%ld,%ld), (%ld,%ld) <- (%ld,%ld), (%ld,%ld), %p)\n",
-    This, hdc, x, y, cx, cy, xSrc, ySrc, cxSrc, cySrc, prcWBounds);
+        This, hdc, x, y, cx, cy, xSrc, ySrc, cxSrc, cySrc, prcWBounds);
   if(prcWBounds)
     TRACE("prcWBounds (%d,%d) - (%d,%d)\n", prcWBounds->left, prcWBounds->top,
-      prcWBounds->right, prcWBounds->bottom);
+          prcWBounds->right, prcWBounds->bottom);
 
   /*
@@ -542 +542 @@
 /************************************************************************
  * OLEPictureImpl_set_hPal
- */
+ */ 
 static HRESULT WINAPI OLEPictureImpl_set_hPal(IPicture *iface,
-                          OLE_HANDLE hpal)
+                                              OLE_HANDLE hpal)
 {
   ICOM_THIS(OLEPictureImpl, iface);
@@ -554 +554 @@
 /************************************************************************
  * OLEPictureImpl_get_CurDC
- */
+ */ 
 static HRESULT WINAPI OLEPictureImpl_get_CurDC(IPicture *iface,
-                           HDC *phdc)
+                                               HDC *phdc)
 {
   ICOM_THIS(OLEPictureImpl, iface);
@@ -566 +566 @@
 /************************************************************************
  * OLEPictureImpl_SelectPicture
- */
+ */ 
 static HRESULT WINAPI OLEPictureImpl_SelectPicture(IPicture *iface,
-                           HDC hdcIn,
-                           HDC *phdcOut,
-                           OLE_HANDLE *phbmpOut)
+                                                   HDC hdcIn,
+                                                   HDC *phdcOut,
+                                                   OLE_HANDLE *phbmpOut)
 {
   ICOM_THIS(OLEPictureImpl, iface);
@@ -578 +578 @@
 
       if (phdcOut)
-      *phdcOut = This->hDCCur;
+          *phdcOut = This->hDCCur;
       This->hDCCur = hdcIn;
       if (phbmpOut)
-      *phbmpOut = This->desc.u.bmp.hbitmap;
+          *phbmpOut = This->desc.u.bmp.hbitmap;
       return S_OK;
   } else {
@@ -591 +591 @@
 /************************************************************************
  * OLEPictureImpl_get_KeepOriginalFormat
- */
+ */ 
 static HRESULT WINAPI OLEPictureImpl_get_KeepOriginalFormat(IPicture *iface,
-                                BOOL *pfKeep)
+                                                            BOOL *pfKeep)
 {
   ICOM_THIS(OLEPictureImpl, iface);
@@ -605 +605 @@
 /************************************************************************
  * OLEPictureImpl_put_KeepOriginalFormat
- */
+ */ 
 static HRESULT WINAPI OLEPictureImpl_put_KeepOriginalFormat(IPicture *iface,
-                                BOOL keep)
+                                                            BOOL keep)
 {
   ICOM_THIS(OLEPictureImpl, iface);
@@ -618 +618 @@
 /************************************************************************
  * OLEPictureImpl_PictureChanged
- */
+ */ 
 static HRESULT WINAPI OLEPictureImpl_PictureChanged(IPicture *iface)
 {
@@ -629 +629 @@
 /************************************************************************
  * OLEPictureImpl_SaveAsFile
- */
+ */ 
 static HRESULT WINAPI OLEPictureImpl_SaveAsFile(IPicture *iface,
-                        IStream *pstream,
-                        BOOL SaveMemCopy,
-                        LONG *pcbSize)
+                                                IStream *pstream,
+                                                BOOL SaveMemCopy,
+                                                LONG *pcbSize)
 {
   ICOM_THIS(OLEPictureImpl, iface);
@@ -642 +642 @@
 /************************************************************************
  * OLEPictureImpl_get_Attributes
- */
+ */ 
 static HRESULT WINAPI OLEPictureImpl_get_Attributes(IPicture *iface,
-                            DWORD *pdwAttr)
+                                                    DWORD *pdwAttr)
 {
   ICOM_THIS(OLEPictureImpl, iface);
@@ -650 +650 @@
   *pdwAttr = 0;
   switch (This->desc.picType) {
-  case PICTYPE_BITMAP:  break;  /* not 'truely' scalable, see MSDN. */
+  case PICTYPE_BITMAP:  break;  /* not 'truely' scalable, see MSDN. */
   case PICTYPE_ICON: *pdwAttr     = PICTURE_TRANSPARENT;break;
   case PICTYPE_METAFILE: *pdwAttr = PICTURE_TRANSPARENT|PICTURE_SCALABLE;break;
@@ -706 +706 @@
   ICOM_THIS_From_IConnectionPointContainer(OLEPictureImpl, iface);
   TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppCP);
-  if (!ppCP)
+  if (!ppCP) 
       return E_POINTER;
   *ppCP = NULL;
@@ -805 +805 @@
  * Loads the binary data from the IStream. Starts at current position.
  * There appears to be an 2 DWORD header:
- *  DWORD magic;
- *  DWORD len;
+ *      DWORD magic;
+ *      DWORD len;
  *
  * Currently implemented: BITMAP, ICON, JPEG.
  */
 static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) {
-  HRESULT   hr = E_FAIL;
-  ULONG     xread;
-  BYTE      *xbuf;
-  DWORD     header[2];
-  WORD      magic;
+  HRESULT       hr = E_FAIL;
+  ULONG         xread;
+  BYTE          *xbuf;
+  DWORD         header[2];
+  WORD          magic;
   ICOM_THIS_From_IPersistStream(OLEPictureImpl, iface);
 
@@ -828 +828 @@
   xbuf = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,header[1]);
   while (xread < header[1]) {
-    ULONG nread;
+    ULONG nread; 
     hr = IStream_Read(pStm,xbuf+xread,header[1]-xread,&nread);
     xread+=nread;
@@ -841 +841 @@
   case 0xd8ff: { /* JPEG */
 #ifdef HAVE_LIBJPEG
-    struct jpeg_decompress_struct   jd;
-    struct jpeg_error_mgr       jerr;
-    int                 ret;
-    JDIMENSION              x;
-    JSAMPROW                samprow;
-    BITMAPINFOHEADER            bmi;
-    LPBYTE              bits;
-    HDC                 hdcref;
-    struct jpeg_source_mgr      xjsm;
+    struct jpeg_decompress_struct       jd;
+    struct jpeg_error_mgr               jerr;
+    int                                 ret;
+    JDIMENSION                          x;
+    JSAMPROW                            samprow;
+    BITMAPINFOHEADER                    bmi;
+    LPBYTE                              bits;
+    HDC                                 hdcref;
+    struct jpeg_source_mgr              xjsm;
 
     /* This is basically so we can use in-memory data for jpeg decompression.
      * We need to have all the functions.
      */
-    xjsm.next_input_byte    = xbuf;
-    xjsm.bytes_in_buffer    = xread;
-    xjsm.init_source        = _jpeg_init_source;
-    xjsm.fill_input_buffer  = _jpeg_fill_input_buffer;
-    xjsm.skip_input_data    = _jpeg_skip_input_data;
-    xjsm.resync_to_restart  = _jpeg_resync_to_restart;
-    xjsm.term_source        = _jpeg_term_source;
+    xjsm.next_input_byte        = xbuf;
+    xjsm.bytes_in_buffer        = xread;
+    xjsm.init_source            = _jpeg_init_source;
+    xjsm.fill_input_buffer      = _jpeg_fill_input_buffer;
+    xjsm.skip_input_data        = _jpeg_skip_input_data;
+    xjsm.resync_to_restart      = _jpeg_resync_to_restart;
+    xjsm.term_source            = _jpeg_term_source;
 
     jd.err = jpeg_std_error(&jerr);
@@ -868 +868 @@
     jpeg_start_decompress(&jd);
     if (ret != JPEG_HEADER_OK) {
-    ERR("Jpeg image in stream has bad format, read header returned %d.\n",ret);
-    HeapFree(GetProcessHeap(),0,xbuf);
-    return E_FAIL;
+        ERR("Jpeg image in stream has bad format, read header returned %d.\n",ret);
+        HeapFree(GetProcessHeap(),0,xbuf);
+        return E_FAIL;
     }
     bits = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,(jd.output_height+1)*jd.output_width*jd.output_components);
@@ -877 +877 @@
       x = jpeg_read_scanlines(&jd,&samprow,1);
       if (x != 1) {
-    FIXME("failed to read current scanline?\n");
-    break;
+        FIXME("failed to read current scanline?\n");
+        break;
       }
       memcpy( bits+jd.output_scanline*jd.output_width*jd.output_components,
-          samprow,
-              jd.output_width*jd.output_components
+              samprow,
+              jd.output_width*jd.output_components
       );
     }
-    bmi.biSize      = sizeof(bmi);
-    bmi.biWidth     =  jd.output_width;
-    bmi.biHeight    = -jd.output_height;
-    bmi.biPlanes    = 1;
-    bmi.biBitCount  = jd.output_components<<3;
-    bmi.biCompression   = BI_RGB;
-    bmi.biSizeImage = jd.output_height*jd.output_width*jd.output_components;
-    bmi.biXPelsPerMeter = 0;
-    bmi.biYPelsPerMeter = 0;
-    bmi.biClrUsed   = 0;
-    bmi.biClrImportant  = 0;
+    bmi.biSize          = sizeof(bmi);
+    bmi.biWidth         =  jd.output_width;
+    bmi.biHeight        = -jd.output_height;
+    bmi.biPlanes        = 1;
+    bmi.biBitCount      = jd.output_components<<3;
+    bmi.biCompression   = BI_RGB;
+    bmi.biSizeImage     = jd.output_height*jd.output_width*jd.output_components;
+    bmi.biXPelsPerMeter = 0;
+    bmi.biYPelsPerMeter = 0;
+    bmi.biClrUsed       = 0;
+    bmi.biClrImportant  = 0;
 
     HeapFree(GetProcessHeap(),0,samprow);
@@ -902 +902 @@
     hdcref = GetDC(0);
     This->desc.u.bmp.hbitmap=CreateDIBitmap(
-        hdcref,
-        &bmi,
-        CBM_INIT,
-        bits,
-        (BITMAPINFO*)&bmi,
-        DIB_RGB_COLORS
+            hdcref,
+            &bmi,
+            CBM_INIT,
+            bits,
+            (BITMAPINFO*)&bmi,
+            DIB_RGB_COLORS
     );
     DeleteDC(hdcref);
@@ -921 +921 @@
   }
   case 0x4d42: { /* Bitmap */
-    BITMAPFILEHEADER    *bfh = (BITMAPFILEHEADER*)xbuf;
-    BITMAPINFO      *bi = (BITMAPINFO*)(bfh+1);
-    HDC         hdcref;
+    BITMAPFILEHEADER    *bfh = (BITMAPFILEHEADER*)xbuf;
+    BITMAPINFO          *bi = (BITMAPINFO*)(bfh+1);
+    HDC                 hdcref;
 
     /* Does not matter whether this is a coreheader or not, we only use
@@ -930 +930 @@
     hdcref = GetDC(0);
     This->desc.u.bmp.hbitmap = CreateDIBitmap(
-    hdcref,
-    &(bi->bmiHeader),
-    CBM_INIT,
-    xbuf+bfh->bfOffBits,
-    bi,
-    (bi->bmiHeader.biBitCount<=8)?DIB_PAL_COLORS:DIB_RGB_COLORS
+        hdcref,
+        &(bi->bmiHeader),
+        CBM_INIT,
+        xbuf+bfh->bfOffBits,
+        bi,
+        (bi->bmiHeader.biBitCount<=8)?DIB_PAL_COLORS:DIB_RGB_COLORS
     );
     DeleteDC(hdcref);
@@ -945 +945 @@
   case 0x0000: { /* ICON , first word is dwReserved */
     HICON hicon;
-    CURSORICONFILEDIR   *cifd = (CURSORICONFILEDIR*)xbuf;
-    int i;
+    CURSORICONFILEDIR   *cifd = (CURSORICONFILEDIR*)xbuf;
+    int i;
 
     /*
@@ -954 +954 @@
 
     for (i=0;i<cifd->idCount;i++) {
-    FIXME("[%d] width %d\n",i,cifd->idEntries[i].bWidth);
-    FIXME("[%d] height %d\n",i,cifd->idEntries[i].bHeight);
-    FIXME("[%d] bColorCount %d\n",i,cifd->idEntries[i].bColorCount);
-    FIXME("[%d] bReserved %d\n",i,cifd->idEntries[i].bReserved);
-    FIXME("[%d] xHotspot %d\n",i,cifd->idEntries[i].xHotspot);
-    FIXME("[%d] yHotspot %d\n",i,cifd->idEntries[i].yHotspot);
-    FIXME("[%d] dwDIBSize %d\n",i,cifd->idEntries[i].dwDIBSize);
-    FIXME("[%d] dwDIBOffset %d\n",i,cifd->idEntries[i].dwDIBOffset);
+        FIXME("[%d] width %d\n",i,cifd->idEntries[i].bWidth);
+        FIXME("[%d] height %d\n",i,cifd->idEntries[i].bHeight);
+        FIXME("[%d] bColorCount %d\n",i,cifd->idEntries[i].bColorCount);
+        FIXME("[%d] bReserved %d\n",i,cifd->idEntries[i].bReserved);
+        FIXME("[%d] xHotspot %d\n",i,cifd->idEntries[i].xHotspot);
+        FIXME("[%d] yHotspot %d\n",i,cifd->idEntries[i].yHotspot);
+        FIXME("[%d] dwDIBSize %d\n",i,cifd->idEntries[i].dwDIBSize);
+        FIXME("[%d] dwDIBOffset %d\n",i,cifd->idEntries[i].dwDIBOffset);
     }
     */
@@ -969 +969 @@
      */
     if (cifd->idCount!=1) {
-    for (i=0;i<cifd->idCount;i++) {
-        if (cifd->idEntries[i].bWidth == 32)
-        break;
+        for (i=0;i<cifd->idCount;i++) {
+            if (cifd->idEntries[i].bWidth == 32)
+                break;
+        }
+        if (i==cifd->idCount) i=0;
     }
-    if (i==cifd->idCount) i=0;
-    }
 
     hicon = CreateIconFromResourceEx(
-        xbuf+cifd->idEntries[i].dwDIBOffset,
-        cifd->idEntries[i].dwDIBSize,
-        TRUE, /* is icon */
-        0x00030000,
-        cifd->idEntries[i].bWidth,
-        cifd->idEntries[i].bHeight,
-        0
+                xbuf+cifd->idEntries[i].dwDIBOffset,
+                cifd->idEntries[i].dwDIBSize,
+                TRUE, /* is icon */
+                0x00030000,
+                cifd->idEntries[i].bWidth,
+                cifd->idEntries[i].bHeight,
+                0
     );
     if (!hicon) {
-    FIXME("CreateIcon failed.\n");
-    hr = E_FAIL;
+        FIXME("CreateIcon failed.\n");
+        hr = E_FAIL;
     } else {
-    This->desc.picType = PICTYPE_ICON;
-    This->desc.u.icon.hicon = hicon;
-    hr = S_OK;
+        This->desc.picType = PICTYPE_ICON;
+        This->desc.u.icon.hicon = hicon;
+        hr = S_OK;
     }
     break;
@@ -1074 +1074 @@
  */
 static HRESULT WINAPI OLEPictureImpl_GetTypeInfoCount(
-  IDispatch*    iface,
+  IDispatch*    iface, 
   unsigned int* pctinfo)
 {
@@ -1088 +1088 @@
  */
 static HRESULT WINAPI OLEPictureImpl_GetTypeInfo(
-  IDispatch*  iface,
+  IDispatch*  iface, 
   UINT      iTInfo,
-  LCID        lcid,
+  LCID        lcid, 
   ITypeInfo** ppTInfo)
 {
@@ -1105 +1105 @@
 static HRESULT WINAPI OLEPictureImpl_GetIDsOfNames(
   IDispatch*  iface,
-  REFIID      riid,
-  LPOLESTR* rgszNames,
-  UINT      cNames,
+  REFIID      riid, 
+  LPOLESTR* rgszNames, 
+  UINT      cNames, 
   LCID        lcid,
   DISPID*     rgDispId)
@@ -1123 +1123 @@
 static HRESULT WINAPI OLEPictureImpl_Invoke(
   IDispatch*  iface,
-  DISPID      dispIdMember,
-  REFIID      riid,
-  LCID        lcid,
+  DISPID      dispIdMember, 
+  REFIID      riid, 
+  LCID        lcid, 
   WORD        wFlags,
   DISPPARAMS* pDispParams,
-  VARIANT*    pVarResult,
+  VARIANT*    pVarResult, 
   EXCEPINFO*  pExepInfo,
   UINT*     puArgErr)
@@ -1202 +1202 @@
  */
 HRESULT WINAPI OleCreatePictureIndirect(LPPICTDESC lpPictDesc, REFIID riid,
-                    BOOL fOwn, LPVOID *ppvObj )
+                            BOOL fOwn, LPVOID *ppvObj )
 {
   OLEPictureImpl* newPict = NULL;
@@ -1244 +1244 @@
  */
 HRESULT WINAPI OleLoadPicture( LPSTREAM lpstream, LONG lSize, BOOL fRunmode,
-                    REFIID riid, LPVOID *ppvObj )
+                            REFIID riid, LPVOID *ppvObj )
 {
   LPPERSISTSTREAM ps;
-  IPicture  *newpic;
+  IPicture      *newpic;
   HRESULT hr;
 
   TRACE("(%p,%ld,%d,%s,%p), partially implemented.\n",
-    lpstream, lSize, fRunmode, debugstr_guid(riid), ppvObj);
+        lpstream, lSize, fRunmode, debugstr_guid(riid), ppvObj);
 
   hr = OleCreatePictureIndirect(NULL,riid,!fRunmode,(LPVOID*)&newpic);
@@ -1276 +1276 @@
  */
 HRESULT WINAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunmode,
-                    REFIID reed, DWORD xsiz, DWORD ysiz, DWORD flags, LPVOID *ppvObj )
+                            REFIID reed, DWORD xsiz, DWORD ysiz, DWORD flags, LPVOID *ppvObj )
 {
   FIXME("(%p,%ld,%d,%p,%lx,%lx,%lx,%p), not implemented\n",
-    lpstream, lSize, fRunmode, reed, xsiz, ysiz, flags, ppvObj);
+        lpstream, lSize, fRunmode, reed, xsiz, ysiz, flags, ppvObj);
   return S_OK;
 }
-
+ 
 #ifdef __WIN32OS2__
 
@@ -1308 +1308 @@
 // ----------------------------------------------------------------------
 HRESULT WIN32API OleLoadPicturePath
-   (LPOLESTR        szURLorPath,
-    LPUNKNOWN       punkCaller,
-    DWORD           dwReserved,
-    OLE_COLOR       clrReserved,
-    REFIID          riid,
-    LPVOID *        ppvRet )
+   (LPOLESTR            szURLorPath,
+    LPUNKNOWN           punkCaller,
+    DWORD               dwReserved,
+    OLE_COLOR           clrReserved,
+    REFIID              riid,
+    LPVOID *            ppvRet )
 {
     dprintf(("OLEAUT32: OleLoadPicturePath - stub"));

trunk/src/oleaut32/parsedt.c

@@ -26 +26 @@
  *
  * dt.c--
- *    Functions for the built-in type "dt".
+ *        Functions for the built-in type "dt".
  *
  * Copyright (c) 1994, Regents of the University of California
@@ -45 +45 @@
 
 static datetkn *datebsearch(char *key, datetkn *base, unsigned int nel);
-static int  DecodeDate(char *str, int fmask, int *tmask, struct tm * tm);
+static int      DecodeDate(char *str, int fmask, int *tmask, struct tm * tm);
 static int DecodeNumber(int flen, char *field,
-             int fmask, int *tmask, struct tm * tm, double *fsec);
+                         int fmask, int *tmask, struct tm * tm, double *fsec);
 static int DecodeNumberField(int len, char *str,
-                  int fmask, int *tmask, struct tm * tm, double *fsec);
-static int  DecodeSpecial(int field, char *lowtoken, int *val);
+                                  int fmask, int *tmask, struct tm * tm, double *fsec);
+static int      DecodeSpecial(int field, char *lowtoken, int *val);
 static int DecodeTime(char *str, int fmask, int *tmask,
-           struct tm * tm, double *fsec);
-static int  DecodeTimezone(char *str, int *tzp);
+                   struct tm * tm, double *fsec);
+static int      DecodeTimezone(char *str, int *tzp);
 
 #define USE_DATE_CACHE 1
@@ -66 +66 @@
 "Thursday", "Friday", "Saturday", NULL};
 
-/* those three vars are useless, and not even initialized, so
+/* those three vars are useless, and not even initialized, so 
  * I'd rather remove them all (EPP)
  */
-int DateStyle;
-bool    EuroDates;
-int CTimeZone;
+int     DateStyle; 
+bool    EuroDates;
+int     CTimeZone;
 
 #define UTIME_MINYEAR (1901)
@@ -91 +91 @@
 
 /*****************************************************************************
- *   PRIVATE ROUTINES                                                        *
+ *       PRIVATE ROUTINES                                                                                                                *
  *****************************************************************************/
 
 /* definitions for squeezing values into "value" */
-#define ABS_SIGNBIT     (char) 0200
-#define VALMASK         (char) 0177
-#define NEG(n)          ((n)|ABS_SIGNBIT)
-#define SIGNEDCHAR(c)   ((c)&ABS_SIGNBIT? -((c)&VALMASK): (c))
-#define FROMVAL(tp)     (-SIGNEDCHAR((tp)->value) * 10) /* uncompress */
-#define TOVAL(tp, v)    ((tp)->value = ((v) < 0? NEG((-(v))/10): (v)/10))
+#define ABS_SIGNBIT             (char) 0200
+#define VALMASK                 (char) 0177
+#define NEG(n)                  ((n)|ABS_SIGNBIT)
+#define SIGNEDCHAR(c)   ((c)&ABS_SIGNBIT? -((c)&VALMASK): (c))
+#define FROMVAL(tp)             (-SIGNEDCHAR((tp)->value) * 10) /* uncompress */
+#define TOVAL(tp, v)    ((tp)->value = ((v) < 0? NEG((-(v))/10): (v)/10))
 
 /*
@@ -108 +108 @@
  */
 static datetkn datetktbl[] = {
-/*      text            token   lexval */
-    {EARLY, RESERV, DTK_EARLY}, /* "-infinity" reserved for "early time" */
-    {"acsst", DTZ, 63},         /* Cent. Australia */
-    {"acst", TZ, 57},           /* Cent. Australia */
-    {DA_D, ADBC, AD},           /* "ad" for years >= 0 */
-    {"abstime", IGNOREFIELD, 0},        /* "abstime" for pre-v6.1 "Invalid
-                                 * Abstime" */
-    {"adt", DTZ, NEG(18)},      /* Atlantic Daylight Time */
-    {"aesst", DTZ, 66},         /* E. Australia */
-    {"aest", TZ, 60},           /* Australia Eastern Std Time */
-    {"ahst", TZ, 60},           /* Alaska-Hawaii Std Time */
-    {"allballs", RESERV, DTK_ZULU},     /* 00:00:00 */
-    {"am", AMPM, AM},
-    {"apr", MONTH, 4},
-    {"april", MONTH, 4},
-    {"ast", TZ, NEG(24)},       /* Atlantic Std Time (Canada) */
-    {"at", IGNOREFIELD, 0},         /* "at" (throwaway) */
-    {"aug", MONTH, 8},
-    {"august", MONTH, 8},
-    {"awsst", DTZ, 54},         /* W. Australia */
-    {"awst", TZ, 48},           /* W. Australia */
-    {DB_C, ADBC, BC},           /* "bc" for years < 0 */
-    {"bst", TZ, 6},             /* British Summer Time */
-    {"bt", TZ, 18},             /* Baghdad Time */
-    {"cadt", DTZ, 63},          /* Central Australian DST */
-    {"cast", TZ, 57},           /* Central Australian ST */
-    {"cat", TZ, NEG(60)},       /* Central Alaska Time */
-    {"cct", TZ, 48},            /* China Coast */
-    {"cdt", DTZ, NEG(30)},      /* Central Daylight Time */
-    {"cet", TZ, 6},             /* Central European Time */
-    {"cetdst", DTZ, 12},        /* Central European Dayl.Time */
-    {"cst", TZ, NEG(36)},       /* Central Standard Time */
-    {DCURRENT, RESERV, DTK_CURRENT},    /* "current" is always now */
-    {"dec", MONTH, 12},
-    {"december", MONTH, 12},
-    {"dnt", TZ, 6},             /* Dansk Normal Tid */
-    {"dow", RESERV, DTK_DOW},   /* day of week */
-    {"doy", RESERV, DTK_DOY},   /* day of year */
-    {"dst", DTZMOD, 6},
-    {"east", TZ, NEG(60)},      /* East Australian Std Time */
-    {"edt", DTZ, NEG(24)},      /* Eastern Daylight Time */
-    {"eet", TZ, 12},            /* East. Europe, USSR Zone 1 */
-    {"eetdst", DTZ, 18},        /* Eastern Europe */
-    {EPOCH, RESERV, DTK_EPOCH}, /* "epoch" reserved for system epoch time */
+/*              text                    token   lexval */
+        {EARLY, RESERV, DTK_EARLY}, /* "-infinity" reserved for "early time" */
+        {"acsst", DTZ, 63},                     /* Cent. Australia */
+        {"acst", TZ, 57},                       /* Cent. Australia */
+        {DA_D, ADBC, AD},                       /* "ad" for years >= 0 */
+        {"abstime", IGNOREFIELD, 0},            /* "abstime" for pre-v6.1 "Invalid
+                                                                 * Abstime" */
+        {"adt", DTZ, NEG(18)},          /* Atlantic Daylight Time */
+        {"aesst", DTZ, 66},                     /* E. Australia */
+        {"aest", TZ, 60},                       /* Australia Eastern Std Time */
+        {"ahst", TZ, 60},                       /* Alaska-Hawaii Std Time */
+        {"allballs", RESERV, DTK_ZULU},         /* 00:00:00 */
+        {"am", AMPM, AM},
+        {"apr", MONTH, 4},
+        {"april", MONTH, 4},
+        {"ast", TZ, NEG(24)},           /* Atlantic Std Time (Canada) */
+        {"at", IGNOREFIELD, 0},                 /* "at" (throwaway) */
+        {"aug", MONTH, 8},
+        {"august", MONTH, 8},
+        {"awsst", DTZ, 54},                     /* W. Australia */
+        {"awst", TZ, 48},                       /* W. Australia */
+        {DB_C, ADBC, BC},                       /* "bc" for years < 0 */
+        {"bst", TZ, 6},                         /* British Summer Time */
+        {"bt", TZ, 18},                         /* Baghdad Time */
+        {"cadt", DTZ, 63},                      /* Central Australian DST */
+        {"cast", TZ, 57},                       /* Central Australian ST */
+        {"cat", TZ, NEG(60)},           /* Central Alaska Time */
+        {"cct", TZ, 48},                        /* China Coast */
+        {"cdt", DTZ, NEG(30)},          /* Central Daylight Time */
+        {"cet", TZ, 6},                         /* Central European Time */
+        {"cetdst", DTZ, 12},            /* Central European Dayl.Time */
+        {"cst", TZ, NEG(36)},           /* Central Standard Time */
+        {DCURRENT, RESERV, DTK_CURRENT},        /* "current" is always now */
+        {"dec", MONTH, 12},
+        {"december", MONTH, 12},
+        {"dnt", TZ, 6},                         /* Dansk Normal Tid */
+        {"dow", RESERV, DTK_DOW},       /* day of week */
+        {"doy", RESERV, DTK_DOY},       /* day of year */
+        {"dst", DTZMOD, 6},
+        {"east", TZ, NEG(60)},          /* East Australian Std Time */
+        {"edt", DTZ, NEG(24)},          /* Eastern Daylight Time */
+        {"eet", TZ, 12},                        /* East. Europe, USSR Zone 1 */
+        {"eetdst", DTZ, 18},            /* Eastern Europe */
+        {EPOCH, RESERV, DTK_EPOCH}, /* "epoch" reserved for system epoch time */
 #if USE_AUSTRALIAN_RULES
-    {"est", TZ, 60},            /* Australia Eastern Std Time */
+        {"est", TZ, 60},                        /* Australia Eastern Std Time */
 #else
-    {"est", TZ, NEG(30)},       /* Eastern Standard Time */
-#endif
-    {"feb", MONTH, 2},
-    {"february", MONTH, 2},
-    {"fri", DOW, 5},
-    {"friday", DOW, 5},
-    {"fst", TZ, 6},             /* French Summer Time */
-    {"fwt", DTZ, 12},           /* French Winter Time  */
-    {"gmt", TZ, 0},             /* Greenwish Mean Time */
-    {"gst", TZ, 60},            /* Guam Std Time, USSR Zone 9 */
-    {"hdt", DTZ, NEG(54)},      /* Hawaii/Alaska */
-    {"hmt", DTZ, 18},           /* Hellas ? ? */
-    {"hst", TZ, NEG(60)},       /* Hawaii Std Time */
-    {"idle", TZ, 72},           /* Intl. Date Line, East */
-    {"idlw", TZ, NEG(72)},      /* Intl. Date Line,,    est */
-    {LATE, RESERV, DTK_LATE},   /* "infinity" reserved for "late time" */
-    {INVALID, RESERV, DTK_INVALID},     /* "invalid" reserved for invalid
-                                         * time */
-    {"ist", TZ, 12},            /* Israel */
-    {"it", TZ, 22},             /* Iran Time */
-    {"jan", MONTH, 1},
-    {"january", MONTH, 1},
-    {"jst", TZ, 54},            /* Japan Std Time,USSR Zone 8 */
-    {"jt", TZ, 45},             /* Java Time */
-    {"jul", MONTH, 7},
-    {"july", MONTH, 7},
-    {"jun", MONTH, 6},
-    {"june", MONTH, 6},
-    {"kst", TZ, 54},            /* Korea Standard Time */
-    {"ligt", TZ, 60},           /* From Melbourne, Australia */
-    {"mar", MONTH, 3},
-    {"march", MONTH, 3},
-    {"may", MONTH, 5},
-    {"mdt", DTZ, NEG(36)},      /* Mountain Daylight Time */
-    {"mest", DTZ, 12},          /* Middle Europe Summer Time */
-    {"met", TZ, 6},             /* Middle Europe Time */
-    {"metdst", DTZ, 12},        /* Middle Europe Daylight Time */
-    {"mewt", TZ, 6},            /* Middle Europe Winter Time */
-    {"mez", TZ, 6},             /* Middle Europe Zone */
-    {"mon", DOW, 1},
-    {"monday", DOW, 1},
-    {"mst", TZ, NEG(42)},       /* Mountain Standard Time */
-    {"mt", TZ, 51},             /* Moluccas Time */
-    {"ndt", DTZ, NEG(15)},      /* Nfld. Daylight Time */
-    {"nft", TZ, NEG(21)},       /* Newfoundland Standard Time */
-    {"nor", TZ, 6},             /* Norway Standard Time */
-    {"nov", MONTH, 11},
-    {"november", MONTH, 11},
-    {NOW, RESERV, DTK_NOW},     /* current transaction time */
-    {"nst", TZ, NEG(21)},       /* Nfld. Standard Time */
-    {"nt", TZ, NEG(66)},        /* Nome Time */
-    {"nzdt", DTZ, 78},          /* New Zealand Daylight Time */
-    {"nzst", TZ, 72},           /* New Zealand Standard Time */
-    {"nzt", TZ, 72},            /* New Zealand Time */
-    {"oct", MONTH, 10},
-    {"october", MONTH, 10},
-    {"on", IGNOREFIELD, 0},         /* "on" (throwaway) */
-    {"pdt", DTZ, NEG(42)},      /* Pacific Daylight Time */
-    {"pm", AMPM, PM},
-    {"pst", TZ, NEG(48)},       /* Pacific Standard Time */
-    {"sadt", DTZ, 63},          /* S. Australian Dayl. Time */
-    {"sast", TZ, 57},           /* South Australian Std Time */
-    {"sat", DOW, 6},
-    {"saturday", DOW, 6},
-    {"sep", MONTH, 9},
-    {"sept", MONTH, 9},
-    {"september", MONTH, 9},
-    {"set", TZ, NEG(6)},        /* Seychelles Time ?? */
-    {"sst", DTZ, 12},           /* Swedish Summer Time */
-    {"sun", DOW, 0},
-    {"sunday", DOW, 0},
-    {"swt", TZ, 6},             /* Swedish Winter Time  */
-    {"thu", DOW, 4},
-    {"thur", DOW, 4},
-    {"thurs", DOW, 4},
-    {"thursday", DOW, 4},
-    {TODAY, RESERV, DTK_TODAY}, /* midnight */
-    {TOMORROW, RESERV, DTK_TOMORROW},   /* tomorrow midnight */
-    {"tue", DOW, 2},
-    {"tues", DOW, 2},
-    {"tuesday", DOW, 2},
-    {"undefined", RESERV, DTK_INVALID}, /* "undefined" pre-v6.1 invalid
-                                         * time */
-    {"ut", TZ, 0},
-    {"utc", TZ, 0},
-    {"wadt", DTZ, 48},          /* West Australian DST */
-    {"wast", TZ, 42},           /* West Australian Std Time */
-    {"wat", TZ, NEG(6)},        /* West Africa Time */
-    {"wdt", DTZ, 54},           /* West Australian DST */
-    {"wed", DOW, 3},
-    {"wednesday", DOW, 3},
-    {"weds", DOW, 3},
-    {"wet", TZ, 0},             /* Western Europe */
-    {"wetdst", DTZ, 6},         /* Western Europe */
-    {"wst", TZ, 48},            /* West Australian Std Time */
-    {"ydt", DTZ, NEG(48)},      /* Yukon Daylight Time */
-    {YESTERDAY, RESERV, DTK_YESTERDAY}, /* yesterday midnight */
-    {"yst", TZ, NEG(54)},       /* Yukon Standard Time */
-    {"zp4", TZ, NEG(24)},       /* GMT +4  hours. */
-    {"zp5", TZ, NEG(30)},       /* GMT +5  hours. */
-    {"zp6", TZ, NEG(36)},       /* GMT +6  hours. */
-    {"z", RESERV, DTK_ZULU},    /* 00:00:00 */
-    {ZULU, RESERV, DTK_ZULU},   /* 00:00:00 */
+        {"est", TZ, NEG(30)},           /* Eastern Standard Time */
+#endif
+        {"feb", MONTH, 2},
+        {"february", MONTH, 2},
+        {"fri", DOW, 5},
+        {"friday", DOW, 5},
+        {"fst", TZ, 6},                         /* French Summer Time */
+        {"fwt", DTZ, 12},                       /* French Winter Time  */
+        {"gmt", TZ, 0},                         /* Greenwish Mean Time */
+        {"gst", TZ, 60},                        /* Guam Std Time, USSR Zone 9 */
+        {"hdt", DTZ, NEG(54)},          /* Hawaii/Alaska */
+        {"hmt", DTZ, 18},                       /* Hellas ? ? */
+        {"hst", TZ, NEG(60)},           /* Hawaii Std Time */
+        {"idle", TZ, 72},                       /* Intl. Date Line, East */
+        {"idlw", TZ, NEG(72)},          /* Intl. Date Line,,    est */
+        {LATE, RESERV, DTK_LATE},       /* "infinity" reserved for "late time" */
+        {INVALID, RESERV, DTK_INVALID},         /* "invalid" reserved for invalid
+                                                                                 * time */
+        {"ist", TZ, 12},                        /* Israel */
+        {"it", TZ, 22},                         /* Iran Time */
+        {"jan", MONTH, 1},
+        {"january", MONTH, 1},
+        {"jst", TZ, 54},                        /* Japan Std Time,USSR Zone 8 */
+        {"jt", TZ, 45},                         /* Java Time */
+        {"jul", MONTH, 7},
+        {"july", MONTH, 7},
+        {"jun", MONTH, 6},
+        {"june", MONTH, 6},
+        {"kst", TZ, 54},                        /* Korea Standard Time */
+        {"ligt", TZ, 60},                       /* From Melbourne, Australia */
+        {"mar", MONTH, 3},
+        {"march", MONTH, 3},
+        {"may", MONTH, 5},
+        {"mdt", DTZ, NEG(36)},          /* Mountain Daylight Time */
+        {"mest", DTZ, 12},                      /* Middle Europe Summer Time */
+        {"met", TZ, 6},                         /* Middle Europe Time */
+        {"metdst", DTZ, 12},            /* Middle Europe Daylight Time */
+        {"mewt", TZ, 6},                        /* Middle Europe Winter Time */
+        {"mez", TZ, 6},                         /* Middle Europe Zone */
+        {"mon", DOW, 1},
+        {"monday", DOW, 1},
+        {"mst", TZ, NEG(42)},           /* Mountain Standard Time */
+        {"mt", TZ, 51},                         /* Moluccas Time */
+        {"ndt", DTZ, NEG(15)},          /* Nfld. Daylight Time */
+        {"nft", TZ, NEG(21)},           /* Newfoundland Standard Time */
+        {"nor", TZ, 6},                         /* Norway Standard Time */
+        {"nov", MONTH, 11},
+        {"november", MONTH, 11},
+        {NOW, RESERV, DTK_NOW},         /* current transaction time */
+        {"nst", TZ, NEG(21)},           /* Nfld. Standard Time */
+        {"nt", TZ, NEG(66)},            /* Nome Time */
+        {"nzdt", DTZ, 78},                      /* New Zealand Daylight Time */
+        {"nzst", TZ, 72},                       /* New Zealand Standard Time */
+        {"nzt", TZ, 72},                        /* New Zealand Time */
+        {"oct", MONTH, 10},
+        {"october", MONTH, 10},
+        {"on", IGNOREFIELD, 0},                 /* "on" (throwaway) */
+        {"pdt", DTZ, NEG(42)},          /* Pacific Daylight Time */
+        {"pm", AMPM, PM},
+        {"pst", TZ, NEG(48)},           /* Pacific Standard Time */
+        {"sadt", DTZ, 63},                      /* S. Australian Dayl. Time */
+        {"sast", TZ, 57},                       /* South Australian Std Time */
+        {"sat", DOW, 6},
+        {"saturday", DOW, 6},
+        {"sep", MONTH, 9},
+        {"sept", MONTH, 9},
+        {"september", MONTH, 9},
+        {"set", TZ, NEG(6)},            /* Seychelles Time ?? */
+        {"sst", DTZ, 12},                       /* Swedish Summer Time */
+        {"sun", DOW, 0},
+        {"sunday", DOW, 0},
+        {"swt", TZ, 6},                         /* Swedish Winter Time  */
+        {"thu", DOW, 4},
+        {"thur", DOW, 4},
+        {"thurs", DOW, 4},
+        {"thursday", DOW, 4},
+        {TODAY, RESERV, DTK_TODAY}, /* midnight */
+        {TOMORROW, RESERV, DTK_TOMORROW},       /* tomorrow midnight */
+        {"tue", DOW, 2},
+        {"tues", DOW, 2},
+        {"tuesday", DOW, 2},
+        {"undefined", RESERV, DTK_INVALID}, /* "undefined" pre-v6.1 invalid
+                                                                                 * time */
+        {"ut", TZ, 0},
+        {"utc", TZ, 0},
+        {"wadt", DTZ, 48},                      /* West Australian DST */
+        {"wast", TZ, 42},                       /* West Australian Std Time */
+        {"wat", TZ, NEG(6)},            /* West Africa Time */
+        {"wdt", DTZ, 54},                       /* West Australian DST */
+        {"wed", DOW, 3},
+        {"wednesday", DOW, 3},
+        {"weds", DOW, 3},
+        {"wet", TZ, 0},                         /* Western Europe */
+        {"wetdst", DTZ, 6},                     /* Western Europe */
+        {"wst", TZ, 48},                        /* West Australian Std Time */
+        {"ydt", DTZ, NEG(48)},          /* Yukon Daylight Time */
+        {YESTERDAY, RESERV, DTK_YESTERDAY}, /* yesterday midnight */
+        {"yst", TZ, NEG(54)},           /* Yukon Standard Time */
+        {"zp4", TZ, NEG(24)},           /* GMT +4  hours. */
+        {"zp5", TZ, NEG(30)},           /* GMT +5  hours. */
+        {"zp6", TZ, NEG(36)},           /* GMT +6  hours. */
+        {"z", RESERV, DTK_ZULU},        /* 00:00:00 */
+        {ZULU, RESERV, DTK_ZULU},       /* 00:00:00 */
 };
 
@@ -275 +275 @@
  * Calendar time to Julian date conversions.
  * Julian date is commonly used in astronomical applications,
- *  since it is numerically accurate and computationally simple.
+ *      since it is numerically accurate and computationally simple.
  * The algorithms here will accurately convert between Julian day
- *  and calendar date for all non-negative Julian days
- *  (i.e. from Nov 23, -4713 on).
+ *      and calendar date for all non-negative Julian days
+ *      (i.e. from Nov 23, -4713 on).
  *
  * Ref: Explanatory Supplement to the Astronomical Almanac, 1992.
- *  University Science Books, 20 Edgehill Rd. Mill Valley CA 94941.
+ *      University Science Books, 20 Edgehill Rd. Mill Valley CA 94941.
  *
  * Use the algorithm by Henry Fliegel, a former NASA/JPL colleague
- *  now at Aerospace Corp. (hi, Henry!)
+ *      now at Aerospace Corp. (hi, Henry!)
  *
  * These routines will be used by other date/time packages - tgl 97/02/25
@@ -290 +290 @@
 
 /* Set the minimum year to one greater than the year of the first valid day
- *  to avoid having to check year and day both. - tgl 97/05/08
+ *      to avoid having to check year and day both. - tgl 97/05/08
  */
 
@@ -304 +304 @@
 date2j(int y, int m, int d)
 {
-    int         m12 = (m - 14) / 12;
-
-    return ((1461 * (y + 4800 + m12)) / 4 + (367 * (m - 2 - 12 * (m12))) / 12
-            - (3 * ((y + 4900 + m12) / 100)) / 4 + d - 32075);
-}   /* date2j() */
+        int                     m12 = (m - 14) / 12;
+
+        return ((1461 * (y + 4800 + m12)) / 4 + (367 * (m - 2 - 12 * (m12))) / 12
+                        - (3 * ((y + 4900 + m12) / 100)) / 4 + d - 32075);
+}       /* date2j() */
 
 void
 j2date(int jd, int *year, int *month, int *day)
 {
-    int         j,
-                y,
-                m,
-                d;
-
-    int         i,
-                l,
-                n;
-
-    l = jd + 68569;
-    n = (4 * l) / 146097;
-    l -= (146097 * n + 3) / 4;
-    i = (4000 * (l + 1)) / 1461001;
-    l += 31 - (1461 * i) / 4;
-    j = (80 * l) / 2447;
-    d = l - (2447 * j) / 80;
-    l = j / 11;
-    m = (j + 2) - (12 * l);
-    y = 100 * (n - 49) + i + l;
-
-    *year = y;
-    *month = m;
-    *day = d;
-    return;
-}   /* j2date() */
+        int                     j,
+                                y,
+                                m,
+                                d;
+
+        int                     i,
+                                l,
+                                n;
+
+        l = jd + 68569;
+        n = (4 * l) / 146097;
+        l -= (146097 * n + 3) / 4;
+        i = (4000 * (l + 1)) / 1461001;
+        l += 31 - (1461 * i) / 4;
+        j = (80 * l) / 2447;
+        d = l - (2447 * j) / 80;
+        l = j / 11;
+        m = (j + 2) - (12 * l);
+        y = 100 * (n - 49) + i + l;
+
+        *year = y;
+        *month = m;
+        *day = d;
+        return;
+}       /* j2date() */
 
 
@@ -353 +353 @@
 int
 ParseDateTime(char *timestr, char *lowstr,
-              char **field, int *ftype, int maxfields, int *numfields)
+                          char **field, int *ftype, int maxfields, int *numfields)
 {
-    int         nf = 0;
-    char       *cp = timestr;
-    char       *lp = lowstr;
-
-#ifdef DATEDEBUG
-    printf("ParseDateTime- input string is %s\n", timestr);
-#endif
-    /* outer loop through fields */
-    while (*cp != '\0')
-    {
-        field[nf] = lp;
-
-        /* leading digit? then date or time */
-        if (isdigit(*cp) || (*cp == '.'))
-        {
-            *lp++ = *cp++;
-            while (isdigit(*cp))
-                *lp++ = *cp++;
-            /* time field? */
-            if (*cp == ':')
-            {
-                ftype[nf] = DTK_TIME;
-                while (isdigit(*cp) || (*cp == ':') || (*cp == '.'))
-                    *lp++ = *cp++;
-
-            }
-            /* date field? allow embedded text month */
-            else if ((*cp == '-') || (*cp == '/') || (*cp == '.'))
-            {
-                ftype[nf] = DTK_DATE;
-                while (isalnum(*cp) || (*cp == '-') || (*cp == '/') || (*cp == '.'))
-                    *lp++ = tolower(*cp++);
-
-            }
-
-            /*
-             * otherwise, number only and will determine year, month, or
-             * day later
-             */
-            else
-                ftype[nf] = DTK_NUMBER;
-
-        }
-
-        /*
-         * text? then date string, month, day of week, special, or
-         * timezone
-         */
-        else if (isalpha(*cp))
-        {
-            ftype[nf] = DTK_STRING;
-            *lp++ = tolower(*cp++);
-            while (isalpha(*cp))
-                *lp++ = tolower(*cp++);
-
-            /* full date string with leading text month? */
-            if ((*cp == '-') || (*cp == '/') || (*cp == '.'))
-            {
-                ftype[nf] = DTK_DATE;
-                while (isdigit(*cp) || (*cp == '-') || (*cp == '/') || (*cp == '.'))
-                    *lp++ = tolower(*cp++);
-            }
-
-            /* skip leading spaces */
-        }
-        else if (isspace(*cp))
-        {
-            cp++;
-            continue;
-
-            /* sign? then special or numeric timezone */
-        }
-        else if ((*cp == '+') || (*cp == '-'))
-        {
-            *lp++ = *cp++;
-            /* soak up leading whitespace */
-            while (isspace(*cp))
-                cp++;
-            /* numeric timezone? */
-            if (isdigit(*cp))
-            {
-                ftype[nf] = DTK_TZ;
-                *lp++ = *cp++;
-                while (isdigit(*cp) || (*cp == ':'))
-                    *lp++ = *cp++;
-
-                /* special? */
-            }
-            else if (isalpha(*cp))
-            {
-                ftype[nf] = DTK_SPECIAL;
-                *lp++ = tolower(*cp++);
-                while (isalpha(*cp))
-                    *lp++ = tolower(*cp++);
-
-                /* otherwise something wrong... */
-            }
-            else
-                return -1;
-
-            /* ignore punctuation but use as delimiter */
-        }
-        else if (ispunct(*cp))
-        {
-            cp++;
-            continue;
-
-        }
-        else
-            return -1;
-
-        /* force in a delimiter */
-        *lp++ = '\0';
-        nf++;
-        if (nf > MAXDATEFIELDS)
-            return -1;
-#ifdef DATEDEBUG
-        printf("ParseDateTime- set field[%d] to %s type %d\n", (nf - 1), field[nf - 1], ftype[nf - 1]);
-#endif
-    }
-
-    *numfields = nf;
-
-    return 0;
-}   /* ParseDateTime() */
+        int                     nf = 0;
+        char       *cp = timestr;
+        char       *lp = lowstr;
+
+#ifdef DATEDEBUG
+        printf("ParseDateTime- input string is %s\n", timestr);
+#endif
+        /* outer loop through fields */
+        while (*cp != '\0')
+        {
+                field[nf] = lp;
+
+                /* leading digit? then date or time */
+                if (isdigit(*cp) || (*cp == '.'))
+                {
+                        *lp++ = *cp++;
+                        while (isdigit(*cp))
+                                *lp++ = *cp++;
+                        /* time field? */
+                        if (*cp == ':')
+                        {
+                                ftype[nf] = DTK_TIME;
+                                while (isdigit(*cp) || (*cp == ':') || (*cp == '.'))
+                                        *lp++ = *cp++;
+
+                        }
+                        /* date field? allow embedded text month */
+                        else if ((*cp == '-') || (*cp == '/') || (*cp == '.'))
+                        {
+                                ftype[nf] = DTK_DATE;
+                                while (isalnum(*cp) || (*cp == '-') || (*cp == '/') || (*cp == '.'))
+                                        *lp++ = tolower(*cp++);
+
+                        }
+
+                        /*
+                         * otherwise, number only and will determine year, month, or
+                         * day later
+                         */
+                        else
+                                ftype[nf] = DTK_NUMBER;
+
+                }
+
+                /*
+                 * text? then date string, month, day of week, special, or
+                 * timezone
+                 */
+                else if (isalpha(*cp))
+                {
+                        ftype[nf] = DTK_STRING;
+                        *lp++ = tolower(*cp++);
+                        while (isalpha(*cp))
+                                *lp++ = tolower(*cp++);
+
+                        /* full date string with leading text month? */
+                        if ((*cp == '-') || (*cp == '/') || (*cp == '.'))
+                        {
+                                ftype[nf] = DTK_DATE;
+                                while (isdigit(*cp) || (*cp == '-') || (*cp == '/') || (*cp == '.'))
+                                        *lp++ = tolower(*cp++);
+                        }
+
+                        /* skip leading spaces */
+                }
+                else if (isspace(*cp))
+                {
+                        cp++;
+                        continue;
+
+                        /* sign? then special or numeric timezone */
+                }
+                else if ((*cp == '+') || (*cp == '-'))
+                {
+                        *lp++ = *cp++;
+                        /* soak up leading whitespace */
+                        while (isspace(*cp))
+                                cp++;
+                        /* numeric timezone? */
+                        if (isdigit(*cp))
+                        {
+                                ftype[nf] = DTK_TZ;
+                                *lp++ = *cp++;
+                                while (isdigit(*cp) || (*cp == ':'))
+                                        *lp++ = *cp++;
+
+                                /* special? */
+                        }
+                        else if (isalpha(*cp))
+                        {
+                                ftype[nf] = DTK_SPECIAL;
+                                *lp++ = tolower(*cp++);
+                                while (isalpha(*cp))
+                                        *lp++ = tolower(*cp++);
+
+                                /* otherwise something wrong... */
+                        }
+                        else
+                                return -1;
+
+                        /* ignore punctuation but use as delimiter */
+                }
+                else if (ispunct(*cp))
+                {
+                        cp++;
+                        continue;
+
+                }
+                else
+                        return -1;
+
+                /* force in a delimiter */
+                *lp++ = '\0';
+                nf++;
+                if (nf > MAXDATEFIELDS)
+                        return -1;
+#ifdef DATEDEBUG
+                printf("ParseDateTime- set field[%d] to %s type %d\n", (nf - 1), field[nf - 1], ftype[nf - 1]);
+#endif
+        }
+
+        *numfields = nf;
+
+        return 0;
+}       /* ParseDateTime() */
 
 
@@ -485 +485 @@
  * Interpret previously parsed fields for general date and time.
  * Return 0 if full date, 1 if only time, and -1 if problems.
- *      External format(s):
- *              "<weekday> <month>-<day>-<year> <hour>:<minute>:<second>"
- *              "Fri Feb-7-1997 15:23:27"
- *              "Feb-7-1997 15:23:27"
- *              "2-7-1997 15:23:27"
- *              "1997-2-7 15:23:27"
- *              "1997.038 15:23:27"     (day of year 1-366)
- *      Also supports input in compact time:
- *              "970207 152327"
- *              "97038 152327"
+ *              External format(s):
+ *                              "<weekday> <month>-<day>-<year> <hour>:<minute>:<second>"
+ *                              "Fri Feb-7-1997 15:23:27"
+ *                              "Feb-7-1997 15:23:27"
+ *                              "2-7-1997 15:23:27"
+ *                              "1997-2-7 15:23:27"
+ *                              "1997.038 15:23:27"             (day of year 1-366)
+ *              Also supports input in compact time:
+ *                              "970207 152327"
+ *                              "97038 152327"
  *
  * Use the system-provided functions to get the current time zone
- *  if not specified in the input string.
+ *      if not specified in the input string.
  * If the date is outside the time_t system-supported time range,
- *  then assume GMT time zone. - tgl 97/05/27
+ *      then assume GMT time zone. - tgl 97/05/27
  */
 int
 DecodeDateTime(char **field, int *ftype, int nf,
-               int *dtype, struct tm * tm, double *fsec, int *tzp)
+                           int *dtype, struct tm * tm, double *fsec, int *tzp)
 {
-    int         fmask = 0,
-                tmask,
-                type;
-    int         i;
-    int         flen,
-                val;
-    int         mer = HR24;
-    int         bc = FALSE;
-
-    *dtype = DTK_DATE;
-    tm->tm_hour = 0;
-    tm->tm_min = 0;
-    tm->tm_sec = 0;
-    *fsec = 0;
-    tm->tm_isdst = -1;          /* don't know daylight savings time status
-                                 * apriori */
-    if (tzp != NULL)
-        *tzp = 0;
-
-    for (i = 0; i < nf; i++)
-    {
-#ifdef DATEDEBUG
-        printf("DecodeDateTime- field[%d] is %s (type %d)\n", i, field[i], ftype[i]);
-#endif
-        switch (ftype[i])
-        {
-            case DTK_DATE:
-                if (DecodeDate(field[i], fmask, &tmask, tm) != 0)
-                    return -1;
-                break;
-
-            case DTK_TIME:
-                if (DecodeTime(field[i], fmask, &tmask, tm, fsec) != 0)
-                    return -1;
-
-                /*
-                 * check upper limit on hours; other limits checked in
-                 * DecodeTime()
-                 */
-                if (tm->tm_hour > 23)
-                    return -1;
-                break;
-
-            case DTK_TZ:
-                if (tzp == NULL)
-                    return -1;
-                if (DecodeTimezone(field[i], tzp) != 0)
-                    return -1;
-                tmask = DTK_M(TZ);
-                break;
-
-            case DTK_NUMBER:
-                flen = strlen(field[i]);
-
-                if (flen > 4)
-                {
-                    if (DecodeNumberField(flen, field[i], fmask, &tmask, tm, fsec) != 0)
-                        return -1;
-
-                }
-                else
-                {
-                    if (DecodeNumber(flen, field[i], fmask, &tmask, tm, fsec) != 0)
-                        return -1;
-                }
-                break;
-
-            case DTK_STRING:
-            case DTK_SPECIAL:
-                type = DecodeSpecial(i, field[i], &val);
-#ifdef DATEDEBUG
-                printf("DecodeDateTime- special field[%d] %s type=%d value=%d\n", i, field[i], type, val);
-#endif
-                if (type == IGNOREFIELD)
-                    continue;
-
-                tmask = DTK_M(type);
-                switch (type)
-                {
-                    case RESERV:
-#ifdef DATEDEBUG
-                        printf("DecodeDateTime- RESERV field %s value is %d\n", field[i], val);
-#endif
-                        switch (val)
-                        {
-
-                            default:
-                                *dtype = val;
-                        }
-
-                        break;
-
-                    case MONTH:
-#ifdef DATEDEBUG
-                        printf("DecodeDateTime- month field %s value is %d\n", field[i], val);
-#endif
-                        tm->tm_mon = val;
-                        break;
-
-                        /*
-                         * daylight savings time modifier (solves "MET
-                         * DST" syntax)
-                         */
-                    case DTZMOD:
-                        tmask |= DTK_M(DTZ);
-                        tm->tm_isdst = 1;
-                        if (tzp == NULL)
-                            return -1;
-                        *tzp += val * 60;
-                        break;
-
-                    case DTZ:
-
-                        /*
-                         * set mask for TZ here _or_ check for DTZ later
-                         * when getting default timezone
-                         */
-                        tmask |= DTK_M(TZ);
-                        tm->tm_isdst = 1;
-                        if (tzp == NULL)
-                            return -1;
-                        *tzp = val * 60;
-                        break;
-
-                    case TZ:
-                        tm->tm_isdst = 0;
-                        if (tzp == NULL)
-                            return -1;
-                        *tzp = val * 60;
-                        break;
-
-                    case IGNOREFIELD:
-                        break;
-
-                    case AMPM:
-                        mer = val;
-                        break;
-
-                    case ADBC:
-                        bc = (val == BC);
-                        break;
-
-                    case DOW:
-                        tm->tm_wday = val;
-                        break;
-
-                    default:
-                        return -1;
-                }
-                break;
-
-            default:
-                return -1;
-        }
-
-#ifdef DATEDEBUG
-        printf("DecodeDateTime- field[%d] %s (%08x/%08x) value is %d\n",
-               i, field[i], fmask, tmask, val);
-#endif
-
-        if (tmask & fmask)
-            return -1;
-        fmask |= tmask;
-    }
-
-    /* there is no year zero in AD/BC notation; i.e. "1 BC" == year 0 */
-    if (bc)
-        tm->tm_year = -(tm->tm_year - 1);
-
-    if ((mer != HR24) && (tm->tm_hour > 12))
-        return -1;
-    if ((mer == AM) && (tm->tm_hour == 12))
-        tm->tm_hour = 0;
-    else if ((mer == PM) && (tm->tm_hour != 12))
-        tm->tm_hour += 12;
-
-#ifdef DATEDEBUG
-    printf("DecodeDateTime- mask %08x (%08x)", fmask, DTK_DATE_M);
-    printf(" set y%04d m%02d d%02d", tm->tm_year, tm->tm_mon, tm->tm_mday);
-    printf(" %02d:%02d:%02d\n", tm->tm_hour, tm->tm_min, tm->tm_sec);
-#endif
-
-    if ((*dtype == DTK_DATE) && ((fmask & DTK_DATE_M) != DTK_DATE_M))
-        return ((fmask & DTK_TIME_M) == DTK_TIME_M) ? 1 : -1;
-
-    /* timezone not specified? then find local timezone if possible */
-    if ((*dtype == DTK_DATE) && ((fmask & DTK_DATE_M) == DTK_DATE_M)
-        && (tzp != NULL) && (!(fmask & DTK_M(TZ))))
-    {
-
-        /*
-         * daylight savings time modifier but no standard timezone? then
-         * error
-         */
-        if (fmask & DTK_M(DTZMOD))
-            return -1;
-
-        if (IS_VALID_UTIME(tm->tm_year, tm->tm_mon, tm->tm_mday))
-        {
+        int                     fmask = 0,
+                                tmask,
+                                type;
+        int                     i;
+        int                     flen,
+                                val;
+        int                     mer = HR24;
+        int                     bc = FALSE;
+
+        *dtype = DTK_DATE;
+        tm->tm_hour = 0;
+        tm->tm_min = 0;
+        tm->tm_sec = 0;
+        *fsec = 0;
+        tm->tm_isdst = -1;                      /* don't know daylight savings time status
+                                                                 * apriori */
+        if (tzp != NULL)
+                *tzp = 0;
+
+        for (i = 0; i < nf; i++)
+        {
+#ifdef DATEDEBUG
+                printf("DecodeDateTime- field[%d] is %s (type %d)\n", i, field[i], ftype[i]);
+#endif
+                switch (ftype[i])
+                {
+                        case DTK_DATE:
+                                if (DecodeDate(field[i], fmask, &tmask, tm) != 0)
+                                        return -1;
+                                break;
+
+                        case DTK_TIME:
+                                if (DecodeTime(field[i], fmask, &tmask, tm, fsec) != 0)
+                                        return -1;
+
+                                /*
+                                 * check upper limit on hours; other limits checked in
+                                 * DecodeTime()
+                                 */
+                                if (tm->tm_hour > 23)
+                                        return -1;
+                                break;
+
+                        case DTK_TZ:
+                                if (tzp == NULL)
+                                        return -1;
+                                if (DecodeTimezone(field[i], tzp) != 0)
+                                        return -1;
+                                tmask = DTK_M(TZ);
+                                break;
+
+                        case DTK_NUMBER:
+                                flen = strlen(field[i]);
+
+                                if (flen > 4)
+                                {
+                                        if (DecodeNumberField(flen, field[i], fmask, &tmask, tm, fsec) != 0)
+                                                return -1;
+
+                                }
+                                else
+                                {
+                                        if (DecodeNumber(flen, field[i], fmask, &tmask, tm, fsec) != 0)
+                                                return -1;
+                                }
+                                break;
+
+                        case DTK_STRING:
+                        case DTK_SPECIAL:
+                                type = DecodeSpecial(i, field[i], &val);
+#ifdef DATEDEBUG
+                                printf("DecodeDateTime- special field[%d] %s type=%d value=%d\n", i, field[i], type, val);
+#endif
+                                if (type == IGNOREFIELD)
+                                        continue;
+
+                                tmask = DTK_M(type);
+                                switch (type)
+                                {
+                                        case RESERV:
+#ifdef DATEDEBUG
+                                                printf("DecodeDateTime- RESERV field %s value is %d\n", field[i], val);
+#endif
+                                                switch (val)
+                                                {
+
+                                                        default:
+                                                                *dtype = val;
+                                                }
+
+                                                break;
+
+                                        case MONTH:
+#ifdef DATEDEBUG
+                                                printf("DecodeDateTime- month field %s value is %d\n", field[i], val);
+#endif
+                                                tm->tm_mon = val;
+                                                break;
+
+                                                /*
+                                                 * daylight savings time modifier (solves "MET
+                                                 * DST" syntax)
+                                                 */
+                                        case DTZMOD:
+                                                tmask |= DTK_M(DTZ);
+                                                tm->tm_isdst = 1;
+                                                if (tzp == NULL)
+                                                        return -1;
+                                                *tzp += val * 60;
+                                                break;
+
+                                        case DTZ:
+
+                                                /*
+                                                 * set mask for TZ here _or_ check for DTZ later
+                                                 * when getting default timezone
+                                                 */
+                                                tmask |= DTK_M(TZ);
+                                                tm->tm_isdst = 1;
+                                                if (tzp == NULL)
+                                                        return -1;
+                                                *tzp = val * 60;
+                                                break;
+
+                                        case TZ:
+                                                tm->tm_isdst = 0;
+                                                if (tzp == NULL)
+                                                        return -1;
+                                                *tzp = val * 60;
+                                                break;
+
+                                        case IGNOREFIELD:
+                                                break;
+
+                                        case AMPM:
+                                                mer = val;
+                                                break;
+
+                                        case ADBC:
+                                                bc = (val == BC);
+                                                break;
+
+                                        case DOW:
+                                                tm->tm_wday = val;
+                                                break;
+
+                                        default:
+                                                return -1;
+                                }
+                                break;
+
+                        default:
+                                return -1;
+                }
+
+#ifdef DATEDEBUG
+                printf("DecodeDateTime- field[%d] %s (%08x/%08x) value is %d\n",
+                           i, field[i], fmask, tmask, val);
+#endif
+
+                if (tmask & fmask)
+                        return -1;
+                fmask |= tmask;
+        }
+
+        /* there is no year zero in AD/BC notation; i.e. "1 BC" == year 0 */
+        if (bc)
+                tm->tm_year = -(tm->tm_year - 1);
+
+        if ((mer != HR24) && (tm->tm_hour > 12))
+                return -1;
+        if ((mer == AM) && (tm->tm_hour == 12))
+                tm->tm_hour = 0;
+        else if ((mer == PM) && (tm->tm_hour != 12))
+                tm->tm_hour += 12;
+
+#ifdef DATEDEBUG
+        printf("DecodeDateTime- mask %08x (%08x)", fmask, DTK_DATE_M);
+        printf(" set y%04d m%02d d%02d", tm->tm_year, tm->tm_mon, tm->tm_mday);
+        printf(" %02d:%02d:%02d\n", tm->tm_hour, tm->tm_min, tm->tm_sec);
+#endif
+
+        if ((*dtype == DTK_DATE) && ((fmask & DTK_DATE_M) != DTK_DATE_M))
+                return ((fmask & DTK_TIME_M) == DTK_TIME_M) ? 1 : -1;
+
+        /* timezone not specified? then find local timezone if possible */
+        if ((*dtype == DTK_DATE) && ((fmask & DTK_DATE_M) == DTK_DATE_M)
+                && (tzp != NULL) && (!(fmask & DTK_M(TZ))))
+        {
+
+                /*
+                 * daylight savings time modifier but no standard timezone? then
+                 * error
+                 */
+                if (fmask & DTK_M(DTZMOD))
+                        return -1;
+
+                if (IS_VALID_UTIME(tm->tm_year, tm->tm_mon, tm->tm_mday))
+                {
 #ifdef USE_POSIX_TIME
-            tm->tm_year -= 1900;
-            tm->tm_mon -= 1;
-            tm->tm_isdst = -1;
-            mktime(tm);
-            tm->tm_year += 1900;
-            tm->tm_mon += 1;
+                        tm->tm_year -= 1900;
+                        tm->tm_mon -= 1;
+                        tm->tm_isdst = -1;
+                        mktime(tm);
+                        tm->tm_year += 1900;
+                        tm->tm_mon += 1;
 
 #ifdef HAVE_INT_TIMEZONE
-            *tzp = ((tm->tm_isdst > 0) ? (timezone - 3600) : timezone);
-
-#else                           /* !HAVE_INT_TIMEZONE */
-            *tzp = -(tm->tm_gmtoff);    /* tm_gmtoff is Sun/DEC-ism */
-#endif
-
-#else                           /* !USE_POSIX_TIME */
-            *tzp = CTimeZone;
-#endif
-        }
-        else
-        {
-            tm->tm_isdst = 0;
-            *tzp = 0;
-        }
-    }
-
-    return 0;
-}   /* DecodeDateTime() */
+                        *tzp = ((tm->tm_isdst > 0) ? (timezone - 3600) : timezone);
+
+#else                                                   /* !HAVE_INT_TIMEZONE */
+                        *tzp = -(tm->tm_gmtoff);        /* tm_gmtoff is Sun/DEC-ism */
+#endif
+
+#else                                                   /* !USE_POSIX_TIME */
+                        *tzp = CTimeZone;
+#endif
+                }
+                else
+                {
+                        tm->tm_isdst = 0;
+                        *tzp = 0;
+                }
+        }
+
+        return 0;
+}       /* DecodeDateTime() */
 
 
@@ -740 +740 @@
 DecodeTimeOnly(char **field, int *ftype, int nf, int *dtype, struct tm * tm, double *fsec)
 {
-    int         fmask,
-                tmask,
-                type;
-    int         i;
-    int         flen,
-                val;
-    int         mer = HR24;
-
-    *dtype = DTK_TIME;
-    tm->tm_hour = 0;
-    tm->tm_min = 0;
-    tm->tm_sec = 0;
-    tm->tm_isdst = -1;          /* don't know daylight savings time status
-                                 * apriori */
-    *fsec = 0;
-
-    fmask = DTK_DATE_M;
-
-    for (i = 0; i < nf; i++)
-    {
-#ifdef DATEDEBUG
-        printf("DecodeTimeOnly- field[%d] is %s (type %d)\n", i, field[i], ftype[i]);
-#endif
-        switch (ftype[i])
-        {
-            case DTK_TIME:
-                if (DecodeTime(field[i], fmask, &tmask, tm, fsec) != 0)
-                    return -1;
-                break;
-
-            case DTK_NUMBER:
-                flen = strlen(field[i]);
-
-                if (DecodeNumberField(flen, field[i], fmask, &tmask, tm, fsec) != 0)
-                    return -1;
-                break;
-
-            case DTK_STRING:
-            case DTK_SPECIAL:
-                type = DecodeSpecial(i, field[i], &val);
-#ifdef DATEDEBUG
-                printf("DecodeTimeOnly- special field[%d] %s type=%d value=%d\n", i, field[i], type, val);
-#endif
-                if (type == IGNOREFIELD)
-                    continue;
-
-                tmask = DTK_M(type);
-                switch (type)
-                {
-                    case RESERV:
-#ifdef DATEDEBUG
-                        printf("DecodeTimeOnly- RESERV field %s value is %d\n", field[i], val);
-#endif
-                        switch (val)
-                        {
-
-                            default:
-                                return -1;
-                        }
-
-                        break;
-
-                    case IGNOREFIELD:
-                        break;
-
-                    case AMPM:
-                        mer = val;
-                        break;
-
-                    default:
-                        return -1;
-                }
-                break;
-
-            default:
-                return -1;
-        }
-
-        if (tmask & fmask)
-            return -1;
-        fmask |= tmask;
-
-#ifdef DATEDEBUG
-        printf("DecodeTimeOnly- field[%d] %s value is %d\n", i, field[i], val);
-#endif
-    }
-
-#ifdef DATEDEBUG
-    printf("DecodeTimeOnly- mask %08x (%08x)", fmask, DTK_TIME_M);
-    printf(" %02d:%02d:%02d (%f)\n", tm->tm_hour, tm->tm_min, tm->tm_sec, *fsec);
-#endif
-
-    if ((mer != HR24) && (tm->tm_hour > 12))
-        return -1;
-    if ((mer == AM) && (tm->tm_hour == 12))
-        tm->tm_hour = 0;
-    else if ((mer == PM) && (tm->tm_hour != 12))
-        tm->tm_hour += 12;
-
-    if ((fmask & DTK_TIME_M) != DTK_TIME_M)
-        return -1;
-
-    return 0;
-}   /* DecodeTimeOnly() */
+        int                     fmask,
+                                tmask,
+                                type;
+        int                     i;
+        int                     flen,
+                                val;
+        int                     mer = HR24;
+
+        *dtype = DTK_TIME;
+        tm->tm_hour = 0;
+        tm->tm_min = 0;
+        tm->tm_sec = 0;
+        tm->tm_isdst = -1;                      /* don't know daylight savings time status
+                                                                 * apriori */
+        *fsec = 0;
+
+        fmask = DTK_DATE_M;
+
+        for (i = 0; i < nf; i++)
+        {
+#ifdef DATEDEBUG
+                printf("DecodeTimeOnly- field[%d] is %s (type %d)\n", i, field[i], ftype[i]);
+#endif
+                switch (ftype[i])
+                {
+                        case DTK_TIME:
+                                if (DecodeTime(field[i], fmask, &tmask, tm, fsec) != 0)
+                                        return -1;
+                                break;
+
+                        case DTK_NUMBER:
+                                flen = strlen(field[i]);
+
+                                if (DecodeNumberField(flen, field[i], fmask, &tmask, tm, fsec) != 0)
+                                        return -1;
+                                break;
+
+                        case DTK_STRING:
+                        case DTK_SPECIAL:
+                                type = DecodeSpecial(i, field[i], &val);
+#ifdef DATEDEBUG
+                                printf("DecodeTimeOnly- special field[%d] %s type=%d value=%d\n", i, field[i], type, val);
+#endif
+                                if (type == IGNOREFIELD)
+                                        continue;
+
+                                tmask = DTK_M(type);
+                                switch (type)
+                                {
+                                        case RESERV:
+#ifdef DATEDEBUG
+                                                printf("DecodeTimeOnly- RESERV field %s value is %d\n", field[i], val);
+#endif
+                                                switch (val)
+                                                {
+
+                                                        default:
+                                                                return -1;
+                                                }
+
+                                                break;
+
+                                        case IGNOREFIELD:
+                                                break;
+
+                                        case AMPM:
+                                                mer = val;
+                                                break;
+
+                                        default:
+                                                return -1;
+                                }
+                                break;
+
+                        default:
+                                return -1;
+                }
+
+                if (tmask & fmask)
+                        return -1;
+                fmask |= tmask;
+
+#ifdef DATEDEBUG
+                printf("DecodeTimeOnly- field[%d] %s value is %d\n", i, field[i], val);
+#endif
+        }
+
+#ifdef DATEDEBUG
+        printf("DecodeTimeOnly- mask %08x (%08x)", fmask, DTK_TIME_M);
+        printf(" %02d:%02d:%02d (%f)\n", tm->tm_hour, tm->tm_min, tm->tm_sec, *fsec);
+#endif
+
+        if ((mer != HR24) && (tm->tm_hour > 12))
+                return -1;
+        if ((mer == AM) && (tm->tm_hour == 12))
+                tm->tm_hour = 0;
+        else if ((mer == PM) && (tm->tm_hour != 12))
+                tm->tm_hour += 12;
+
+        if ((fmask & DTK_TIME_M) != DTK_TIME_M)
+                return -1;
+
+        return 0;
+}       /* DecodeTimeOnly() */
 
 
@@ -853 +853 @@
 DecodeDate(char *str, int fmask, int *tmask, struct tm * tm)
 {
-    double      fsec;
-
-    int         nf = 0;
-    int         i,
-                len;
-    int         type,
-                val,
-                dmask = 0;
-    char       *field[MAXDATEFIELDS];
-
-    /* parse this string... */
-    while ((*str != '\0') && (nf < MAXDATEFIELDS))
-    {
-        /* skip field separators */
-        while (!isalnum(*str))
-            str++;
-
-        field[nf] = str;
-        if (isdigit(*str))
-        {
-            while (isdigit(*str))
-                str++;
-        }
-        else if (isalpha(*str))
-        {
-            while (isalpha(*str))
-                str++;
-        }
-
-        if (*str != '\0')
-            *str++ = '\0';
-        nf++;
-    }
-
-    /* don't allow too many fields */
-    if (nf > 3)
-        return -1;
-
-    *tmask = 0;
-
-    /* look first for text fields, since that will be unambiguous month */
-    for (i = 0; i < nf; i++)
-    {
-        if (isalpha(*field[i]))
-        {
-            type = DecodeSpecial(i, field[i], &val);
-            if (type == IGNOREFIELD)
-                continue;
-
-            dmask = DTK_M(type);
-            switch (type)
-            {
-                case MONTH:
-#ifdef DATEDEBUG
-                    printf("DecodeDate- month field %s value is %d\n", field[i], val);
-#endif
-                    tm->tm_mon = val;
-                    break;
-
-                default:
-#ifdef DATEDEBUG
-                    printf("DecodeDate- illegal field %s value is %d\n", field[i], val);
-#endif
-                    return -1;
-            }
-            if (fmask & dmask)
-                return -1;
-
-            fmask |= dmask;
-            *tmask |= dmask;
-
-            /* mark this field as being completed */
-            field[i] = NULL;
-        }
-    }
-
-    /* now pick up remaining numeric fields */
-    for (i = 0; i < nf; i++)
-    {
-        if (field[i] == NULL)
-            continue;
-
-        if ((len = strlen(field[i])) <= 0)
-            return -1;
-
-        if (DecodeNumber(len, field[i], fmask, &dmask, tm, &fsec) != 0)
-            return -1;
-
-        if (fmask & dmask)
-            return -1;
-
-        fmask |= dmask;
-        *tmask |= dmask;
-    }
-
-    return 0;
-}   /* DecodeDate() */
+        double          fsec;
+
+        int                     nf = 0;
+        int                     i,
+                                len;
+        int                     type,
+                                val,
+                                dmask = 0;
+        char       *field[MAXDATEFIELDS];
+
+        /* parse this string... */
+        while ((*str != '\0') && (nf < MAXDATEFIELDS))
+        {
+                /* skip field separators */
+                while (!isalnum(*str))
+                        str++;
+
+                field[nf] = str;
+                if (isdigit(*str))
+                {
+                        while (isdigit(*str))
+                                str++;
+                }
+                else if (isalpha(*str))
+                {
+                        while (isalpha(*str))
+                                str++;
+                }
+
+                if (*str != '\0')
+                        *str++ = '\0';
+                nf++;
+        }
+
+        /* don't allow too many fields */
+        if (nf > 3)
+                return -1;
+
+        *tmask = 0;
+
+        /* look first for text fields, since that will be unambiguous month */
+        for (i = 0; i < nf; i++)
+        {
+                if (isalpha(*field[i]))
+                {
+                        type = DecodeSpecial(i, field[i], &val);
+                        if (type == IGNOREFIELD)
+                                continue;
+
+                        dmask = DTK_M(type);
+                        switch (type)
+                        {
+                                case MONTH:
+#ifdef DATEDEBUG
+                                        printf("DecodeDate- month field %s value is %d\n", field[i], val);
+#endif
+                                        tm->tm_mon = val;
+                                        break;
+
+                                default:
+#ifdef DATEDEBUG
+                                        printf("DecodeDate- illegal field %s value is %d\n", field[i], val);
+#endif
+                                        return -1;
+                        }
+                        if (fmask & dmask)
+                                return -1;
+
+                        fmask |= dmask;
+                        *tmask |= dmask;
+
+                        /* mark this field as being completed */
+                        field[i] = NULL;
+                }
+        }
+
+        /* now pick up remaining numeric fields */
+        for (i = 0; i < nf; i++)
+        {
+                if (field[i] == NULL)
+                        continue;
+
+                if ((len = strlen(field[i])) <= 0)
+                        return -1;
+
+                if (DecodeNumber(len, field[i], fmask, &dmask, tm, &fsec) != 0)
+                        return -1;
+
+                if (fmask & dmask)
+                        return -1;
+
+                fmask |= dmask;
+                *tmask |= dmask;
+        }
+
+        return 0;
+}       /* DecodeDate() */
 
 
@@ -955 +955 @@
  * Decode time string which includes delimiters.
  * Only check the lower limit on hours, since this same code
- *  can be used to represent time spans.
+ *      can be used to represent time spans.
  */
 static int
 DecodeTime(char *str, int fmask, int *tmask, struct tm * tm, double *fsec)
 {
-    char       *cp;
-
-    *tmask = DTK_TIME_M;
-
-    tm->tm_hour = strtol(str, &cp, 10);
-    if (*cp != ':')
-        return -1;
-    str = cp + 1;
-    tm->tm_min = strtol(str, &cp, 10);
-    if (*cp == '\0')
-    {
-        tm->tm_sec = 0;
-        *fsec = 0;
-
-    }
-    else if (*cp != ':')
-    {
-        return -1;
-
-    }
-    else
-    {
-        str = cp + 1;
-        tm->tm_sec = strtol(str, &cp, 10);
-        if (*cp == '\0')
-            *fsec = 0;
-        else if (*cp == '.')
-        {
-            str = cp;
-            *fsec = strtod(str, &cp);
-            if (cp == str)
-                return -1;
-        }
-        else
-            return -1;
-    }
-
-    /* do a sanity check */
-    if ((tm->tm_hour < 0)
-        || (tm->tm_min < 0) || (tm->tm_min > 59)
-        || (tm->tm_sec < 0) || (tm->tm_sec > 59))
-        return -1;
-
-    return 0;
-}   /* DecodeTime() */
+        char       *cp;
+
+        *tmask = DTK_TIME_M;
+
+        tm->tm_hour = strtol(str, &cp, 10);
+        if (*cp != ':')
+                return -1;
+        str = cp + 1;
+        tm->tm_min = strtol(str, &cp, 10);
+        if (*cp == '\0')
+        {
+                tm->tm_sec = 0;
+                *fsec = 0;
+
+        }
+        else if (*cp != ':')
+        {
+                return -1;
+
+        }
+        else
+        {
+                str = cp + 1;
+                tm->tm_sec = strtol(str, &cp, 10);
+                if (*cp == '\0')
+                        *fsec = 0;
+                else if (*cp == '.')
+                {
+                        str = cp;
+                        *fsec = strtod(str, &cp);
+                        if (cp == str)
+                                return -1;
+                }
+                else
+                        return -1;
+        }
+
+        /* do a sanity check */
+        if ((tm->tm_hour < 0)
+                || (tm->tm_min < 0) || (tm->tm_min > 59)
+                || (tm->tm_sec < 0) || (tm->tm_sec > 59))
+                return -1;
+
+        return 0;
+}       /* DecodeTime() */
 
 
@@ -1013 +1013 @@
 DecodeNumber(int flen, char *str, int fmask, int *tmask, struct tm * tm, double *fsec)
 {
-    int         val;
-    char       *cp;
-
-    *tmask = 0;
-
-    val = strtol(str, &cp, 10);
-    if (cp == str)
-        return -1;
-    if (*cp == '.')
-    {
-        *fsec = strtod(cp, &cp);
-        if (*cp != '\0')
-            return -1;
-    }
-
-#ifdef DATEDEBUG
-    printf("DecodeNumber- %s is %d fmask=%08x tmask=%08x\n", str, val, fmask, *tmask);
-#endif
-
-    /* enough digits to be unequivocal year? */
-    if (flen == 4)
-    {
-#ifdef DATEDEBUG
-        printf("DecodeNumber- match %d (%s) as year\n", val, str);
-#endif
-        *tmask = DTK_M(YEAR);
-
-        /* already have a year? then see if we can substitute... */
-        if (fmask & DTK_M(YEAR))
-        {
-            if ((!(fmask & DTK_M(DAY)))
-                && ((tm->tm_year >= 1) && (tm->tm_year <= 31)))
-            {
-#ifdef DATEDEBUG
-                printf("DecodeNumber- misidentified year previously; swap with day %d\n", tm->tm_mday);
-#endif
-                tm->tm_mday = tm->tm_year;
-                *tmask = DTK_M(DAY);
-            }
-        }
-
-        tm->tm_year = val;
-
-        /* special case day of year? */
-    }
-    else if ((flen == 3) && (fmask & DTK_M(YEAR))
-             && ((val >= 1) && (val <= 366)))
-    {
-        *tmask = (DTK_M(DOY) | DTK_M(MONTH) | DTK_M(DAY));
-        tm->tm_yday = val;
-        j2date((date2j(tm->tm_year, 1, 1) + tm->tm_yday - 1),
-               &tm->tm_year, &tm->tm_mon, &tm->tm_mday);
-
-        /* already have year? then could be month */
-    }
-    else if ((fmask & DTK_M(YEAR)) && (!(fmask & DTK_M(MONTH)))
-             && ((val >= 1) && (val <= 12)))
-    {
-#ifdef DATEDEBUG
-        printf("DecodeNumber- match %d (%s) as month\n", val, str);
-#endif
-        *tmask = DTK_M(MONTH);
-        tm->tm_mon = val;
-
-        /* no year and EuroDates enabled? then could be day */
-    }
-    else if ((EuroDates || (fmask & DTK_M(MONTH)))
-             && (!(fmask & DTK_M(YEAR)) && !(fmask & DTK_M(DAY)))
-             && ((val >= 1) && (val <= 31)))
-    {
-#ifdef DATEDEBUG
-        printf("DecodeNumber- match %d (%s) as day\n", val, str);
-#endif
-        *tmask = DTK_M(DAY);
-        tm->tm_mday = val;
-
-    }
-    else if ((!(fmask & DTK_M(MONTH)))
-             && ((val >= 1) && (val <= 12)))
-    {
-#ifdef DATEDEBUG
-        printf("DecodeNumber- (2) match %d (%s) as month\n", val, str);
-#endif
-        *tmask = DTK_M(MONTH);
-        tm->tm_mon = val;
-
-    }
-    else if ((!(fmask & DTK_M(DAY)))
-             && ((val >= 1) && (val <= 31)))
-    {
-#ifdef DATEDEBUG
-        printf("DecodeNumber- (2) match %d (%s) as day\n", val, str);
-#endif
-        *tmask = DTK_M(DAY);
-        tm->tm_mday = val;
-
-    }
-    else if (!(fmask & DTK_M(YEAR)))
-    {
-#ifdef DATEDEBUG
-        printf("DecodeNumber- (2) match %d (%s) as year\n", val, str);
-#endif
-        *tmask = DTK_M(YEAR);
-        tm->tm_year = val;
-        if (tm->tm_year < 70)
-            tm->tm_year += 2000;
-        else if (tm->tm_year < 100)
-            tm->tm_year += 1900;
-
-    }
-    else
-        return -1;
-
-    return 0;
-}   /* DecodeNumber() */
+        int                     val;
+        char       *cp;
+
+        *tmask = 0;
+
+        val = strtol(str, &cp, 10);
+        if (cp == str)
+                return -1;
+        if (*cp == '.')
+        {
+                *fsec = strtod(cp, &cp);
+                if (*cp != '\0')
+                        return -1;
+        }
+
+#ifdef DATEDEBUG
+        printf("DecodeNumber- %s is %d fmask=%08x tmask=%08x\n", str, val, fmask, *tmask);
+#endif
+
+        /* enough digits to be unequivocal year? */
+        if (flen == 4)
+        {
+#ifdef DATEDEBUG
+                printf("DecodeNumber- match %d (%s) as year\n", val, str);
+#endif
+                *tmask = DTK_M(YEAR);
+
+                /* already have a year? then see if we can substitute... */
+                if (fmask & DTK_M(YEAR))
+                {
+                        if ((!(fmask & DTK_M(DAY)))
+                                && ((tm->tm_year >= 1) && (tm->tm_year <= 31)))
+                        {
+#ifdef DATEDEBUG
+                                printf("DecodeNumber- misidentified year previously; swap with day %d\n", tm->tm_mday);
+#endif
+                                tm->tm_mday = tm->tm_year;
+                                *tmask = DTK_M(DAY);
+                        }
+                }
+
+                tm->tm_year = val;
+
+                /* special case day of year? */
+        }
+        else if ((flen == 3) && (fmask & DTK_M(YEAR))
+                         && ((val >= 1) && (val <= 366)))
+        {
+                *tmask = (DTK_M(DOY) | DTK_M(MONTH) | DTK_M(DAY));
+                tm->tm_yday = val;
+                j2date((date2j(tm->tm_year, 1, 1) + tm->tm_yday - 1),
+                           &tm->tm_year, &tm->tm_mon, &tm->tm_mday);
+
+                /* already have year? then could be month */
+        }
+        else if ((fmask & DTK_M(YEAR)) && (!(fmask & DTK_M(MONTH)))
+                         && ((val >= 1) && (val <= 12)))
+        {
+#ifdef DATEDEBUG
+                printf("DecodeNumber- match %d (%s) as month\n", val, str);
+#endif
+                *tmask = DTK_M(MONTH);
+                tm->tm_mon = val;
+
+                /* no year and EuroDates enabled? then could be day */
+        }
+        else if ((EuroDates || (fmask & DTK_M(MONTH)))
+                         && (!(fmask & DTK_M(YEAR)) && !(fmask & DTK_M(DAY)))
+                         && ((val >= 1) && (val <= 31)))
+        {
+#ifdef DATEDEBUG
+                printf("DecodeNumber- match %d (%s) as day\n", val, str);
+#endif
+                *tmask = DTK_M(DAY);
+                tm->tm_mday = val;
+
+        }
+        else if ((!(fmask & DTK_M(MONTH)))
+                         && ((val >= 1) && (val <= 12)))
+        {
+#ifdef DATEDEBUG
+                printf("DecodeNumber- (2) match %d (%s) as month\n", val, str);
+#endif
+                *tmask = DTK_M(MONTH);
+                tm->tm_mon = val;
+
+        }
+        else if ((!(fmask & DTK_M(DAY)))
+                         && ((val >= 1) && (val <= 31)))
+        {
+#ifdef DATEDEBUG
+                printf("DecodeNumber- (2) match %d (%s) as day\n", val, str);
+#endif
+                *tmask = DTK_M(DAY);
+                tm->tm_mday = val;
+
+        }
+        else if (!(fmask & DTK_M(YEAR)))
+        {
+#ifdef DATEDEBUG
+                printf("DecodeNumber- (2) match %d (%s) as year\n", val, str);
+#endif
+                *tmask = DTK_M(YEAR);
+                tm->tm_year = val;
+                if (tm->tm_year < 70)
+                        tm->tm_year += 2000;
+                else if (tm->tm_year < 100)
+                        tm->tm_year += 1900;
+
+        }
+        else
+                return -1;
+
+        return 0;
+}       /* DecodeNumber() */
 
 
@@ -1136 +1136 @@
 DecodeNumberField(int len, char *str, int fmask, int *tmask, struct tm * tm, double *fsec)
 {
-    char       *cp;
-
-    /* yyyymmdd? */
-    if (len == 8)
-    {
-#ifdef DATEDEBUG
-        printf("DecodeNumberField- %s is 8 character date fmask=%08x tmask=%08x\n", str, fmask, *tmask);
-#endif
-
-        *tmask = DTK_DATE_M;
-
-        tm->tm_mday = atoi(str + 6);
-        *(str + 6) = '\0';
-        tm->tm_mon = atoi(str + 4);
-        *(str + 4) = '\0';
-        tm->tm_year = atoi(str + 0);
-
-        /* yymmdd or hhmmss? */
-    }
-    else if (len == 6)
-    {
-#ifdef DATEDEBUG
-        printf("DecodeNumberField- %s is 6 characters fmask=%08x tmask=%08x\n", str, fmask, *tmask);
-#endif
-        if (fmask & DTK_DATE_M)
-        {
-#ifdef DATEDEBUG
-            printf("DecodeNumberField- %s is time field fmask=%08x tmask=%08x\n", str, fmask, *tmask);
-#endif
-            *tmask = DTK_TIME_M;
-            tm->tm_sec = atoi(str + 4);
-            *(str + 4) = '\0';
-            tm->tm_min = atoi(str + 2);
-            *(str + 2) = '\0';
-            tm->tm_hour = atoi(str + 0);
-
-        }
-        else
-        {
-#ifdef DATEDEBUG
-            printf("DecodeNumberField- %s is date field fmask=%08x tmask=%08x\n", str, fmask, *tmask);
-#endif
-            *tmask = DTK_DATE_M;
-            tm->tm_mday = atoi(str + 4);
-            *(str + 4) = '\0';
-            tm->tm_mon = atoi(str + 2);
-            *(str + 2) = '\0';
-            tm->tm_year = atoi(str + 0);
-        }
-
-    }
-    else if (strchr(str, '.') != NULL)
-    {
-#ifdef DATEDEBUG
-        printf("DecodeNumberField- %s is time field fmask=%08x tmask=%08x\n", str, fmask, *tmask);
-#endif
-        *tmask = DTK_TIME_M;
-        tm->tm_sec = strtod((str + 4), &cp);
-        if (cp == (str + 4))
-            return -1;
-        if (*cp == '.')
-            *fsec = strtod(cp, NULL);
-        *(str + 4) = '\0';
-        tm->tm_min = strtod((str + 2), &cp);
-        *(str + 2) = '\0';
-        tm->tm_hour = strtod((str + 0), &cp);
-
-    }
-    else
-        return -1;
-
-    return 0;
-}   /* DecodeNumberField() */
+        char       *cp;
+
+        /* yyyymmdd? */
+        if (len == 8)
+        {
+#ifdef DATEDEBUG
+                printf("DecodeNumberField- %s is 8 character date fmask=%08x tmask=%08x\n", str, fmask, *tmask);
+#endif
+
+                *tmask = DTK_DATE_M;
+
+                tm->tm_mday = atoi(str + 6);
+                *(str + 6) = '\0';
+                tm->tm_mon = atoi(str + 4);
+                *(str + 4) = '\0';
+                tm->tm_year = atoi(str + 0);
+
+                /* yymmdd or hhmmss? */
+        }
+        else if (len == 6)
+        {
+#ifdef DATEDEBUG
+                printf("DecodeNumberField- %s is 6 characters fmask=%08x tmask=%08x\n", str, fmask, *tmask);
+#endif
+                if (fmask & DTK_DATE_M)
+                {
+#ifdef DATEDEBUG
+                        printf("DecodeNumberField- %s is time field fmask=%08x tmask=%08x\n", str, fmask, *tmask);
+#endif
+                        *tmask = DTK_TIME_M;
+                        tm->tm_sec = atoi(str + 4);
+                        *(str + 4) = '\0';
+                        tm->tm_min = atoi(str + 2);
+                        *(str + 2) = '\0';
+                        tm->tm_hour = atoi(str + 0);
+
+                }
+                else
+                {
+#ifdef DATEDEBUG
+                        printf("DecodeNumberField- %s is date field fmask=%08x tmask=%08x\n", str, fmask, *tmask);
+#endif
+                        *tmask = DTK_DATE_M;
+                        tm->tm_mday = atoi(str + 4);
+                        *(str + 4) = '\0';
+                        tm->tm_mon = atoi(str + 2);
+                        *(str + 2) = '\0';
+                        tm->tm_year = atoi(str + 0);
+                }
+
+        }
+        else if (strchr(str, '.') != NULL)
+        {
+#ifdef DATEDEBUG
+                printf("DecodeNumberField- %s is time field fmask=%08x tmask=%08x\n", str, fmask, *tmask);
+#endif
+                *tmask = DTK_TIME_M;
+                tm->tm_sec = strtod((str + 4), &cp);
+                if (cp == (str + 4))
+                        return -1;
+                if (*cp == '.')
+                        *fsec = strtod(cp, NULL);
+                *(str + 4) = '\0';
+                tm->tm_min = strtod((str + 2), &cp);
+                *(str + 2) = '\0';
+                tm->tm_hour = strtod((str + 0), &cp);
+
+        }
+        else
+                return -1;
+
+        return 0;
+}       /* DecodeNumberField() */
 
 
@@ -1217 +1217 @@
 DecodeTimezone(char *str, int *tzp)
 {
-    int         tz;
-    int         hr,
-                min;
-    char       *cp;
-    int         len;
-
-    /* assume leading character is "+" or "-" */
-    hr = strtol((str + 1), &cp, 10);
-
-    /* explicit delimiter? */
-    if (*cp == ':')
-    {
-        min = strtol((cp + 1), &cp, 10);
-
-        /* otherwise, might have run things together... */
-    }
-    else if ((*cp == '\0') && ((len = strlen(str)) > 3))
-    {
-        min = strtol((str + len - 2), &cp, 10);
-        *(str + len - 2) = '\0';
-        hr = strtol((str + 1), &cp, 10);
-
-    }
-    else
-        min = 0;
-
-    tz = (hr * 60 + min) * 60;
-    if (*str == '-')
-        tz = -tz;
-
-    *tzp = -tz;
-    return *cp != '\0';
-}   /* DecodeTimezone() */
+        int                     tz;
+        int                     hr,
+                                min;
+        char       *cp;
+        int                     len;
+
+        /* assume leading character is "+" or "-" */
+        hr = strtol((str + 1), &cp, 10);
+
+        /* explicit delimiter? */
+        if (*cp == ':')
+        {
+                min = strtol((cp + 1), &cp, 10);
+
+                /* otherwise, might have run things together... */
+        }
+        else if ((*cp == '\0') && ((len = strlen(str)) > 3))
+        {
+                min = strtol((str + len - 2), &cp, 10);
+                *(str + len - 2) = '\0';
+                hr = strtol((str + 1), &cp, 10);
+
+        }
+        else
+                min = 0;
+
+        tz = (hr * 60 + min) * 60;
+        if (*str == '-')
+                tz = -tz;
+
+        *tzp = -tz;
+        return *cp != '\0';
+}       /* DecodeTimezone() */
 
 
@@ -1255 +1255 @@
  * Decode text string using lookup table.
  * Implement a cache lookup since it is likely that dates
- *  will be related in format.
+ *      will be related in format.
  */
 static int
 DecodeSpecial(int field, char *lowtoken, int *val)
 {
-    int         type;
-    datetkn    *tp;
+        int                     type;
+        datetkn    *tp;
 
 #if USE_DATE_CACHE
-    if ((datecache[field] != NULL)
-        && (strncmp(lowtoken, datecache[field]->token, TOKMAXLEN) == 0))
-        tp = datecache[field];
-    else
-    {
-#endif
-        tp = datebsearch(lowtoken, datetktbl, szdatetktbl);
+        if ((datecache[field] != NULL)
+                && (strncmp(lowtoken, datecache[field]->token, TOKMAXLEN) == 0))
+                tp = datecache[field];
+        else
+        {
+#endif
+                tp = datebsearch(lowtoken, datetktbl, szdatetktbl);
 #if USE_DATE_CACHE
-    }
-    datecache[field] = tp;
-#endif
-    if (tp == NULL)
-    {
-        type = IGNOREFIELD;
-        *val = 0;
-    }
-    else
-    {
-        type = tp->type;
-        switch (type)
-        {
-            case TZ:
-            case DTZ:
-            case DTZMOD:
-                *val = FROMVAL(tp);
-                break;
-
-            default:
-                *val = tp->value;
-                break;
-        }
-    }
-
-    return type;
-}   /* DecodeSpecial() */
+        }
+        datecache[field] = tp;
+#endif
+        if (tp == NULL)
+        {
+                type = IGNOREFIELD;
+                *val = 0;
+        }
+        else
+        {
+                type = tp->type;
+                switch (type)
+                {
+                        case TZ:
+                        case DTZ:
+                        case DTZMOD:
+                                *val = FROMVAL(tp);
+                                break;
+
+                        default:
+                                *val = tp->value;
+                                break;
+                }
+        }
+
+        return type;
+}       /* DecodeSpecial() */
 
 
@@ -1309 +1309 @@
 datebsearch(char *key, datetkn *base, unsigned int nel)
 {
-    datetkn    *last = base + nel - 1,
-               *position;
-    int         result;
-
-    while (last >= base)
-    {
-        position = base + ((last - base) >> 1);
-        result = key[0] - position->token[0];
-        if (result == 0)
-        {
-            result = strncmp(key, position->token, TOKMAXLEN);
-            if (result == 0)
-                return position;
-        }
-        if (result < 0)
-            last = position - 1;
-        else
-            base = position + 1;
-    }
-    return NULL;
+        datetkn    *last = base + nel - 1,
+                           *position;
+        int                     result;
+
+        while (last >= base)
+        {
+                position = base + ((last - base) >> 1);
+                result = key[0] - position->token[0];
+                if (result == 0)
+                {
+                        result = strncmp(key, position->token, TOKMAXLEN);
+                        if (result == 0)
+                                return position;
+                }
+                if (result < 0)
+                        last = position - 1;
+                else
+                        base = position + 1;
+        }
+        return NULL;
 }
 

trunk/src/oleaut32/safearray.c

@@ -25 +25 @@
 
 /* Localy used methods */
-static INT
+static INT  
 endOfDim(LONG *coor, SAFEARRAYBOUND *mat, LONG dim, LONG realDim);
 
-static ULONG
+static ULONG   
 calcDisplacement(LONG *coor, SAFEARRAYBOUND *mat, LONG dim);
 
-static BOOL
+static BOOL  
 isPointer(USHORT feature);
 
-static INT
+static INT   
 getFeatures(VARTYPE vt);
 
-static BOOL
+static BOOL  
 validCoordinate(LONG *coor, SAFEARRAY *psa);
 
-static BOOL
+static BOOL  
 resizeSafeArray(SAFEARRAY *psa, LONG lDelta);
 
-static BOOL
+static BOOL  
 validArg(SAFEARRAY *psa);
 
-static ULONG
+static ULONG   
 getArraySize(SAFEARRAY *psa);
 
-static HRESULT
+static HRESULT 
 duplicateData(SAFEARRAY *psa, SAFEARRAY **ppsaOut);
 
@@ -59 +59 @@
 {
   /* this is taken from wtypes.h.  Only [S]es are supported by the SafeArray */
-VARTYPE_NOT_SUPPORTED,  /* VT_EMPTY    [V]   [P]    nothing         */
-VARTYPE_NOT_SUPPORTED,  /* VT_NULL     [V]   [P]    SQL style Nul   */
-2,                      /* VT_I2       [V][T][P][S] 2 byte signed int */
-4,                      /* VT_I4       [V][T][P][S] 4 byte signed int */
-4,                      /* VT_R4       [V][T][P][S] 4 byte real */
-8,                      /* VT_R8       [V][T][P][S] 8 byte real */
+VARTYPE_NOT_SUPPORTED,  /* VT_EMPTY    [V]   [P]    nothing                     */
+VARTYPE_NOT_SUPPORTED,  /* VT_NULL     [V]   [P]    SQL style Nul       */
+2,                          /* VT_I2       [V][T][P][S] 2 byte signed int */
+4,                          /* VT_I4       [V][T][P][S] 4 byte signed int */
+4,                          /* VT_R4       [V][T][P][S] 4 byte real     */
+8,                          /* VT_R8       [V][T][P][S] 8 byte real     */
 8,                      /* VT_CY       [V][T][P][S] currency */
-8,                      /* VT_DATE     [V][T][P][S] date */
-4,                      /* VT_BSTR     [V][T][P][S] OLE Automation string*/
-4,                      /* VT_DISPATCH [V][T][P][S] IDispatch * */
-4,                      /* VT_ERROR    [V][T]   [S] SCODE   */
-4,                      /* VT_BOOL     [V][T][P][S] True=-1, False=0*/
-24,                     /* VT_VARIANT  [V][T][P][S] VARIANT *   */
-4,                      /* VT_UNKNOWN  [V][T]   [S] IUnknown * */
-16,                     /* VT_DECIMAL  [V][T]   [S] 16 byte fixed point */
+8,                          /* VT_DATE     [V][T][P][S] date */
+4,                          /* VT_BSTR     [V][T][P][S] OLE Automation string*/
+4,                          /* VT_DISPATCH [V][T][P][S] IDispatch *     */
+4,                      /* VT_ERROR    [V][T]   [S] SCODE       */
+4,                          /* VT_BOOL     [V][T][P][S] True=-1, False=0*/
+24,                     /* VT_VARIANT  [V][T][P][S] VARIANT *   */
+4,                          /* VT_UNKNOWN  [V][T]   [S] IUnknown * */
+16,                         /* VT_DECIMAL  [V][T]   [S] 16 byte fixed point     */
 VARTYPE_NOT_SUPPORTED,                         /* no VARTYPE here..... */
-VARTYPE_NOT_SUPPORTED,  /* VT_I1          [T]       signed char */
-1,                      /* VT_UI1      [V][T][P][S] unsigned char           */
-VARTYPE_NOT_SUPPORTED,  /* VT_UI2         [T][P]    unsigned short  */
-VARTYPE_NOT_SUPPORTED,  /* VT_UI4         [T][P]    unsigned short  */
-VARTYPE_NOT_SUPPORTED,  /* VT_I8          [T][P]    signed 64-bit int           */
-VARTYPE_NOT_SUPPORTED,  /* VT_UI8         [T][P]    unsigned 64-bit int     */
-VARTYPE_NOT_SUPPORTED,  /* VT_INT         [T]       signed machine int      */
-VARTYPE_NOT_SUPPORTED,  /* VT_UINT        [T]       unsigned machine int    */
-VARTYPE_NOT_SUPPORTED,  /* VT_VOID        [T]       C style void            */
-VARTYPE_NOT_SUPPORTED,  /* VT_HRESULT     [T]       Standard return type    */
-VARTYPE_NOT_SUPPORTED,  /* VT_PTR         [T]       pointer type            */
-VARTYPE_NOT_SUPPORTED,  /* VT_SAFEARRAY   [T]       (use VT_ARRAY in VARIANT)*/
-VARTYPE_NOT_SUPPORTED,  /* VT_CARRAY      [T]       C style array           */
-VARTYPE_NOT_SUPPORTED,  /* VT_USERDEFINED [T]       user defined type           */
-VARTYPE_NOT_SUPPORTED,  /* VT_LPSTR       [T][P]    null terminated string  */
-VARTYPE_NOT_SUPPORTED,  /* VT_LPWSTR      [T][P]    wide null term string       */
-VARTYPE_NOT_SUPPORTED,  /* VT_FILETIME       [P]    FILETIME            */
-VARTYPE_NOT_SUPPORTED,  /* VT_BLOB           [P]    Length prefixed bytes */
-VARTYPE_NOT_SUPPORTED,  /* VT_STREAM         [P]    Name of stream follows      */
-VARTYPE_NOT_SUPPORTED,  /* VT_STORAGE        [P]    Name of storage follows */
-VARTYPE_NOT_SUPPORTED,  /* VT_STREAMED_OBJECT[P]    Stream contains an object*/
-VARTYPE_NOT_SUPPORTED,  /* VT_STORED_OBJECT  [P]    Storage contains object*/
-VARTYPE_NOT_SUPPORTED,  /* VT_BLOB_OBJECT    [P]    Blob contains an object*/
-VARTYPE_NOT_SUPPORTED,  /* VT_CF             [P]    Clipboard format            */
-VARTYPE_NOT_SUPPORTED,  /* VT_CLSID          [P]    A Class ID          */
-VARTYPE_NOT_SUPPORTED,  /* VT_VECTOR         [P]    simple counted array        */
-VARTYPE_NOT_SUPPORTED,  /* VT_ARRAY    [V]          SAFEARRAY*          */
-VARTYPE_NOT_SUPPORTED   /* VT_BYREF    [V]          void* for local use */
+VARTYPE_NOT_SUPPORTED,  /* VT_I1          [T]       signed char */
+1,                          /* VT_UI1      [V][T][P][S] unsigned char                   */
+VARTYPE_NOT_SUPPORTED,  /* VT_UI2         [T][P]    unsigned short      */
+VARTYPE_NOT_SUPPORTED,  /* VT_UI4         [T][P]    unsigned short      */
+VARTYPE_NOT_SUPPORTED,  /* VT_I8          [T][P]    signed 64-bit int                   */
+VARTYPE_NOT_SUPPORTED,  /* VT_UI8         [T][P]    unsigned 64-bit int         */
+VARTYPE_NOT_SUPPORTED,  /* VT_INT         [T]       signed machine int          */
+VARTYPE_NOT_SUPPORTED,  /* VT_UINT        [T]       unsigned machine int        */
+VARTYPE_NOT_SUPPORTED,  /* VT_VOID        [T]       C style void                        */
+VARTYPE_NOT_SUPPORTED,  /* VT_HRESULT     [T]       Standard return type        */
+VARTYPE_NOT_SUPPORTED,  /* VT_PTR         [T]       pointer type                        */
+VARTYPE_NOT_SUPPORTED,  /* VT_SAFEARRAY   [T]       (use VT_ARRAY in VARIANT)*/
+VARTYPE_NOT_SUPPORTED,  /* VT_CARRAY      [T]       C style array                       */
+VARTYPE_NOT_SUPPORTED,  /* VT_USERDEFINED [T]       user defined type                   */
+VARTYPE_NOT_SUPPORTED,  /* VT_LPSTR       [T][P]    null terminated string      */
+VARTYPE_NOT_SUPPORTED,  /* VT_LPWSTR      [T][P]    wide null term string               */
+VARTYPE_NOT_SUPPORTED,  /* VT_FILETIME       [P]    FILETIME                    */
+VARTYPE_NOT_SUPPORTED,  /* VT_BLOB           [P]    Length prefixed bytes */
+VARTYPE_NOT_SUPPORTED,  /* VT_STREAM         [P]    Name of stream follows              */
+VARTYPE_NOT_SUPPORTED,  /* VT_STORAGE        [P]    Name of storage follows     */
+VARTYPE_NOT_SUPPORTED,  /* VT_STREAMED_OBJECT[P]    Stream contains an object*/
+VARTYPE_NOT_SUPPORTED,  /* VT_STORED_OBJECT  [P]    Storage contains object*/
+VARTYPE_NOT_SUPPORTED,  /* VT_BLOB_OBJECT    [P]    Blob contains an object*/
+VARTYPE_NOT_SUPPORTED,  /* VT_CF             [P]    Clipboard format                    */
+VARTYPE_NOT_SUPPORTED,  /* VT_CLSID          [P]    A Class ID                  */
+VARTYPE_NOT_SUPPORTED,  /* VT_VECTOR         [P]    simple counted array                */
+VARTYPE_NOT_SUPPORTED,  /* VT_ARRAY    [V]          SAFEARRAY*                  */
+VARTYPE_NOT_SUPPORTED   /* VT_BYREF    [V]          void* for local use */
 };
 
@@ -109 +109 @@
 
 /*************************************************************************
- *      SafeArrayAllocDescriptor
+ *              SafeArrayAllocDescriptor
  * Allocate the appropriate amount of memory for the SafeArray descriptor
  */
-HRESULT WINAPI SafeArrayAllocDescriptor(
-  UINT    cDims,
-  SAFEARRAY **ppsaOut)
+HRESULT WINAPI SafeArrayAllocDescriptor( 
+  UINT    cDims, 
+  SAFEARRAY **ppsaOut) 
 {
   SAFEARRAYBOUND *sab;
@@ -124 +124 @@
 
   /* Allocate memory for SAFEARRAY struc */
-  if(( (*ppsaOut)=HeapAlloc(
+  if(( (*ppsaOut)=HeapAlloc( 
         GetProcessHeap(), HEAP_ZERO_MEMORY, allocSize)) == NULL){
     return(E_UNEXPECTED);
@@ -134 +134 @@
 
 /*************************************************************************
- *      SafeArrayAllocData
+ *              SafeArrayAllocData
  * Allocate the appropriate amount of data for the SafeArray data
  */
 HRESULT WINAPI SafeArrayAllocData(
-  SAFEARRAY *psa)
+  SAFEARRAY *psa) 
 {
   ULONG  ulWholeArraySize;   /* to store the size of the whole thing */
@@ -144 +144 @@
   dprintf(("SafeArrayAllocData %x", psa));
 
-  if(! validArg(psa))
+  if(! validArg(psa)) 
     return E_INVALIDARG;
 
@@ -150 +150 @@
 
   /* Allocate memory for the data itself */
-  if((psa->pvData = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY,
+  if((psa->pvData = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 
         psa->cbElements*ulWholeArraySize)) == NULL)
     return(E_UNEXPECTED);
 
-  TRACE("SafeArray: %lu bytes allocated for data at %p (%lu objects).\n",
+  TRACE("SafeArray: %lu bytes allocated for data at %p (%lu objects).\n", 
     psa->cbElements*ulWholeArraySize, psa->pvData, ulWholeArraySize);
 
@@ -161 +161 @@
 
 /*************************************************************************
- *      SafeArrayCreate
- * Create a SafeArray object by encapsulating AllocDescriptor and AllocData
+ *              SafeArrayCreate
+ * Create a SafeArray object by encapsulating AllocDescriptor and AllocData 
  */
 SAFEARRAY* WINAPI SafeArrayCreate(
-  VARTYPE        vt,
-  UINT         cDims,
+  VARTYPE        vt, 
+  UINT         cDims, 
   SAFEARRAYBOUND *rgsabound)
 {
@@ -184 +184 @@
     return NULL;
 
-  /* setup data members... */
+  /* setup data members... */ 
   psa->cDims     = cDims;
   psa->fFeatures = getFeatures(vt);
@@ -197 +197 @@
   }
 
-  /* allocate memory for the data... */
+  /* allocate memory for the data... */ 
   if( FAILED( hRes = SafeArrayAllocData(psa))) {
-    SafeArrayDestroyDescriptor(psa);
+    SafeArrayDestroyDescriptor(psa); 
     ERR("() : Failed to allocate the Safe Array data\n");
     return NULL;
   }
 
-  return(psa);
-}
-
-/*************************************************************************
- *      SafeArrayDestroyDescriptor
+  return(psa); 
+}
+
+/*************************************************************************
+ *              SafeArrayDestroyDescriptor
  * Frees the memory associated with the descriptor.
  */
@@ -217 +217 @@
 
   /* Check for lockness before to free... */
-  if(psa->cLocks > 0)
+  if(psa->cLocks > 0) 
     return DISP_E_ARRAYISLOCKED;
 
   /* The array is unlocked, then, deallocate memory */
-  if(HeapFree( GetProcessHeap(), 0, psa) == FALSE)
+  if(HeapFree( GetProcessHeap(), 0, psa) == FALSE) 
     return E_UNEXPECTED;
-
+  
   return(S_OK);
 }
@@ -229 +229 @@
 
 /*************************************************************************
- *      SafeArrayLock
+ *              SafeArrayLock
  * Increment the lock counter
  *
  * Doc says (MSDN Library ) that psa->pvData should be made available (!= NULL)
- * only when psa->cLocks is > 0... I don't get it since pvData is allocated
- * before the array is locked, therefore
+ * only when psa->cLocks is > 0... I don't get it since pvData is allocated 
+ * before the array is locked, therefore  
  */
 HRESULT WINAPI SafeArrayLock(
@@ -241 +241 @@
   dprintf(("SafeArrayLock %x", psa));
 
-  if(! validArg(psa))
+  if(! validArg(psa))     
     return E_INVALIDARG;
 
@@ -250 +250 @@
 
 /*************************************************************************
- *      SafeArrayUnlock
+ *              SafeArrayUnlock
  * Decrement the lock counter
  */
@@ -258 +258 @@
   dprintf(("SafeArrayUnlock %x", psa));
 
-  if(! validArg(psa))
-    return E_INVALIDARG;
-
-  if (psa->cLocks > 0)
+  if(! validArg(psa)) 
+    return E_INVALIDARG;
+
+  if (psa->cLocks > 0) 
     psa->cLocks--;
 
@@ -269 +269 @@
 
 /*************************************************************************
- *      SafeArrayPutElement
+ *              SafeArrayPutElement
  * Set the data at the given coordinate
  */
 HRESULT WINAPI SafeArrayPutElement(
-  SAFEARRAY *psa,
-  LONG      *rgIndices,
+  SAFEARRAY *psa, 
+  LONG      *rgIndices, 
   void      *pv)
 {
-  ULONG stepCountInSAData     = 0;    /* Number of array item to skip to get to
+  ULONG stepCountInSAData     = 0;    /* Number of array item to skip to get to 
                                          the desired one... */
   PVOID elementStorageAddress = NULL; /* Adress to store the data */
@@ -285 +285 @@
 
   /* Validate the index given */
-  if(! validCoordinate(rgIndices, psa))
+  if(! validCoordinate(rgIndices, psa)) 
     return DISP_E_BADINDEX;
   if(! validArg(psa))
@@ -294 +294 @@
     /* Figure out the number of items to skip */
     stepCountInSAData = calcDisplacement(rgIndices, psa->rgsabound, psa->cDims);
-
+  
     /* Figure out the number of byte to skip ... */
     elementStorageAddress = (char *) psa->pvData+(stepCountInSAData*psa->cbElements);
-
+  
     if(isPointer(psa->fFeatures)) { /* increment ref count for this pointer */
 
-      *((VOID**)elementStorageAddress) = *(VOID**)pv;
+      *((VOID**)elementStorageAddress) = *(VOID**)pv; 
       IUnknown_AddRef( *(IUnknown**)pv);
 
-    } else {
+    } else { 
 
       if(psa->fFeatures == FADF_BSTR) { /* Create a new object */
 
         if((pbstrReAllocStr = SysAllocString( (OLECHAR*)pv )) == NULL) {
-          SafeArrayUnlock(psa);
+          SafeArrayUnlock(psa);  
           return E_OUTOFMEMORY;
-        } else
+        } else 
           *((BSTR*)elementStorageAddress) = pbstrReAllocStr;
 
@@ -323 +323 @@
 
   TRACE("SafeArray: item put at adress %p.\n",elementStorageAddress);
-  return SafeArrayUnlock(psa);
-}
-
-
-/*************************************************************************
- *      SafeArrayGetElement
+  return SafeArrayUnlock(psa);  
+}
+
+
+/*************************************************************************
+ *              SafeArrayGetElement
  * Return the data element corresponding the the given coordinate
  */
 HRESULT WINAPI SafeArrayGetElement(
-  SAFEARRAY *psa,
-  LONG      *rgIndices,
+  SAFEARRAY *psa, 
+  LONG      *rgIndices, 
   void      *pv)
 {
-  ULONG stepCountInSAData     = 0;    /* Number of array item to skip to get to
+  ULONG stepCountInSAData     = 0;    /* Number of array item to skip to get to 
                                          the desired one... */
   PVOID elementStorageAddress = NULL; /* Adress to store the data */
@@ -343 +343 @@
   dprintf(("SafeArrayGetElement %x %x %x", psa, rgIndices, pv));
 
-  if(! validArg(psa))
-    return E_INVALIDARG;
-
+  if(! validArg(psa)) 
+    return E_INVALIDARG;
+  
   if(! validCoordinate(rgIndices, psa)) /* Validate the index given */
     return(DISP_E_BADINDEX);
@@ -353 +353 @@
     /* Figure out the number of items to skip */
     stepCountInSAData = calcDisplacement(rgIndices, psa->rgsabound, psa->cDims);
-
+  
     /* Figure out the number of byte to skip ... */
     elementStorageAddress = (char *) psa->pvData+(stepCountInSAData*psa->cbElements);
-
+  
     if( psa->fFeatures == FADF_BSTR) {           /* reallocate the obj */
-      if( (pbstrReturnedStr =
+      if( (pbstrReturnedStr = 
           SysAllocString( *(OLECHAR**)elementStorageAddress )) == NULL) {
         SafeArrayUnlock(psa);
         return E_OUTOFMEMORY;
-      } else
-        *((BSTR*)pv) = pbstrReturnedStr;
-
+      } else 
+        *((BSTR*)pv) = pbstrReturnedStr; 
+        
     } else if( isPointer(psa->fFeatures) )       /* simply copy the pointer */
-       pv = *((PVOID*)elementStorageAddress);
+       pv = *((PVOID*)elementStorageAddress); 
     else                                         /* copy the bytes */
       memcpy(pv, elementStorageAddress, SafeArrayGetElemsize(psa) );
@@ -375 +375 @@
   }
 
-  return( SafeArrayUnlock(psa) );
-}
-
-/*************************************************************************
- *      SafeArrayGetUBound
+  return( SafeArrayUnlock(psa) );  
+}
+
+/*************************************************************************
+ *              SafeArrayGetUBound
  * return the UP bound for a given array dimension
  */
 HRESULT WINAPI SafeArrayGetUBound(
-  SAFEARRAY *psa,
+  SAFEARRAY *psa, 
   UINT    nDim,
   LONG      *plUbound)
@@ -390 +390 @@
   dprintf(("SafeArrayGetUBound %x %x %x", psa, nDim, plUbound));
 
-  if(! validArg(psa))
-    return E_INVALIDARG;
-
-  if(nDim > psa->cDims)
+  if(! validArg(psa))   
+    return E_INVALIDARG;
+
+  if(nDim > psa->cDims) 
     return DISP_E_BADINDEX;
 
-  *plUbound = psa->rgsabound[nDim-1].lLbound +
+  *plUbound = psa->rgsabound[nDim-1].lLbound + 
               psa->rgsabound[nDim-1].cElements - 1;
 
@@ -403 +403 @@
 
 /*************************************************************************
- *      SafeArrayGetLBound
- * Return the LO bound for a given array dimension
+ *              SafeArrayGetLBound
+ * Return the LO bound for a given array dimension 
  */
 HRESULT WINAPI SafeArrayGetLBound(
   SAFEARRAY *psa,
-  UINT    nDim,
+  UINT    nDim, 
   LONG      *plLbound)
 {
-  if(! validArg(psa))
-    return E_INVALIDARG;
-
-  if(nDim > psa->cDims)
+  if(! validArg(psa))   
+    return E_INVALIDARG;
+
+  if(nDim > psa->cDims) 
     return DISP_E_BADINDEX;
 
@@ -422 +422 @@
 
 /*************************************************************************
- *      SafeArrayGetDim
+ *              SafeArrayGetDim
  * returns the number of dimension in the array
  */
 UINT WINAPI SafeArrayGetDim(
   SAFEARRAY * psa)
-{
+{ 
   /*
    * A quick test in Windows shows that the behavior here for an invalid
    * pointer is to return 0.
    */
-  if(! validArg(psa))
+  if(! validArg(psa)) 
     return 0;
 
@@ -439 +439 @@
 
 /*************************************************************************
- *      SafeArrayGetElemsize
+ *              SafeArrayGetElemsize
  * Return the size of the element in the array
  */
 UINT WINAPI SafeArrayGetElemsize(
   SAFEARRAY * psa)
-{
+{ 
   /*
    * A quick test in Windows shows that the behavior here for an invalid
    * pointer is to return 0.
    */
-  if(! validArg(psa))
+  if(! validArg(psa)) 
     return 0;
 
@@ -456 +456 @@
 
 /*************************************************************************
- *      SafeArrayAccessData
- * increment the access count and return the data
+ *              SafeArrayAccessData
+ * increment the access count and return the data 
  */
 HRESULT WINAPI SafeArrayAccessData(
-  SAFEARRAY *psa,
+  SAFEARRAY *psa, 
   void      **ppvData)
-{
+{ 
   HRESULT hRes;
 
-  if(! validArg(psa))
+  if(! validArg(psa)) 
     return E_INVALIDARG;
 
@@ -471 +471 @@
 
   switch (hRes) {
-    case S_OK:
+    case S_OK: 
       (*ppvData) = psa->pvData;
       break;
@@ -478 +478 @@
       return E_INVALIDARG;
   }
-
+  
   return S_OK;
 }
@@ -484 +484 @@
 
 /*************************************************************************
- *      SafeArrayUnaccessData
+ *              SafeArrayUnaccessData
  * Decrement the access count
  */
 HRESULT WINAPI SafeArrayUnaccessData(
   SAFEARRAY * psa)
-{
-  if(! validArg(psa))
+{ 
+  if(! validArg(psa)) 
     return E_INVALIDARG;
 
@@ -496 +496 @@
 }
 
-/************************************************************************
- *      SafeArrayPtrOfIndex
+/************************************************************************ 
+ *              SafeArrayPtrOfIndex
  * Return a pointer to the element at rgIndices
  */
 HRESULT WINAPI SafeArrayPtrOfIndex(
-  SAFEARRAY *psa,
-  LONG      *rgIndices,
+  SAFEARRAY *psa, 
+  LONG      *rgIndices, 
   void      **ppvData)
-{
-  ULONG stepCountInSAData     = 0;    /* Number of array item to skip to get to
+{ 
+  ULONG stepCountInSAData     = 0;    /* Number of array item to skip to get to 
                                          the desired one... */
 
-  if(! validArg(psa))
-    return E_INVALIDARG;
-
-  if(! validCoordinate(rgIndices, psa))
+  if(! validArg(psa))                   
+    return E_INVALIDARG;
+
+  if(! validCoordinate(rgIndices, psa)) 
     return DISP_E_BADINDEX;
 
   /* Figure out the number of items to skip */
   stepCountInSAData = calcDisplacement(rgIndices, psa->rgsabound, psa->cDims);
-
+  
   *ppvData = (char *) psa->pvData+(stepCountInSAData*psa->cbElements);
 
@@ -522 +522 @@
 }
 
-/************************************************************************
- *      SafeArrayDestroyData
+/************************************************************************ 
+ *              SafeArrayDestroyData
  * Frees the memory data bloc
  */
 HRESULT WINAPI SafeArrayDestroyData(
   SAFEARRAY *psa)
-{
+{ 
   HRESULT  hRes;
   ULONG    ulWholeArraySize; /* count spot in array  */
@@ -535 +535 @@
   BSTR   bstr;
 
-  if(! validArg(psa))
-    return E_INVALIDARG;
-
-  if(psa->cLocks > 0)
+  if(! validArg(psa)) 
+    return E_INVALIDARG;
+
+  if(psa->cLocks > 0) 
     return DISP_E_ARRAYISLOCKED;
 
@@ -546 +546 @@
 
     for(ulDataIter=0; ulDataIter < ulWholeArraySize; ulDataIter++) {
-      punk = *(IUnknown**)((char *) psa->pvData+(ulDataIter*(psa->cbElements)));
-
-      if( punk != NULL)
+      punk = *(IUnknown**)((char *) psa->pvData+(ulDataIter*(psa->cbElements)));        
+
+      if( punk != NULL) 
         IUnknown_Release(punk);
     }
@@ -557 +557 @@
       bstr = *(BSTR*)((char *) psa->pvData+(ulDataIter*(psa->cbElements)));
 
-      if( bstr != NULL)
+      if( bstr != NULL) 
         SysFreeString( bstr );
     }
   }
-
-  /* check if this array is a Vector, in which case do not free the data
+      
+  /* check if this array is a Vector, in which case do not free the data 
      block since it has been allocated by AllocDescriptor and therefore
      deserve to be freed by DestroyDescriptor */
@@ -573 +573 @@
     psa->pvData = NULL;
   }
-
+  
   return S_OK;
 }
 
-/************************************************************************
- *      SafeArrayCopyData
+/************************************************************************ 
+ *              SafeArrayCopyData
  * Copy the psaSource's data block into psaTarget if dimension and size
  * permits it.
@@ -585 +585 @@
   SAFEARRAY *psaSource,
   SAFEARRAY **psaTarget)
-{
+{ 
   USHORT   cDimCount;        /* looper */
   LONG     lDelta;           /* looper */
-  IUnknown *punk;
+  IUnknown *punk;   
   ULONG    ulWholeArraySize; /* Number of item in SA */
   BSTR   bstr;
 
-  if(! (validArg(psaSource) && validArg(*psaTarget)) )
+  if(! (validArg(psaSource) && validArg(*psaTarget)) ) 
     return E_INVALIDARG;
 
@@ -598 +598 @@
     return E_INVALIDARG;
 
-  ulWholeArraySize = getArraySize(psaSource);
+  ulWholeArraySize = getArraySize(psaSource); 
 
   /* The two arrays boundaries must be of same lenght */
   for(cDimCount=0;cDimCount < psaSource->cDims; cDimCount++)
-    if( psaSource->rgsabound[cDimCount].cElements !=
+    if( psaSource->rgsabound[cDimCount].cElements != 
       (*psaTarget)->rgsabound[cDimCount].cElements)
       return E_INVALIDARG;
 
-  if( isPointer((*psaTarget)->fFeatures) ) {         /* the target contains ptr
+  if( isPointer((*psaTarget)->fFeatures) ) {         /* the target contains ptr 
                                                         that must be released */
     for(lDelta=0;lDelta < ulWholeArraySize; lDelta++) {
@@ -612 +612 @@
         ((char *) (*psaTarget)->pvData + (lDelta * (*psaTarget)->cbElements));
 
-      if( punk != NULL)
+      if( punk != NULL) 
         IUnknown_Release(punk);
     }
 
   } else if( (*psaTarget)->fFeatures & FADF_BSTR) {  /* the target contain BSTR
-                                                        that must be freed */
+                                                        that must be freed */ 
     for(lDelta=0;lDelta < ulWholeArraySize; lDelta++) {
-      bstr =
+      bstr = 
         *(BSTR*)((char *) (*psaTarget)->pvData + (lDelta * (*psaTarget)->cbElements));
 
-      if( bstr != NULL)
+      if( bstr != NULL) 
         SysFreeString( bstr );
     }
@@ -630 +630 @@
 }
 
-/************************************************************************
- *      SafeArrayDestroy
+/************************************************************************ 
+ *              SafeArrayDestroy
  * Deallocates all memory reserved for the SafeArray
  */
 HRESULT WINAPI SafeArrayDestroy(
   SAFEARRAY * psa)
-{
+{ 
   HRESULT hRes;
 
-  if(! validArg(psa))
-    return E_INVALIDARG;
-
-  if(psa->cLocks > 0)
+  if(! validArg(psa)) 
+    return E_INVALIDARG;
+
+  if(psa->cLocks > 0) 
     return DISP_E_ARRAYISLOCKED;
 
@@ -652 +652 @@
 }
 
-/************************************************************************
- *      SafeArrayCopy
+/************************************************************************ 
+ *              SafeArrayCopy
  * Make a dupplicate of a SafeArray
  */
 HRESULT WINAPI SafeArrayCopy(
-  SAFEARRAY *psa,
+  SAFEARRAY *psa, 
   SAFEARRAY **ppsaOut)
-{
+{ 
   HRESULT hRes;
   DWORD   dAllocSize;
   ULONG   ulWholeArraySize; /* size of the thing */
 
-  if(! validArg(psa))
+  if(! validArg(psa)) 
     return E_INVALIDARG;
 
@@ -670 +670 @@
 
     /* Duplicate the SAFEARRAY struc */
-    memcpy(*ppsaOut, psa,
+    memcpy(*ppsaOut, psa, 
             sizeof(*psa)+(sizeof(*(psa->rgsabound))*(psa->cDims-1)));
 
@@ -677 +677 @@
     /* make sure the new safe array doesn't have the FADF_CREATEVECTOR flag,
        because the data has not been allocated with the descriptor. */
-    (*ppsaOut)->fFeatures &= ~FADF_CREATEVECTOR;
-
-    /* Get the allocated memory size for source and allocate it for target */
+    (*ppsaOut)->fFeatures &= ~FADF_CREATEVECTOR;  
+ 
+    /* Get the allocated memory size for source and allocate it for target */ 
     ulWholeArraySize = getArraySize(psa); /* Number of item in SA */
     dAllocSize = ulWholeArraySize*psa->cbElements;
 
-    (*ppsaOut)->pvData =
+    (*ppsaOut)->pvData = 
       HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dAllocSize);
     if( (*ppsaOut)->pvData != NULL) {   /* HeapAlloc succeed */
@@ -693 +693 @@
         return hRes;
       }
-
+        
     } else { /* failed to allocate or dupplicate... */
       SafeArrayDestroyDescriptor(*ppsaOut);
@@ -705 +705 @@
 }
 
-/************************************************************************
- *      SafeArrayCreateVector
- * Creates a one dimension safearray where the data is next to the
+/************************************************************************ 
+ *              SafeArrayCreateVector
+ * Creates a one dimension safearray where the data is next to the 
  * SAFEARRAY structure.
  */
 SAFEARRAY* WINAPI SafeArrayCreateVector(
-  VARTYPE vt,
-  LONG    lLbound,
-  ULONG   cElements)
-{
+  VARTYPE vt, 
+  LONG    lLbound, 
+  ULONG   cElements) 
+{ 
   SAFEARRAY *psa;
 
@@ -723 +723 @@
 
   /* Allocate memory for the array descriptor and data contiguously  */
-  if( FAILED( psa = HeapAlloc( GetProcessHeap(),
-                      HEAP_ZERO_MEMORY,
+  if( FAILED( psa = HeapAlloc( GetProcessHeap(), 
+                      HEAP_ZERO_MEMORY, 
                       (sizeof(*psa) + (VARTYPE_SIZE[vt] * cElements))))) {
     return NULL;
   }
-
-  /* setup data members... */
+                                                                                
+  /* setup data members... */ 
   psa->cDims      = 1; /* always and forever */
   psa->fFeatures  = getFeatures(vt) | FADF_CREATEVECTOR;  /* undocumented flag used by Microsoft */
@@ -739 +739 @@
   psa->rgsabound[0].lLbound   = lLbound;
 
-  return(psa);
-}
-
-/************************************************************************
- *      SafeArrayRedim
+  return(psa);                            
+} 
+
+/************************************************************************ 
+ *              SafeArrayRedim
  * Changes the caracteristics of the last dimension of the SafeArray
  */
 HRESULT WINAPI SafeArrayRedim(
-  SAFEARRAY      *psa,
+  SAFEARRAY      *psa, 
   SAFEARRAYBOUND *psaboundNew)
-{
+{ 
   LONG   lDelta;  /* hold difference in size */
   USHORT cDims=1; /* dims counter */
 
-  if( !validArg(psa) )
-    return E_INVALIDARG;
-
-  if( psa->cLocks > 0 )
+  if( !validArg(psa) )                    
+    return E_INVALIDARG;
+
+  if( psa->cLocks > 0 )                    
     return DISP_E_ARRAYISLOCKED;
 
-  if( psa->fFeatures & FADF_FIXEDSIZE )
-    return E_INVALIDARG;
-
-  if( SafeArrayLock(psa)==E_UNEXPECTED )
+  if( psa->fFeatures & FADF_FIXEDSIZE )    
+    return E_INVALIDARG;
+
+  if( SafeArrayLock(psa)==E_UNEXPECTED ) 
     return E_UNEXPECTED;/* UNDOC error condition */
 
@@ -774 +774 @@
 
   } else /* need to enlarge (lDelta +) reduce (lDelta -) */
-    if(! resizeSafeArray(psa, lDelta))
+    if(! resizeSafeArray(psa, lDelta)) 
       return E_UNEXPECTED; /* UNDOC error condition */
 
-  /* the only modifyable dimension sits in [0] as the dimensions were reversed
+  /* the only modifyable dimension sits in [0] as the dimensions were reversed  
      at array creation time... */
   psa->rgsabound[0].cElements = psaboundNew->cElements;
@@ -789 +789 @@
  ************************************************************************/
 
-/************************************************************************
+/************************************************************************ 
  * Used to validate the SAFEARRAY type of arg
  */
 static BOOL validArg(
-  SAFEARRAY *psa)
+  SAFEARRAY *psa) 
 {
   SAFEARRAYBOUND *sab;
@@ -822 +822 @@
 }
 
-/************************************************************************
+/************************************************************************ 
  * Used to reallocate memory
  */
 static BOOL resizeSafeArray(
-  SAFEARRAY *psa,
+  SAFEARRAY *psa, 
   LONG lDelta)
 {
   ULONG    ulWholeArraySize;  /* use as multiplicator */
-  PVOID    pvNewBlock = NULL;
+  PVOID    pvNewBlock = NULL;  
   IUnknown *punk;
   BSTR   bstr;
@@ -838 +838 @@
   if(lDelta < 0) {                    /* array needs to be shorthen  */
     if( isPointer(psa->fFeatures))    /* ptr that need to be released */
-        for(;lDelta < 0; lDelta++) {
-          punk = *(IUnknown**)
+            for(;lDelta < 0; lDelta++) {
+              punk = *(IUnknown**)
           ((char *) psa->pvData+((ulWholeArraySize+lDelta)*psa->cbElements));
-
+        
         if( punk != NULL )
           IUnknown_Release(punk);
-        }
+            }
 
     else if(psa->fFeatures & FADF_BSTR)  /* BSTR that need to be freed */
-        for(;lDelta < 0; lDelta++) {
+            for(;lDelta < 0; lDelta++) {
         bstr = *(BSTR*)
           ((char *) psa->pvData+((ulWholeArraySize+lDelta)*psa->cbElements));
@@ -858 +858 @@
   if (!(psa->fFeatures & FADF_CREATEVECTOR))
   {
-    /* Ok now, if we are enlarging the array, we *MUST* move the whole block
+    /* Ok now, if we are enlarging the array, we *MUST* move the whole block 
        pointed to by pvData.   If we are shorthening the array, this move is
-       optional but we do it anyway becuase the benefit is that we are
+       optional but we do it anyway becuase the benefit is that we are 
        releasing to the system the unused memory */
 
-    if((pvNewBlock = HeapReAlloc(GetProcessHeap(), 0, psa->pvData,
-       (ulWholeArraySize + lDelta) * psa->cbElements)) == NULL)
+    if((pvNewBlock = HeapReAlloc(GetProcessHeap(), 0, psa->pvData, 
+       (ulWholeArraySize + lDelta) * psa->cbElements)) == NULL) 
         return FALSE; /* TODO If we get here it means:
                          SHRINK situation :  we've deleted the undesired
@@ -873 +873 @@
   else
   {
-    /* Allocate a new block, because the previous data has been allocated with
+    /* Allocate a new block, because the previous data has been allocated with 
        the descriptor in SafeArrayCreateVector function. */
 
     if((pvNewBlock = HeapAlloc(GetProcessHeap(), 0,
-       ulWholeArraySize * psa->cbElements)) == NULL)
+       ulWholeArraySize * psa->cbElements)) == NULL) 
         return FALSE;
 
@@ -887 +887 @@
 }
 
-/************************************************************************
- * Used to set the fFeatures data member of the SAFEARRAY structure.
+/************************************************************************ 
+ * Used to set the fFeatures data member of the SAFEARRAY structure. 
  */
 static INT getFeatures(
-  VARTYPE vt)
+  VARTYPE vt) 
 {
   switch(vt) {
@@ -901 +901 @@
 }
 
-/************************************************************************
- * Used to figure out if the fFeatures data member of the SAFEARRAY
- * structure contain any information about the type of data stored...
+/************************************************************************ 
+ * Used to figure out if the fFeatures data member of the SAFEARRAY 
+ * structure contain any information about the type of data stored... 
  */
 static BOOL isPointer(
-  USHORT feature)
+  USHORT feature) 
 {
   switch(feature) {
@@ -915 +915 @@
 }
 
-/************************************************************************
- * Used to calculate the displacement when accessing or modifying
+/************************************************************************ 
+ * Used to calculate the displacement when accessing or modifying 
  * safearray data set.
  *
@@ -926 +926 @@
  */
 static ULONG calcDisplacement(
-  LONG           *coor,
-  SAFEARRAYBOUND *mat,
-  LONG           dim)
+  LONG           *coor, 
+  SAFEARRAYBOUND *mat, 
+  LONG           dim) 
 {
   ULONG res = 0;
   LONG  iterDim;
 
-  for(iterDim=0; iterDim<dim; iterDim++)
+  for(iterDim=0; iterDim<dim; iterDim++) 
     /* the -mat[dim] bring coor[dim] relative to 0 for calculation */
-    res += ((coor[iterDim]-mat[iterDim].lLbound) *
+    res += ((coor[iterDim]-mat[iterDim].lLbound) * 
             endOfDim(coor, mat, iterDim+1, dim));
 
@@ -942 +942 @@
 }
 
-/************************************************************************
- * Recursivity agent for calcDisplacement method.  Used within Put and
+/************************************************************************ 
+ * Recursivity agent for calcDisplacement method.  Used within Put and 
  * Get methods.
  */
 static INT endOfDim(
-  LONG           *coor,
-  SAFEARRAYBOUND *mat,
-  LONG           dim,
-  LONG           realDim)
-{
-  if(dim==realDim)
+  LONG           *coor, 
+  SAFEARRAYBOUND *mat, 
+  LONG           dim, 
+  LONG           realDim) 
+{
+  if(dim==realDim) 
     return 1;
-  else
+  else 
     return (endOfDim(coor, mat, dim+1, realDim) * mat[dim].cElements);
 }
 
 
-/************************************************************************
- * Method used to validate the coordinate received in Put and Get
+/************************************************************************ 
+ * Method used to validate the coordinate received in Put and Get 
  * methods.
  */
 static BOOL validCoordinate(
-  LONG      *coor,
-  SAFEARRAY *psa)
+  LONG      *coor, 
+  SAFEARRAY *psa) 
 {
   INT   iter=0;
@@ -977 +977 @@
     if((hRes = SafeArrayGetUBound(psa, iter, &lUBound)) != S_OK)
       return FALSE;
-
-    if(lLBound == lUBound)
-      return FALSE;
-
+ 
+    if(lLBound == lUBound) 
+      return FALSE; 
+   
     if((coor[iter] >= lLBound) && (coor[iter] <= lUBound))
       return TRUE;
@@ -987 +987 @@
   }
   return FALSE;
-}
-
-/************************************************************************
+}  
+
+/************************************************************************ 
  * Method used to calculate the number of cells of the SA
  */
 static ULONG getArraySize(
-  SAFEARRAY *psa)
-{
-  USHORT cCount;
+  SAFEARRAY *psa) 
+{
+  USHORT cCount; 
   ULONG  ulWholeArraySize = 1;
 
@@ -1001 +1001 @@
     ulWholeArraySize *= psa->rgsabound[cCount].cElements;
 
-  return ulWholeArraySize;
-}
-
-
-/************************************************************************
+  return ulWholeArraySize;  
+}
+
+
+/************************************************************************ 
  * Method used to handle data space dupplication for Copy32 and CopyData32
  */
 static HRESULT duplicateData(
-  SAFEARRAY *psa,
-  SAFEARRAY **ppsaOut)
+  SAFEARRAY *psa, 
+  SAFEARRAY **ppsaOut) 
 {
   ULONG    ulWholeArraySize; /* size of the thing */
@@ -1018 +1018 @@
 
   ulWholeArraySize = getArraySize(psa); /* Number of item in SA */
-
+  
   SafeArrayLock(*ppsaOut);
 
-  if( isPointer(psa->fFeatures) ) {  /* If datatype is object increment
+  if( isPointer(psa->fFeatures) ) {  /* If datatype is object increment 
                                         object's reference count */
 
@@ -1032 +1032 @@
 
     /* Copy the source array data into target array */
-    memcpy((*ppsaOut)->pvData, psa->pvData,
+    memcpy((*ppsaOut)->pvData, psa->pvData, 
       ulWholeArraySize*psa->cbElements);
 
-  } else if( psa->fFeatures & FADF_BSTR ) { /* if datatype is BSTR allocate
+  } else if( psa->fFeatures & FADF_BSTR ) { /* if datatype is BSTR allocate 
                                                the BSTR in the new array */
 
@@ -1046 +1046 @@
       }
 
-      *((BSTR*)((char *) (*ppsaOut)->pvData+(lDelta * psa->cbElements))) =
+      *((BSTR*)((char *) (*ppsaOut)->pvData+(lDelta * psa->cbElements))) = 
         pbstrReAllocStr;
     }
@@ -1052 +1052 @@
   } else { /* Simply copy the source array data into target array */
 
-    memcpy((*ppsaOut)->pvData, psa->pvData,
+    memcpy((*ppsaOut)->pvData, psa->pvData, 
       ulWholeArraySize*psa->cbElements);
   }
@@ -1062 +1062 @@
 
 
-/************************************************************************
- *      SafeArrayGetVarType
+/************************************************************************ 
+ *              SafeArrayGetVarType
  * Returns the VARTYPE stored in the given safearray
  */
@@ -1099 +1099 @@
     hr = S_OK;
   }
-
+  
   TRACE("HRESULT = %08lx", hr);
   return hr;

trunk/src/oleaut32/typelib.c

@@ -2394 +2394 @@
 }
 
-static void SLTG_ProcessCoClass(char *pBlk, ITypeInfoImpl *pTI,
-                                char *pNameTable)
+static SLTG_TypeInfoTail *SLTG_ProcessCoClass(char *pBlk, ITypeInfoImpl *pTI,
+                                              char *pNameTable)
 {
     SLTG_TypeInfoHeader *pTIHeader = (SLTG_TypeInfoHeader*)pBlk;
@@ -2415 +2415 @@
     }
 
-    return;
-}
-
-
-static void SLTG_ProcessInterface(char *pBlk, ITypeInfoImpl *pTI,
-                                  char *pNameTable)
+    return (SLTG_TypeInfoTail*)(pFirstItem + pMemHeader->cbExtra);
+}
+
+
+static SLTG_TypeInfoTail *SLTG_ProcessInterface(char *pBlk, ITypeInfoImpl *pTI,
+                                                char *pNameTable)
 {
     SLTG_TypeInfoHeader *pTIHeader = (SLTG_TypeInfoHeader*)pBlk;
@@ -2451 +2451 @@
            pFunc->magic != SLTG_FUNCTION_WITH_FLAGS_MAGIC) {
             FIXME("func magic = %02x\n", pFunc->magic);
-            return;
+            return NULL;
         }
         *ppFuncDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
@@ -2530 +2530 @@
     pTI->TypeAttr.cFuncs = num;
     dump_TLBFuncDesc(pTI->funclist);
-}
-
-static void SLTG_ProcessRecord(char *pBlk, ITypeInfoImpl *pTI, char *pNameTable)
+    return (SLTG_TypeInfoTail*)(pFirstItem + pMemHeader->cbExtra);
+}
+
+static SLTG_TypeInfoTail *SLTG_ProcessRecord(char *pBlk, ITypeInfoImpl *pTI,
+                                             char *pNameTable)
 {
   SLTG_TypeInfoHeader *pTIHeader = (SLTG_TypeInfoHeader*)pBlk;
@@ -2550 +2552 @@
       if(pItem->magic != SLTG_RECORD_MAGIC) {
           FIXME("record magic = %02x\n", pItem->magic);
-          return;
+          return NULL;
       }
       *ppVarDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
@@ -2579 +2581 @@
   }
   pTI->TypeAttr.cVars = num;
-}
-
-static void SLTG_ProcessEnum(char *pBlk, ITypeInfoImpl *pTI, char *pNameTable)
+  return (SLTG_TypeInfoTail*)(pFirstItem + pMemHeader->cbExtra);
+}
+
+static SLTG_TypeInfoTail *SLTG_ProcessEnum(char *pBlk, ITypeInfoImpl *pTI,
+                                           char *pNameTable)
 {
   SLTG_TypeInfoHeader *pTIHeader = (SLTG_TypeInfoHeader*)pBlk;
@@ -2616 +2620 @@
   }
   pTI->TypeAttr.cVars = num;
+  return (SLTG_TypeInfoTail*)(pFirstItem + pMemHeader->cbExtra);
 }
 
@@ -2801 +2806 @@
 
       SLTG_TypeInfoHeader *pTIHeader;
+      SLTG_TypeInfoTail *pTITail;
 
       if(strcmp(pBlkEntry[order].index_string + (char*)pMagic,
@@ -2841 +2847 @@
       switch(pTIHeader->typekind) {
       case TKIND_ENUM:
-        SLTG_ProcessEnum(pBlk, *ppTypeInfoImpl, pNameTable); 
+        pTITail = SLTG_ProcessEnum(pBlk, *ppTypeInfoImpl, pNameTable); 
         break;
 
       case TKIND_RECORD:
-        SLTG_ProcessRecord(pBlk, *ppTypeInfoImpl, pNameTable); 
+        pTITail = SLTG_ProcessRecord(pBlk, *ppTypeInfoImpl, pNameTable); 
         break;
 
       case TKIND_INTERFACE:
-        SLTG_ProcessInterface(pBlk, *ppTypeInfoImpl, pNameTable);
+        pTITail = SLTG_ProcessInterface(pBlk, *ppTypeInfoImpl, pNameTable);
         break;
 
       case TKIND_COCLASS:
-        SLTG_ProcessCoClass(pBlk, *ppTypeInfoImpl, pNameTable);
+        pTITail = SLTG_ProcessCoClass(pBlk, *ppTypeInfoImpl, pNameTable);
         break;
 
       default:
         FIXME("Not processing typekind %d\n", pTIHeader->typekind);
+        pTITail = NULL;
         break;
 
       }
 
+      if(pTITail) { /* could get cFuncs, cVars and cImplTypes from here
+                       but we've already set those */
+          (*ppTypeInfoImpl)->TypeAttr.cbAlignment = pTITail->cbAlignment;
+          (*ppTypeInfoImpl)->TypeAttr.cbSizeInstance = pTITail->cbSizeInstance;
+          (*ppTypeInfoImpl)->TypeAttr.cbSizeVft = pTITail->cbSizeVft;
+      }
       ppTypeInfoImpl = &((*ppTypeInfoImpl)->next);
 #ifdef __WIN32OS2__
@@ -3098 +3111 @@
     ICOM_THIS( ITypeLibImpl, iface);
     TRACE("(%p)\n",This);
-    /* FIXME: must do a copy here */
-    *ppTLibAttr=&This->LibAttr;
+    *ppTLibAttr = HeapAlloc(GetProcessHeap(), 0, sizeof(**ppTLibAttr));
+    memcpy(*ppTLibAttr, &This->LibAttr, sizeof(**ppTLibAttr));
     return S_OK;
 }
@@ -3294 +3307 @@
     ICOM_THIS( ITypeLibImpl, iface);
     TRACE("freeing (%p)\n",This);
-    /* nothing to do */
+    HeapFree(GetProcessHeap(),0,pTLibAttr);
+
 }
 

trunk/src/oleaut32/typelib.h

@@ -23 +23 @@
 
 /* There are two known file formats, those created with ICreateTypeLib
- * have the signature "SLGT" as their first four bytes, while those created
+ * have the signature "SLTG" as their first four bytes, while those created
  * with ICreateTypeLib2 have "MSFT".
  */
@@ -377 +377 @@
 
 typedef struct {
+/*00*/  WORD cFuncs;
+/*02*/  WORD cVars;
+/*04*/  WORD cImplTypes;
+/*06*/  WORD res06;
+/*08*/  WORD res08;
+/*0a*/  WORD res0a;
+/*0c*/  WORD res0c;
+/*0e*/  WORD res0e;
+/*10*/  WORD res10;
+/*12*/  WORD res12;
+/*14*/  WORD res14;
+/*16*/  WORD res16;
+/*18*/  WORD res18;
+/*1a*/  WORD res1a;
+/*1c*/  WORD res1c;
+/*1e*/  WORD res1e;
+/*20*/  WORD cbSizeInstance;
+/*22*/  WORD cbAlignment;
+/*24*/  WORD res24;
+/*26*/  WORD res26;
+/*28*/  WORD cbSizeVft;
+/*2a*/  WORD res2a;
+/*2c*/  WORD res2c;
+/*2e*/  WORD res2e;
+/*30*/  WORD res30;
+/*32*/  WORD res32;
+/*34*/  WORD res34;
+} SLTG_TypeInfoTail;
+
+typedef struct {
 /*00*/ WORD res00; /* 0x0001 sometimes 0x0003 ?? */
 /*02*/ WORD res02; /* 0xffff */

trunk/src/oleaut32/variant.c

@@ -28 +28 @@
 
 #include "config.h"
-
+ 
 #include <string.h>
 #include <stdlib.h>
@@ -106 +106 @@
 
 /******************************************************************************
- *     DateTimeStringToTm   [INTERNAL]
+ *         DateTimeStringToTm   [INTERNAL]
  *
  * Converts a string representation of a date and/or time to a tm structure.
@@ -122 +122 @@
 static BOOL DateTimeStringToTm( OLECHAR* strIn, DWORD dwFlags, struct tm* pTm )
 {
-    BOOL res = FALSE;
-    double      fsec;
-    int         tzp;
-    int         dtype;
-    int         nf;
-    char       *field[MAXDATEFIELDS];
-    int         ftype[MAXDATEFIELDS];
-    char        lowstr[MAXDATELEN + 1];
-    char* strDateTime = NULL;
-
-    /* Convert the string to ASCII since this is the only format
-     * postgesql can handle.
-     */
-    strDateTime = HEAP_strdupWtoA( GetProcessHeap(), 0, strIn );
-
-    if( strDateTime != NULL )
-    {
-        /* Make sure we don't go over the maximum length
-         * accepted by postgesql.
-         */
-        if( strlen( strDateTime ) <= MAXDATELEN )
-        {
-            if( ParseDateTime( strDateTime, lowstr, field, ftype, MAXDATEFIELDS, &nf) == 0 )
-            {
-                if( dwFlags & VAR_DATEVALUEONLY )
-                {
-                    /* Get the date information.
-                     * It returns 0 if date information was
-                     * present and 1 if only time information was present.
-                     * -1 if an error occures.
-                     */
-                    if( DecodeDateTime(field, ftype, nf, &dtype, pTm, &fsec, &tzp) == 0 )
-                    {
-                        /* Eliminate the time information since we
-                         * were asked to get date information only.
-                         */
-                        pTm->tm_sec = 0;
-                        pTm->tm_min = 0;
-                        pTm->tm_hour = 0;
-                        res = TRUE;
-                    }
-                }
-                if( dwFlags & VAR_TIMEVALUEONLY )
-                {
-                    /* Get time information only.
-                     */
-                    if( DecodeTimeOnly(field, ftype, nf, &dtype, pTm, &fsec) == 0 )
-                    {
-                        res = TRUE;
-                    }
-                }
-                else
-                {
-                    /* Get both date and time information.
-                     * It returns 0 if date information was
-                     * present and 1 if only time information was present.
-                     * -1 if an error occures.
-                     */
-                    if( DecodeDateTime(field, ftype, nf, &dtype, pTm, &fsec, &tzp) != -1 )
-                    {
-                        res = TRUE;
-                    }
-                }
-            }
-        }
-        HeapFree( GetProcessHeap(), 0, strDateTime );
-    }
-
-    return res;
-}
-
-
-
-
-
-
-/******************************************************************************
- *     TmToDATE     [INTERNAL]
+        BOOL res = FALSE;
+        double          fsec;
+        int             tzp;
+        int             dtype;
+        int             nf;
+        char       *field[MAXDATEFIELDS];
+        int             ftype[MAXDATEFIELDS];
+        char            lowstr[MAXDATELEN + 1];
+        char* strDateTime = NULL;
+
+        /* Convert the string to ASCII since this is the only format
+         * postgesql can handle.
+         */
+        strDateTime = HEAP_strdupWtoA( GetProcessHeap(), 0, strIn );
+
+        if( strDateTime != NULL )
+        {
+                /* Make sure we don't go over the maximum length
+                 * accepted by postgesql.
+                 */
+                if( strlen( strDateTime ) <= MAXDATELEN )
+                {
+                        if( ParseDateTime( strDateTime, lowstr, field, ftype, MAXDATEFIELDS, &nf) == 0 )
+                        {
+                                if( dwFlags & VAR_DATEVALUEONLY )
+                                {
+                                        /* Get the date information.
+                                         * It returns 0 if date information was
+                                         * present and 1 if only time information was present.
+                                         * -1 if an error occures.
+                                         */
+                                        if( DecodeDateTime(field, ftype, nf, &dtype, pTm, &fsec, &tzp) == 0 )
+                                        {
+                                                /* Eliminate the time information since we
+                                                 * were asked to get date information only.
+                                                 */
+                                                pTm->tm_sec = 0;
+                                                pTm->tm_min = 0;
+                                                pTm->tm_hour = 0;
+                                                res = TRUE;
+                                        }
+                                }
+                                if( dwFlags & VAR_TIMEVALUEONLY )
+                                {
+                                        /* Get time information only.
+                                         */
+                                        if( DecodeTimeOnly(field, ftype, nf, &dtype, pTm, &fsec) == 0 )
+                                        {
+                                                res = TRUE;
+                                        }
+                                }
+                                else
+                                {
+                                        /* Get both date and time information.
+                                         * It returns 0 if date information was
+                                         * present and 1 if only time information was present.
+                                         * -1 if an error occures.
+                                         */
+                                        if( DecodeDateTime(field, ftype, nf, &dtype, pTm, &fsec, &tzp) != -1 )
+                                        {
+                                                res = TRUE;
+                                        }
+                                }
+                        }
+                }
+                HeapFree( GetProcessHeap(), 0, strDateTime );
+        }
+
+        return res;
+}
+
+
+
+
+
+
+/******************************************************************************
+ *         TmToDATE     [INTERNAL]
  *
  * The date is implemented using an 8 byte floating-point number.
@@ -216 +216 @@
  * The tm structure is as follows:
  * struct tm {
- *        int tm_sec;      seconds after the minute - [0,59]
- *        int tm_min;      minutes after the hour - [0,59]
- *        int tm_hour;     hours since midnight - [0,23]
- *        int tm_mday;     day of the month - [1,31]
- *        int tm_mon;      months since January - [0,11]
- *        int tm_year;     years
- *        int tm_wday;     days since Sunday - [0,6]
- *        int tm_yday;     days since January 1 - [0,365]
- *        int tm_isdst;    daylight savings time flag
- *        };
+ *                int tm_sec;      seconds after the minute - [0,59]
+ *                int tm_min;      minutes after the hour - [0,59]
+ *                int tm_hour;     hours since midnight - [0,23]
+ *                int tm_mday;     day of the month - [1,31]
+ *                int tm_mon;      months since January - [0,11]
+ *                int tm_year;     years
+ *                int tm_wday;     days since Sunday - [0,6]
+ *                int tm_yday;     days since January 1 - [0,365]
+ *                int tm_isdst;    daylight savings time flag
+ *                };
  *
  * Note: This function does not use the tm_wday, tm_yday, tm_wday,
@@ -235 +235 @@
 static BOOL TmToDATE( struct tm* pTm, DATE *pDateOut )
 {
-    if( (pTm->tm_year - 1900) >= 0 )
-    {
-        int leapYear = 0;
-
-        /* Start at 1. This is the way DATE is defined.
-         * January 1, 1900 at Midnight is 1.00.
-         * January 1, 1900 at 6AM is 1.25.
-         * and so on.
-         */
-        *pDateOut = 1;
-
-        /* Add the number of days corresponding to
-         * tm_year.
-         */
-        *pDateOut += (pTm->tm_year - 1900) * 365;
-
-        /* Add the leap days in the previous years between now and 1900.
-         * Note a leap year is one that is a multiple of 4
-         * but not of a 100.  Except if it is a multiple of
-         * 400 then it is a leap year.
-         */
-        *pDateOut += ( (pTm->tm_year - 1) / 4 ) - ( 1900 / 4 );
-        *pDateOut -= ( (pTm->tm_year - 1) / 100 ) - ( 1900 / 100 );
-        *pDateOut += ( (pTm->tm_year - 1) / 400 ) - ( 1900 / 400 );
-
-        /* Set the leap year flag if the
-         * current year specified by tm_year is a
-         * leap year. This will be used to add a day
-         * to the day count.
-         */
-        if( isleap( pTm->tm_year ) )
-            leapYear = 1;
-
-        /* Add the number of days corresponding to
-         * the month.
-         */
-        switch( pTm->tm_mon )
-        {
-        case 2:
-            *pDateOut += 31;
-            break;
-        case 3:
-            *pDateOut += ( 59 + leapYear );
-            break;
-        case 4:
-            *pDateOut += ( 90 + leapYear );
-            break;
-        case 5:
-            *pDateOut += ( 120 + leapYear );
-            break;
-        case 6:
-            *pDateOut += ( 151 + leapYear );
-            break;
-        case 7:
-            *pDateOut += ( 181 + leapYear );
-            break;
-        case 8:
-            *pDateOut += ( 212 + leapYear );
-            break;
-        case 9:
-            *pDateOut += ( 243 + leapYear );
-            break;
-        case 10:
-            *pDateOut += ( 273 + leapYear );
-            break;
-        case 11:
-            *pDateOut += ( 304 + leapYear );
-            break;
-        case 12:
-            *pDateOut += ( 334 + leapYear );
-            break;
-        }
-        /* Add the number of days in this month.
-         */
-        *pDateOut += pTm->tm_mday;
-
-        /* Add the number of seconds, minutes, and hours
-         * to the DATE. Note these are the fracionnal part
-         * of the DATE so seconds / number of seconds in a day.
-         */
-        *pDateOut += pTm->tm_hour / 24.0;
-        *pDateOut += pTm->tm_min / 1440.0;
-        *pDateOut += pTm->tm_sec / 86400.0;
-        return TRUE;
-    }
-    return FALSE;
-}
-
-/******************************************************************************
- *     DateToTm     [INTERNAL]
+        if( (pTm->tm_year - 1900) >= 0 )
+        {
+                int leapYear = 0;
+                
+                /* Start at 1. This is the way DATE is defined.
+                 * January 1, 1900 at Midnight is 1.00.
+                 * January 1, 1900 at 6AM is 1.25.
+                 * and so on.
+                 */
+                *pDateOut = 1;
+
+                /* Add the number of days corresponding to
+                 * tm_year.
+                 */
+                *pDateOut += (pTm->tm_year - 1900) * 365;
+
+                /* Add the leap days in the previous years between now and 1900.
+                 * Note a leap year is one that is a multiple of 4
+                 * but not of a 100.  Except if it is a multiple of
+                 * 400 then it is a leap year.
+                 */
+                *pDateOut += ( (pTm->tm_year - 1) / 4 ) - ( 1900 / 4 );
+                *pDateOut -= ( (pTm->tm_year - 1) / 100 ) - ( 1900 / 100 );
+                *pDateOut += ( (pTm->tm_year - 1) / 400 ) - ( 1900 / 400 );
+
+                /* Set the leap year flag if the
+                 * current year specified by tm_year is a
+                 * leap year. This will be used to add a day
+                 * to the day count.
+                 */
+                if( isleap( pTm->tm_year ) )
+                        leapYear = 1;
+                
+                /* Add the number of days corresponding to
+                 * the month.
+                 */
+                switch( pTm->tm_mon )
+                {
+                case 2:
+                        *pDateOut += 31;
+                        break;
+                case 3:
+                        *pDateOut += ( 59 + leapYear );
+                        break;
+                case 4:
+                        *pDateOut += ( 90 + leapYear );
+                        break;
+                case 5:
+                        *pDateOut += ( 120 + leapYear );
+                        break;
+                case 6:
+                        *pDateOut += ( 151 + leapYear );
+                        break;
+                case 7:
+                        *pDateOut += ( 181 + leapYear );
+                        break;
+                case 8:
+                        *pDateOut += ( 212 + leapYear );
+                        break;
+                case 9:
+                        *pDateOut += ( 243 + leapYear );
+                        break;
+                case 10:
+                        *pDateOut += ( 273 + leapYear );
+                        break;
+                case 11:
+                        *pDateOut += ( 304 + leapYear );
+                        break;
+                case 12:
+                        *pDateOut += ( 334 + leapYear );
+                        break;
+                }
+                /* Add the number of days in this month.
+                 */
+                *pDateOut += pTm->tm_mday;
+        
+                /* Add the number of seconds, minutes, and hours
+                 * to the DATE. Note these are the fracionnal part
+                 * of the DATE so seconds / number of seconds in a day.
+                 */
+                *pDateOut += pTm->tm_hour / 24.0;
+                *pDateOut += pTm->tm_min / 1440.0;
+                *pDateOut += pTm->tm_sec / 86400.0;
+                return TRUE;
+        }
+        return FALSE;
+}
+
+/******************************************************************************
+ *         DateToTm     [INTERNAL]
  *
  * This function converts a windows DATE to a tm structure.
@@ -339 +339 @@
 static BOOL DateToTm( DATE dateIn, DWORD dwFlags, struct tm* pTm )
 {
-    /* Do not process dates smaller than January 1, 1900.
-     * Which corresponds to 2.0 in the windows DATE format.
-     */
-    if( dateIn >= 2.0 )
-    {
-        double decimalPart = 0.0;
-        double wholePart = 0.0;
-
-        memset(pTm,0,sizeof(*pTm));
-
-        /* Because of the nature of DATE format which
-         * associates 2.0 to January 1, 1900. We will
-         * remove 1.0 from the whole part of the DATE
-         * so that in the following code 1.0
-         * will correspond to January 1, 1900.
-         * This simplifies the processing of the DATE value.
-         */
-        dateIn -= 1.0;
-
-        wholePart = (double) floor( dateIn );
-        decimalPart = fmod( dateIn, wholePart );
-
-        if( !(dwFlags & VAR_TIMEVALUEONLY) )
-        {
-            int nDay = 0;
-            int leapYear = 0;
-            double yearsSince1900 = 0;
-            /* Start at 1900, this is where the DATE time 0.0 starts.
-             */
-            pTm->tm_year = 1900;
-            /* find in what year the day in the "wholePart" falls into.
-             * add the value to the year field.
-             */
-            yearsSince1900 = floor( (wholePart / DAYS_IN_ONE_YEAR) + 0.001 );
-            pTm->tm_year += yearsSince1900;
-            /* determine if this is a leap year.
-             */
-            if( isleap( pTm->tm_year ) )
-            {
-                leapYear = 1;
-                wholePart++;
-            }
-
-            /* find what day of that year the "wholePart" corresponds to.
-             * Note: nDay is in [1-366] format
-             */
-            nDay = (int) ( wholePart - floor( yearsSince1900 * DAYS_IN_ONE_YEAR ) );
-            /* Set the tm_yday value.
-             * Note: The day must be converted from [1-366] to [0-365]
-             */
-            /*pTm->tm_yday = nDay - 1;*/
-            /* find which month this day corresponds to.
-             */
-            if( nDay <= 31 )
-            {
-                pTm->tm_mday = nDay;
-                pTm->tm_mon = 0;
-            }
-            else if( nDay <= ( 59 + leapYear ) )
-            {
-                pTm->tm_mday = nDay - 31;
-                pTm->tm_mon = 1;
-            }
-            else if( nDay <= ( 90 + leapYear ) )
-            {
-                pTm->tm_mday = nDay - ( 59 + leapYear );
-                pTm->tm_mon = 2;
-            }
-            else if( nDay <= ( 120 + leapYear ) )
-            {
-                pTm->tm_mday = nDay - ( 90 + leapYear );
-                pTm->tm_mon = 3;
-            }
-            else if( nDay <= ( 151 + leapYear ) )
-            {
-                pTm->tm_mday = nDay - ( 120 + leapYear );
-                pTm->tm_mon = 4;
-            }
-            else if( nDay <= ( 181 + leapYear ) )
-            {
-                pTm->tm_mday = nDay - ( 151 + leapYear );
-                pTm->tm_mon = 5;
-            }
-            else if( nDay <= ( 212 + leapYear ) )
-            {
-                pTm->tm_mday = nDay - ( 181 + leapYear );
-                pTm->tm_mon = 6;
-            }
-            else if( nDay <= ( 243 + leapYear ) )
-            {
-                pTm->tm_mday = nDay - ( 212 + leapYear );
-                pTm->tm_mon = 7;
-            }
-            else if( nDay <= ( 273 + leapYear ) )
-            {
-                pTm->tm_mday = nDay - ( 243 + leapYear );
-                pTm->tm_mon = 8;
-            }
-            else if( nDay <= ( 304 + leapYear ) )
-            {
-                pTm->tm_mday = nDay - ( 273 + leapYear );
-                pTm->tm_mon = 9;
-            }
-            else if( nDay <= ( 334 + leapYear ) )
-            {
-                pTm->tm_mday = nDay - ( 304 + leapYear );
-                pTm->tm_mon = 10;
-            }
-            else if( nDay <= ( 365 + leapYear ) )
-            {
-                pTm->tm_mday = nDay - ( 334 + leapYear );
-                pTm->tm_mon = 11;
-            }
-        }
-        if( !(dwFlags & VAR_DATEVALUEONLY) )
-        {
-            /* find the number of seconds in this day.
-             * fractional part times, hours, minutes, seconds.
-             */
-            pTm->tm_hour = (int) ( decimalPart * 24 );
-            pTm->tm_min = (int) ( ( ( decimalPart * 24 ) - pTm->tm_hour ) * 60 );
-            pTm->tm_sec = (int) ( ( ( decimalPart * 24 * 60 ) - ( pTm->tm_hour * 60 ) - pTm->tm_min ) * 60 );
-        }
-        return TRUE;
-    }
-    return FALSE;
-}
-
-
-
-/******************************************************************************
- *     SizeOfVariantData    [INTERNAL]
+        /* Do not process dates smaller than January 1, 1900.
+         * Which corresponds to 2.0 in the windows DATE format.
+         */
+        if( dateIn >= 2.0 )
+        {
+                double decimalPart = 0.0;
+                double wholePart = 0.0;
+
+                memset(pTm,0,sizeof(*pTm));
+        
+                /* Because of the nature of DATE format which
+                 * associates 2.0 to January 1, 1900. We will
+                 * remove 1.0 from the whole part of the DATE
+                 * so that in the following code 1.0
+                 * will correspond to January 1, 1900.
+                 * This simplifies the processing of the DATE value.
+                 */
+                dateIn -= 1.0;
+
+                wholePart = (double) floor( dateIn );
+                decimalPart = fmod( dateIn, wholePart );
+
+                if( !(dwFlags & VAR_TIMEVALUEONLY) )
+                {
+                        int nDay = 0;
+                        int leapYear = 0;
+                        double yearsSince1900 = 0;
+                        /* Start at 1900, this is where the DATE time 0.0 starts.
+                         */
+                        pTm->tm_year = 1900;
+                        /* find in what year the day in the "wholePart" falls into.
+                         * add the value to the year field.
+                         */
+                        yearsSince1900 = floor( (wholePart / DAYS_IN_ONE_YEAR) + 0.001 );
+                        pTm->tm_year += yearsSince1900;
+                        /* determine if this is a leap year.
+                         */
+                        if( isleap( pTm->tm_year ) )
+                        {
+                                leapYear = 1;
+                                wholePart++;
+                        }
+
+                        /* find what day of that year the "wholePart" corresponds to.
+                         * Note: nDay is in [1-366] format
+                         */
+                        nDay = (int) ( wholePart - floor( yearsSince1900 * DAYS_IN_ONE_YEAR ) );
+                        /* Set the tm_yday value.
+                         * Note: The day must be converted from [1-366] to [0-365]
+                         */
+                        /*pTm->tm_yday = nDay - 1;*/
+                        /* find which month this day corresponds to.
+                         */
+                        if( nDay <= 31 )
+                        {
+                                pTm->tm_mday = nDay;
+                                pTm->tm_mon = 0;
+                        }
+                        else if( nDay <= ( 59 + leapYear ) )
+                        {
+                                pTm->tm_mday = nDay - 31;
+                                pTm->tm_mon = 1;
+                        }
+                        else if( nDay <= ( 90 + leapYear ) )
+                        {
+                                pTm->tm_mday = nDay - ( 59 + leapYear );
+                                pTm->tm_mon = 2;
+                        }
+                        else if( nDay <= ( 120 + leapYear ) )
+                        {
+                                pTm->tm_mday = nDay - ( 90 + leapYear );
+                                pTm->tm_mon = 3;
+                        }
+                        else if( nDay <= ( 151 + leapYear ) )
+                        {
+                                pTm->tm_mday = nDay - ( 120 + leapYear );
+                                pTm->tm_mon = 4;
+                        }
+                        else if( nDay <= ( 181 + leapYear ) )
+                        {
+                                pTm->tm_mday = nDay - ( 151 + leapYear );
+                                pTm->tm_mon = 5;
+                        }
+                        else if( nDay <= ( 212 + leapYear ) )
+                        {
+                                pTm->tm_mday = nDay - ( 181 + leapYear );
+                                pTm->tm_mon = 6;
+                        }
+                        else if( nDay <= ( 243 + leapYear ) )
+                        {
+                                pTm->tm_mday = nDay - ( 212 + leapYear );
+                                pTm->tm_mon = 7;
+                        }
+                        else if( nDay <= ( 273 + leapYear ) )
+                        {
+                                pTm->tm_mday = nDay - ( 243 + leapYear );
+                                pTm->tm_mon = 8;
+                        }
+                        else if( nDay <= ( 304 + leapYear ) )
+                        {
+                                pTm->tm_mday = nDay - ( 273 + leapYear );
+                                pTm->tm_mon = 9;
+                        }
+                        else if( nDay <= ( 334 + leapYear ) )
+                        {
+                                pTm->tm_mday = nDay - ( 304 + leapYear );
+                                pTm->tm_mon = 10;
+                        }
+                        else if( nDay <= ( 365 + leapYear ) )
+                        {
+                                pTm->tm_mday = nDay - ( 334 + leapYear );
+                                pTm->tm_mon = 11;
+                        }
+                }
+                if( !(dwFlags & VAR_DATEVALUEONLY) )
+                {
+                        /* find the number of seconds in this day.
+                         * fractional part times, hours, minutes, seconds.
+                         */
+                        pTm->tm_hour = (int) ( decimalPart * 24 );
+                        pTm->tm_min = (int) ( ( ( decimalPart * 24 ) - pTm->tm_hour ) * 60 );
+                        pTm->tm_sec = (int) ( ( ( decimalPart * 24 * 60 ) - ( pTm->tm_hour * 60 ) - pTm->tm_min ) * 60 );
+                }
+                return TRUE;
+        }
+        return FALSE;
+}
+
+
+
+/******************************************************************************
+ *         SizeOfVariantData    [INTERNAL]
  *
  * This function finds the size of the data referenced by a Variant based
@@ -528 +528 @@
 }
 /******************************************************************************
- *     StringDupAtoBstr     [INTERNAL]
- *
+ *         StringDupAtoBstr             [INTERNAL]
+ * 
  */
 static BSTR StringDupAtoBstr( char* strIn )
 {
-    BSTR bstr = NULL;
-    OLECHAR* pNewString = NULL;
-    pNewString = HEAP_strdupAtoW( GetProcessHeap(), 0, strIn );
-    bstr = SysAllocString( pNewString );
-    HeapFree( GetProcessHeap(), 0, pNewString );
-    return bstr;
-}
-
-/******************************************************************************
- *      round       [INTERNAL]
+        BSTR bstr = NULL;
+        OLECHAR* pNewString = NULL;
+        pNewString = HEAP_strdupAtoW( GetProcessHeap(), 0, strIn );
+        bstr = SysAllocString( pNewString );
+        HeapFree( GetProcessHeap(), 0, pNewString );
+        return bstr;
+}
+
+/******************************************************************************
+ *              round           [INTERNAL]
  *
  * Round the double value to the nearest integer value.
@@ -556 +556 @@
    nSign = (d >= 0.0) ? 1 : -1;
     d = fabs( d );
-
-    /* Remove the decimals.
-     */
+    
+        /* Remove the decimals.
+         */
    integerValue = floor( d );
 
@@ -573 +573 @@
     decimals = d - integerValue;
 
-    /* Note: Ceil returns the smallest integer that is greater that x.
-     * and floor returns the largest integer that is less than or equal to x.
-     */
+        /* Note: Ceil returns the smallest integer that is greater that x.
+         * and floor returns the largest integer that is less than or equal to x.
+         */
     if( decimals > 0.5 )
     {
@@ -603 +603 @@
     }
 
-    return roundedValue * nSign;
-}
-
-/******************************************************************************
- *      RemoveCharacterFromString       [INTERNAL]
+        return roundedValue * nSign;
+}
+
+/******************************************************************************
+ *              RemoveCharacterFromString               [INTERNAL]
  *
  * Removes any of the characters in "strOfCharToRemove" from the "str" argument.
@@ -613 +613 @@
 static void RemoveCharacterFromString( LPSTR str, LPSTR strOfCharToRemove )
 {
-    LPSTR pNewString = NULL;
-    LPSTR strToken = NULL;
-
-
-    /* Check if we have a valid argument
-     */
-    if( str != NULL )
-    {
-        pNewString = strdup( str );
-        str[0] = '\0';
-        strToken = strtok( pNewString, strOfCharToRemove );
-        while( strToken != NULL ) {
-            strcat( str, strToken );
-            strToken = strtok( NULL, strOfCharToRemove );
-        }
-        free( pNewString );
-    }
-    return;
-}
-
-/******************************************************************************
- *      GetValidRealString      [INTERNAL]
+        LPSTR pNewString = NULL;
+        LPSTR strToken = NULL;
+
+
+        /* Check if we have a valid argument
+         */
+        if( str != NULL )
+        {
+                pNewString = strdup( str );
+                str[0] = '\0';
+                strToken = strtok( pNewString, strOfCharToRemove );
+                while( strToken != NULL ) { 
+                        strcat( str, strToken );
+                        strToken = strtok( NULL, strOfCharToRemove );
+                }
+                free( pNewString );
+        }
+        return;
+}
+
+/******************************************************************************
+ *              GetValidRealString              [INTERNAL]
  *
  * Checks if the string is of proper format to be converted to a real value.
@@ -640 +640 @@
 static BOOL IsValidRealString( LPSTR strRealString )
 {
-    /* Real values that have a decimal point are required to either have
-     * digits before or after the decimal point.  We will assume that
-     * we do not have any digits at either position. If we do encounter
-     * some we will disable this flag.
-     */
-    BOOL bDigitsRequired = TRUE;
-    /* Processed fields in the string representation of the real number.
-     */
-    BOOL bWhiteSpaceProcessed = FALSE;
-    BOOL bFirstSignProcessed = FALSE;
-    BOOL bFirstDigitsProcessed = FALSE;
-    BOOL bDecimalPointProcessed = FALSE;
-    BOOL bSecondDigitsProcessed = FALSE;
-    BOOL bExponentProcessed = FALSE;
-    BOOL bSecondSignProcessed = FALSE;
-    BOOL bThirdDigitsProcessed = FALSE;
-    /* Assume string parameter "strRealString" is valid and try to disprove it.
-     */
-    BOOL bValidRealString = TRUE;
-
-    /* Used to count the number of tokens in the "strRealString".
-     */
-    LPSTR strToken = NULL;
-    int nTokens = 0;
-    LPSTR pChar = NULL;
-
-    /* Check if we have a valid argument
-     */
-    if( strRealString == NULL )
-    {
-        bValidRealString = FALSE;
-    }
-
-    if( bValidRealString == TRUE )
-    {
-        /* Make sure we only have ONE token in the string.
-         */
-        strToken = strtok( strRealString, " " );
-        while( strToken != NULL ) {
-            nTokens++;
-            strToken = strtok( NULL, " " );
-        }
-
-        if( nTokens != 1 )
-        {
-            bValidRealString = FALSE;
-        }
-    }
-
-
-    /* Make sure this token contains only valid characters.
-     * The string argument to atof has the following form:
-     * [whitespace] [sign] [digits] [.digits] [ {d | D | e | E }[sign]digits]
-     * Whitespace consists of space and|or <TAB> characters, which are ignored.
+        /* Real values that have a decimal point are required to either have
+         * digits before or after the decimal point.  We will assume that
+         * we do not have any digits at either position. If we do encounter
+         * some we will disable this flag.
+         */
+        BOOL bDigitsRequired = TRUE;
+        /* Processed fields in the string representation of the real number.
+         */
+        BOOL bWhiteSpaceProcessed = FALSE;
+        BOOL bFirstSignProcessed = FALSE;
+        BOOL bFirstDigitsProcessed = FALSE;
+        BOOL bDecimalPointProcessed = FALSE;
+        BOOL bSecondDigitsProcessed = FALSE;
+        BOOL bExponentProcessed = FALSE;
+        BOOL bSecondSignProcessed = FALSE;
+        BOOL bThirdDigitsProcessed = FALSE;
+        /* Assume string parameter "strRealString" is valid and try to disprove it.
+         */
+        BOOL bValidRealString = TRUE;
+
+        /* Used to count the number of tokens in the "strRealString".
+         */
+        LPSTR strToken = NULL;
+        int nTokens = 0;
+        LPSTR pChar = NULL;
+        
+        /* Check if we have a valid argument
+         */
+        if( strRealString == NULL )
+        {
+                bValidRealString = FALSE;
+        }
+
+        if( bValidRealString == TRUE )
+        {
+                /* Make sure we only have ONE token in the string.
+                 */
+                strToken = strtok( strRealString, " " );
+                while( strToken != NULL ) { 
+                        nTokens++;              
+                        strToken = strtok( NULL, " " ); 
+                }
+
+                if( nTokens != 1 )
+                {
+                        bValidRealString = FALSE;
+                }
+        }
+
+
+        /* Make sure this token contains only valid characters.
+         * The string argument to atof has the following form:
+         * [whitespace] [sign] [digits] [.digits] [ {d | D | e | E }[sign]digits]
+         * Whitespace consists of space and|or <TAB> characters, which are ignored.
      * Sign is either plus '+' or minus '-'.
      * Digits are one or more decimal digits.
@@ -700 +700 @@
      * The decimal digits may be followed by an exponent.
      * An Exponent consists of an introductory letter ( D, d, E, or e) and
-     * an optionally signed decimal integer.
-     */
-    pChar = strRealString;
-    while( bValidRealString == TRUE && *pChar != '\0' )
-    {
-        switch( *pChar )
-        {
-        /* If whitespace...
-         */
-        case ' ':
-        case '\t':
-            if( bWhiteSpaceProcessed ||
-                bFirstSignProcessed ||
-                bFirstDigitsProcessed ||
-                bDecimalPointProcessed ||
-                bSecondDigitsProcessed ||
-                bExponentProcessed ||
-                bSecondSignProcessed ||
-                bThirdDigitsProcessed )
-            {
-                bValidRealString = FALSE;
-            }
-            break;
-        /* If sign...
-         */
-        case '+':
-        case '-':
-            if( bFirstSignProcessed == FALSE )
-            {
-                if( bFirstDigitsProcessed ||
-                    bDecimalPointProcessed ||
-                    bSecondDigitsProcessed ||
-                    bExponentProcessed ||
-                    bSecondSignProcessed ||
-                    bThirdDigitsProcessed )
-                {
-                    bValidRealString = FALSE;
-                }
-                bWhiteSpaceProcessed = TRUE;
-                bFirstSignProcessed = TRUE;
-            }
-            else if( bSecondSignProcessed == FALSE )
-            {
+         * an optionally signed decimal integer.
+         */
+        pChar = strRealString;
+        while( bValidRealString == TRUE && *pChar != '\0' )
+        {
+                switch( *pChar )
+                {
+                /* If whitespace...
+                 */
+                case ' ':
+                case '\t':
+                        if( bWhiteSpaceProcessed ||
+                                bFirstSignProcessed ||
+                                bFirstDigitsProcessed ||
+                                bDecimalPointProcessed ||
+                                bSecondDigitsProcessed ||
+                                bExponentProcessed ||
+                                bSecondSignProcessed ||
+                                bThirdDigitsProcessed )
+                        {
+                                bValidRealString = FALSE;
+                        }
+                        break;
+                /* If sign...
+                 */
+                case '+':
+                case '-':
+                        if( bFirstSignProcessed == FALSE )
+                        {
+                                if( bFirstDigitsProcessed ||
+                                        bDecimalPointProcessed ||
+                                        bSecondDigitsProcessed ||
+                                        bExponentProcessed ||
+                                        bSecondSignProcessed ||
+                                        bThirdDigitsProcessed )
+                                {
+                                        bValidRealString = FALSE;
+                                }
+                                bWhiteSpaceProcessed = TRUE;
+                                bFirstSignProcessed = TRUE;
+                        }
+                        else if( bSecondSignProcessed == FALSE )
+                        {
                 /* Note: The exponent must be present in
-                 * order to accept the second sign...
-                 */
-                if( bExponentProcessed == FALSE ||
-                    bThirdDigitsProcessed ||
-                    bDigitsRequired )
-                {
-                    bValidRealString = FALSE;
-                }
-                bFirstSignProcessed = TRUE;
-                bWhiteSpaceProcessed = TRUE;
-                bFirstDigitsProcessed = TRUE;
-                bDecimalPointProcessed = TRUE;
-                bSecondDigitsProcessed = TRUE;
-                bSecondSignProcessed = TRUE;
-            }
-            break;
-
-        /* If decimals...
-         */
-        case '0':
-        case '1':
-        case '2':
-        case '3':
-        case '4':
-        case '5':
-        case '6':
-        case '7':
-        case '8':
-        case '9':
-            if( bFirstDigitsProcessed == FALSE )
-            {
-                if( bDecimalPointProcessed ||
-                    bSecondDigitsProcessed ||
-                    bExponentProcessed ||
-                    bSecondSignProcessed ||
-                    bThirdDigitsProcessed )
-                {
-                    bValidRealString = FALSE;
-                }
-                bFirstSignProcessed = TRUE;
-                bWhiteSpaceProcessed = TRUE;
-                /* We have found some digits before the decimal point
-                 * so disable the "Digits required" flag.
-                 */
-                bDigitsRequired = FALSE;
-            }
-            else if( bSecondDigitsProcessed == FALSE )
-            {
-                if( bExponentProcessed ||
-                    bSecondSignProcessed ||
-                    bThirdDigitsProcessed )
-                {
-                    bValidRealString = FALSE;
-                }
-                bFirstSignProcessed = TRUE;
-                bWhiteSpaceProcessed = TRUE;
-                bFirstDigitsProcessed = TRUE;
-                bDecimalPointProcessed = TRUE;
-                /* We have found some digits after the decimal point
-                 * so disable the "Digits required" flag.
-                 */
-                bDigitsRequired = FALSE;
-            }
-            else if( bThirdDigitsProcessed == FALSE )
-            {
-                /* Getting here means everything else should be processed.
+                                 * order to accept the second sign...
+                                 */
+                                if( bExponentProcessed == FALSE ||
+                                        bThirdDigitsProcessed ||
+                                        bDigitsRequired )
+                                {
+                                        bValidRealString = FALSE;
+                                }
+                                bFirstSignProcessed = TRUE;
+                                bWhiteSpaceProcessed = TRUE;
+                                bFirstDigitsProcessed = TRUE;
+                                bDecimalPointProcessed = TRUE;
+                                bSecondDigitsProcessed = TRUE;
+                                bSecondSignProcessed = TRUE;
+                        }
+                        break;
+
+                /* If decimals...
+                 */
+                case '0':
+                case '1':
+                case '2':
+                case '3':
+                case '4':
+                case '5':
+                case '6':
+                case '7':
+                case '8':
+                case '9': 
+                        if( bFirstDigitsProcessed == FALSE )
+                        {
+                                if( bDecimalPointProcessed ||
+                                        bSecondDigitsProcessed ||
+                                        bExponentProcessed ||
+                                        bSecondSignProcessed ||
+                                        bThirdDigitsProcessed )
+                                {
+                                        bValidRealString = FALSE;
+                                }
+                                bFirstSignProcessed = TRUE;
+                                bWhiteSpaceProcessed = TRUE;
+                                /* We have found some digits before the decimal point
+                                 * so disable the "Digits required" flag.
+                                 */
+                                bDigitsRequired = FALSE;
+                        }
+                        else if( bSecondDigitsProcessed == FALSE )
+                        {
+                                if( bExponentProcessed ||
+                                        bSecondSignProcessed ||
+                                        bThirdDigitsProcessed )
+                                {
+                                        bValidRealString = FALSE;
+                                }
+                                bFirstSignProcessed = TRUE;
+                                bWhiteSpaceProcessed = TRUE;
+                                bFirstDigitsProcessed = TRUE;
+                                bDecimalPointProcessed = TRUE;
+                                /* We have found some digits after the decimal point
+                                 * so disable the "Digits required" flag.
+                                 */
+                                bDigitsRequired = FALSE;
+                        }
+                        else if( bThirdDigitsProcessed == FALSE )
+                        {
+                                /* Getting here means everything else should be processed.
                  * If we get anything else than a decimal following this
                  * digit it will be flagged by the other cases, so
-                 * we do not really need to do anything in here.
-                 */
-            }
-            break;
-        /* If DecimalPoint...
-         */
-        case '.':
-            if( bDecimalPointProcessed ||
-                bSecondDigitsProcessed ||
-                bExponentProcessed ||
-                bSecondSignProcessed ||
-                bThirdDigitsProcessed )
-            {
-                bValidRealString = FALSE;
-            }
-            bFirstSignProcessed = TRUE;
-            bWhiteSpaceProcessed = TRUE;
-            bFirstDigitsProcessed = TRUE;
-            bDecimalPointProcessed = TRUE;
-            break;
-        /* If Exponent...
-         */
-        case 'e':
-        case 'E':
-        case 'd':
-        case 'D':
-            if( bExponentProcessed ||
-                bSecondSignProcessed ||
-                bThirdDigitsProcessed ||
-                bDigitsRequired )
-            {
-                bValidRealString = FALSE;
-            }
-            bFirstSignProcessed = TRUE;
-            bWhiteSpaceProcessed = TRUE;
-            bFirstDigitsProcessed = TRUE;
-            bDecimalPointProcessed = TRUE;
-            bSecondDigitsProcessed = TRUE;
-            bExponentProcessed = TRUE;
-            break;
-        default:
-            bValidRealString = FALSE;
-            break;
-        }
-        /* Process next character.
-         */
-        pChar++;
-    }
-
-    /* If the required digits were not present we have an invalid
-     * string representation of a real number.
-     */
-    if( bDigitsRequired == TRUE )
-    {
-        bValidRealString = FALSE;
-    }
-
-    return bValidRealString;
-}
-
-
-/******************************************************************************
- *      Coerce  [INTERNAL]
+                                 * we do not really need to do anything in here.
+                                 */
+                        }
+                        break;
+                /* If DecimalPoint...
+                 */
+                case '.': 
+                        if( bDecimalPointProcessed ||
+                                bSecondDigitsProcessed ||
+                                bExponentProcessed ||
+                                bSecondSignProcessed ||
+                                bThirdDigitsProcessed )
+                        {
+                                bValidRealString = FALSE;
+                        }
+                        bFirstSignProcessed = TRUE;
+                        bWhiteSpaceProcessed = TRUE;
+                        bFirstDigitsProcessed = TRUE;
+                        bDecimalPointProcessed = TRUE;
+                        break;
+                /* If Exponent...
+                 */
+                case 'e':
+                case 'E':
+                case 'd':
+                case 'D':
+                        if( bExponentProcessed ||
+                                bSecondSignProcessed ||
+                                bThirdDigitsProcessed ||
+                                bDigitsRequired )
+                        {
+                                bValidRealString = FALSE;
+                        }
+                        bFirstSignProcessed = TRUE;
+                        bWhiteSpaceProcessed = TRUE;
+                        bFirstDigitsProcessed = TRUE;
+                        bDecimalPointProcessed = TRUE;
+                        bSecondDigitsProcessed = TRUE;
+                        bExponentProcessed = TRUE;
+                        break;
+                default:
+                        bValidRealString = FALSE;
+                        break;
+                }
+                /* Process next character.
+                 */
+                pChar++;
+        }
+
+        /* If the required digits were not present we have an invalid
+         * string representation of a real number.
+         */
+        if( bDigitsRequired == TRUE )
+        {
+                bValidRealString = FALSE;
+        }
+
+        return bValidRealString;
+}
+
+
+/******************************************************************************
+ *              Coerce  [INTERNAL]
  *
  * This function dispatches execution to the proper conversion API
@@ -880 +880 @@
  *
  * FIXME: Passing down dwFlags to the conversion functions is wrong, this
- *    is a different flagmask. Check MSDN.
+ *        is a different flagmask. Check MSDN.
  */
 static HRESULT Coerce( VARIANTARG* pd, LCID lcid, ULONG dwFlags, VARIANTARG* ps, VARTYPE vt )
 {
-    HRESULT res = S_OK;
-    unsigned short vtFrom = 0;
-    vtFrom = V_VT(ps) & VT_TYPEMASK;
-
-
-    /* Note: Since "long" and "int" values both have 4 bytes and are
-     * both signed integers "int" will be treated as "long" in the
-     * following code.
-     * The same goes for their unsigned versions.
-     */
-
-    /* Trivial Case: If the coercion is from two types that are
-     * identical then we can blindly copy from one argument to another.*/
-    if ((vt==vtFrom))
-    {
-       return VariantCopy(pd,ps);
-    }
-
-    /* Cases requiring thought*/
-    switch( vt )
-    {
+        HRESULT res = S_OK;
+        unsigned short vtFrom = 0;
+        vtFrom = V_VT(ps) & VT_TYPEMASK;
+
+        
+        /* Note: Since "long" and "int" values both have 4 bytes and are
+         * both signed integers "int" will be treated as "long" in the
+         * following code.
+         * The same goes for their unsigned versions.
+         */
+
+        /* Trivial Case: If the coercion is from two types that are 
+         * identical then we can blindly copy from one argument to another.*/
+        if ((vt==vtFrom))
+        {
+           return VariantCopy(pd,ps);
+        }
+
+        /* Cases requiring thought*/
+        switch( vt )
+        {
 
     case( VT_EMPTY ):
@@ -916 +916 @@
         }
         break;
-    case( VT_I1 ):
-        switch( vtFrom )
+        case( VT_I1 ):
+                switch( vtFrom )
         {
         case( VT_I1 ):
             res = VariantCopy( pd, ps );
             break;
-        case( VT_I2 ):
-            res = VarI1FromI2( V_UNION(ps,iVal), &V_UNION(pd,cVal) );
-            break;
-        case( VT_INT ):
-        case( VT_I4 ):
-            res = VarI1FromI4( V_UNION(ps,lVal), &V_UNION(pd,cVal) );
-            break;
-        case( VT_UI1 ):
-            res = VarI1FromUI1( V_UNION(ps,bVal), &V_UNION(pd,cVal) );
-            break;
-        case( VT_UI2 ):
-            res = VarI1FromUI2( V_UNION(ps,uiVal), &V_UNION(pd,cVal) );
-            break;
-        case( VT_UINT ):
-        case( VT_UI4 ):
-            res = VarI1FromUI4( V_UNION(ps,ulVal), &V_UNION(pd,cVal) );
-            break;
-        case( VT_R4 ):
-            res = VarI1FromR4( V_UNION(ps,fltVal), &V_UNION(pd,cVal) );
-            break;
-        case( VT_R8 ):
-            res = VarI1FromR8( V_UNION(ps,dblVal), &V_UNION(pd,cVal) );
-            break;
-        case( VT_DATE ):
-            res = VarI1FromDate( V_UNION(ps,date), &V_UNION(pd,cVal) );
-            break;
-        case( VT_BOOL ):
-            res = VarI1FromBool( V_UNION(ps,boolVal), &V_UNION(pd,cVal) );
-            break;
-        case( VT_BSTR ):
-            res = VarI1FromStr( V_UNION(ps,bstrVal), lcid, 0, &V_UNION(pd,cVal) );
-            break;
-        case( VT_CY ):
-            res = VarI1FromCy( V_UNION(ps,cyVal), &V_UNION(pd,cVal) );
-            break;
-        case( VT_DISPATCH ):
-            /*res = VarI1FromDisp( V_UNION(ps,pdispVal), lcid, &V_UNION(pd,cVal) );*/
-        case( VT_DECIMAL ):
-            /*res = VarI1FromDec( V_UNION(ps,decVal), &V_UNION(pd,cVal) );*/
-        case( VT_UNKNOWN ):
-        default:
-            res = DISP_E_TYPEMISMATCH;
-            FIXME("Coercion from %d to %d\n", vtFrom, vt );
-            break;
-        }
-        break;
-
-    case( VT_I2 ):
-        switch( vtFrom )
-        {
-        case( VT_I1 ):
-            res = VarI2FromI1( V_UNION(ps,cVal), &V_UNION(pd,iVal) );
-            break;
+                case( VT_I2 ):
+                        res = VarI1FromI2( V_UNION(ps,iVal), &V_UNION(pd,cVal) );
+                        break;
+                case( VT_INT ):
+                case( VT_I4 ):
+                        res = VarI1FromI4( V_UNION(ps,lVal), &V_UNION(pd,cVal) );
+                        break;
+                case( VT_UI1 ):
+                        res = VarI1FromUI1( V_UNION(ps,bVal), &V_UNION(pd,cVal) );
+                        break;
+                case( VT_UI2 ):
+                        res = VarI1FromUI2( V_UNION(ps,uiVal), &V_UNION(pd,cVal) );
+                        break;
+                case( VT_UINT ):
+                case( VT_UI4 ):
+                        res = VarI1FromUI4( V_UNION(ps,ulVal), &V_UNION(pd,cVal) );
+                        break;
+                case( VT_R4 ):
+                        res = VarI1FromR4( V_UNION(ps,fltVal), &V_UNION(pd,cVal) );
+                        break;
+                case( VT_R8 ):
+                        res = VarI1FromR8( V_UNION(ps,dblVal), &V_UNION(pd,cVal) );
+                        break;
+                case( VT_DATE ):
+                        res = VarI1FromDate( V_UNION(ps,date), &V_UNION(pd,cVal) );
+                        break;
+                case( VT_BOOL ):
+                        res = VarI1FromBool( V_UNION(ps,boolVal), &V_UNION(pd,cVal) );
+                        break;
+                case( VT_BSTR ):
+                        res = VarI1FromStr( V_UNION(ps,bstrVal), lcid, 0, &V_UNION(pd,cVal) );
+                        break;
+                case( VT_CY ):
+                        res = VarI1FromCy( V_UNION(ps,cyVal), &V_UNION(pd,cVal) );
+                        break;
+                case( VT_DISPATCH ):
+                        /*res = VarI1FromDisp( V_UNION(ps,pdispVal), lcid, &V_UNION(pd,cVal) );*/
+                case( VT_DECIMAL ):
+                        /*res = VarI1FromDec( V_UNION(ps,decVal), &V_UNION(pd,cVal) );*/
+                case( VT_UNKNOWN ):
+                default:
+                        res = DISP_E_TYPEMISMATCH;
+                        FIXME("Coercion from %d to %d\n", vtFrom, vt );
+                        break;
+                }
+                break;
+
+        case( VT_I2 ):
+                switch( vtFrom )
+                {
+                case( VT_I1 ):
+                        res = VarI2FromI1( V_UNION(ps,cVal), &V_UNION(pd,iVal) );
+                        break;
         case( VT_I2 ):
             res = VariantCopy( pd, ps );
             break;
-        case( VT_INT ):
-        case( VT_I4 ):
-            res = VarI2FromI4( V_UNION(ps,lVal), &V_UNION(pd,iVal) );
-            break;
-        case( VT_UI1 ):
-            res = VarI2FromUI1( V_UNION(ps,bVal), &V_UNION(pd,iVal) );
-            break;
-        case( VT_UI2 ):
-            res = VarI2FromUI2( V_UNION(ps,uiVal), &V_UNION(pd,iVal) );
-            break;
-        case( VT_UINT ):
-        case( VT_UI4 ):
-            res = VarI2FromUI4( V_UNION(ps,ulVal), &V_UNION(pd,iVal) );
-            break;
-        case( VT_R4 ):
-            res = VarI2FromR4( V_UNION(ps,fltVal), &V_UNION(pd,iVal) );
-            break;
-        case( VT_R8 ):
-            res = VarI2FromR8( V_UNION(ps,dblVal), &V_UNION(pd,iVal) );
-            break;
-        case( VT_DATE ):
-            res = VarI2FromDate( V_UNION(ps,date), &V_UNION(pd,iVal) );
-            break;
-        case( VT_BOOL ):
-            res = VarI2FromBool( V_UNION(ps,boolVal), &V_UNION(pd,iVal) );
-            break;
-        case( VT_BSTR ):
-            res = VarI2FromStr( V_UNION(ps,bstrVal), lcid, 0, &V_UNION(pd,iVal) );
-            break;
-        case( VT_CY ):
-            res = VarI2FromCy( V_UNION(ps,cyVal), &V_UNION(pd,iVal) );
-            break;
-        case( VT_DISPATCH ):
-            /*res = VarI2FromDisp( V_UNION(ps,pdispVal), lcid, &V_UNION(pd,iVal) );*/
-        case( VT_DECIMAL ):
-            /*res = VarI2FromDec( V_UNION(ps,deiVal), &V_UNION(pd,iVal) );*/
-        case( VT_UNKNOWN ):
-        default:
-            res = DISP_E_TYPEMISMATCH;
-            FIXME("Coercion from %d to %d\n", vtFrom, vt );
-            break;
-        }
-        break;
-
-    case( VT_INT ):
-    case( VT_I4 ):
-        switch( vtFrom )
-        {
-        case( VT_I1 ):
-            res = VarI4FromI1( V_UNION(ps,cVal), &V_UNION(pd,lVal) );
-            break;
-        case( VT_I2 ):
-            res = VarI4FromI2( V_UNION(ps,iVal), &V_UNION(pd,lVal) );
+                case( VT_INT ):
+                case( VT_I4 ):
+                        res = VarI2FromI4( V_UNION(ps,lVal), &V_UNION(pd,iVal) );
+                        break;
+                case( VT_UI1 ):
+                        res = VarI2FromUI1( V_UNION(ps,bVal), &V_UNION(pd,iVal) );
+                        break;
+                case( VT_UI2 ):
+                        res = VarI2FromUI2( V_UNION(ps,uiVal), &V_UNION(pd,iVal) );
+                        break;
+                case( VT_UINT ):
+                case( VT_UI4 ):
+                        res = VarI2FromUI4( V_UNION(ps,ulVal), &V_UNION(pd,iVal) );
+                        break;
+                case( VT_R4 ):
+                        res = VarI2FromR4( V_UNION(ps,fltVal), &V_UNION(pd,iVal) );
+                        break;
+                case( VT_R8 ):
+                        res = VarI2FromR8( V_UNION(ps,dblVal), &V_UNION(pd,iVal) );
+                        break;
+                case( VT_DATE ):
+                        res = VarI2FromDate( V_UNION(ps,date), &V_UNION(pd,iVal) );
+                        break;
+                case( VT_BOOL ):
+                        res = VarI2FromBool( V_UNION(ps,boolVal), &V_UNION(pd,iVal) );
+                        break;
+                case( VT_BSTR ):
+                        res = VarI2FromStr( V_UNION(ps,bstrVal), lcid, 0, &V_UNION(pd,iVal) );
+                        break;
+                case( VT_CY ):
+                        res = VarI2FromCy( V_UNION(ps,cyVal), &V_UNION(pd,iVal) );
+                        break;
+                case( VT_DISPATCH ):
+                        /*res = VarI2FromDisp( V_UNION(ps,pdispVal), lcid, &V_UNION(pd,iVal) );*/
+                case( VT_DECIMAL ):
+                        /*res = VarI2FromDec( V_UNION(ps,deiVal), &V_UNION(pd,iVal) );*/
+                case( VT_UNKNOWN ):
+                default:
+                        res = DISP_E_TYPEMISMATCH;
+                        FIXME("Coercion from %d to %d\n", vtFrom, vt );
+                        break;
+                }
+                break;
+
+        case( VT_INT ):
+        case( VT_I4 ):
+                switch( vtFrom )
+                {
+                case( VT_I1 ):
+                        res = VarI4FromI1( V_UNION(ps,cVal), &V_UNION(pd,lVal) );
+                        break;
+                case( VT_I2 ):
+                        res = VarI4FromI2( V_UNION(ps,iVal), &V_UNION(pd,lVal) );
             break;
         case( VT_INT ):
@@ -1039 +1039 @@
             res = VariantCopy( pd, ps );
             break;
-        case( VT_UI1 ):
-            res = VarI4FromUI1( V_UNION(ps,bVal), &V_UNION(pd,lVal) );
-            break;
-        case( VT_UI2 ):
-            res = VarI4FromUI2( V_UNION(ps,uiVal), &V_UNION(pd,lVal) );
-            break;
-        case( VT_UINT ):
-        case( VT_UI4 ):
-            res = VarI4FromUI4( V_UNION(ps,ulVal), &V_UNION(pd,lVal) );
-            break;
-        case( VT_R4 ):
-            res = VarI4FromR4( V_UNION(ps,fltVal), &V_UNION(pd,lVal) );
-            break;
-        case( VT_R8 ):
-            res = VarI4FromR8( V_UNION(ps,dblVal), &V_UNION(pd,lVal) );
-            break;
-        case( VT_DATE ):
-            res = VarI4FromDate( V_UNION(ps,date), &V_UNION(pd,lVal) );
-            break;
-        case( VT_BOOL ):
-            res = VarI4FromBool( V_UNION(ps,boolVal), &V_UNION(pd,lVal) );
-            break;
-        case( VT_BSTR ):
-            res = VarI4FromStr( V_UNION(ps,bstrVal), lcid, 0, &V_UNION(pd,lVal) );
-            break;
-        case( VT_CY ):
-            res = VarI4FromCy( V_UNION(ps,cyVal), &V_UNION(pd,lVal) );
-            break;
-        case( VT_DISPATCH ):
-            /*res = VarI4FromDisp( V_UNION(ps,pdispVal), lcid, &V_UNION(pd,lVal) );*/
-        case( VT_DECIMAL ):
-            /*res = VarI4FromDec( V_UNION(ps,deiVal), &V_UNION(pd,lVal) );*/
-        case( VT_UNKNOWN ):
-        default:
-            res = DISP_E_TYPEMISMATCH;
-            FIXME("Coercion from %d to %d\n", vtFrom, vt );
-            break;
-        }
-        break;
-
-    case( VT_UI1 ):
-        switch( vtFrom )
-        {
-        case( VT_I1 ):
-            res = VarUI1FromI1( V_UNION(ps,cVal), &V_UNION(pd,bVal) );
-            break;
-        case( VT_I2 ):
-            res = VarUI1FromI2( V_UNION(ps,iVal), &V_UNION(pd,bVal) );
-            break;
-        case( VT_INT ):
-        case( VT_I4 ):
-            res = VarUI1FromI4( V_UNION(ps,lVal), &V_UNION(pd,bVal) );
-            break;
+                case( VT_UI1 ):
+                        res = VarI4FromUI1( V_UNION(ps,bVal), &V_UNION(pd,lVal) );
+                        break;
+                case( VT_UI2 ):
+                        res = VarI4FromUI2( V_UNION(ps,uiVal), &V_UNION(pd,lVal) );
+                        break;
+                case( VT_UINT ):
+                case( VT_UI4 ):
+                        res = VarI4FromUI4( V_UNION(ps,ulVal), &V_UNION(pd,lVal) );
+                        break;
+                case( VT_R4 ):
+                        res = VarI4FromR4( V_UNION(ps,fltVal), &V_UNION(pd,lVal) );
+                        break;
+                case( VT_R8 ):
+                        res = VarI4FromR8( V_UNION(ps,dblVal), &V_UNION(pd,lVal) );
+                        break;
+                case( VT_DATE ):
+                        res = VarI4FromDate( V_UNION(ps,date), &V_UNION(pd,lVal) );
+                        break;
+                case( VT_BOOL ):
+                        res = VarI4FromBool( V_UNION(ps,boolVal), &V_UNION(pd,lVal) );
+                        break;
+                case( VT_BSTR ):
+                        res = VarI4FromStr( V_UNION(ps,bstrVal), lcid, 0, &V_UNION(pd,lVal) );
+                        break;
+                case( VT_CY ):
+                        res = VarI4FromCy( V_UNION(ps,cyVal), &V_UNION(pd,lVal) );
+                        break;
+                case( VT_DISPATCH ):
+                        /*res = VarI4FromDisp( V_UNION(ps,pdispVal), lcid, &V_UNION(pd,lVal) );*/
+                case( VT_DECIMAL ):
+                        /*res = VarI4FromDec( V_UNION(ps,deiVal), &V_UNION(pd,lVal) );*/
+                case( VT_UNKNOWN ):
+                default:
+                        res = DISP_E_TYPEMISMATCH;
+                        FIXME("Coercion from %d to %d\n", vtFrom, vt );
+                        break;
+                }
+                break;
+
+        case( VT_UI1 ):
+                switch( vtFrom )
+                {
+                case( VT_I1 ):
+                        res = VarUI1FromI1( V_UNION(ps,cVal), &V_UNION(pd,bVal) );
+                        break;
+                case( VT_I2 ):
+                        res = VarUI1FromI2( V_UNION(ps,iVal), &V_UNION(pd,bVal) );
+                        break;
+                case( VT_INT ):
+                case( VT_I4 ):
+                        res = VarUI1FromI4( V_UNION(ps,lVal), &V_UNION(pd,bVal) );
+                        break;
         case( VT_UI1 ):
             res = VariantCopy( pd, ps );
             break;
-        case( VT_UI2 ):
-            res = VarUI1FromUI2( V_UNION(ps,uiVal), &V_UNION(pd,bVal) );
-            break;
-        case( VT_UINT ):
-        case( VT_UI4 ):
-            res = VarUI1FromUI4( V_UNION(ps,ulVal), &V_UNION(pd,bVal) );
-            break;
-        case( VT_R4 ):
-            res = VarUI1FromR4( V_UNION(ps,fltVal), &V_UNION(pd,bVal) );
-            break;
-        case( VT_R8 ):
-            res = VarUI1FromR8( V_UNION(ps,dblVal), &V_UNION(pd,bVal) );
-            break;
-        case( VT_DATE ):
-            res = VarUI1FromDate( V_UNION(ps,date), &V_UNION(pd,bVal) );
-            break;
-        case( VT_BOOL ):
-            res = VarUI1FromBool( V_UNION(ps,boolVal), &V_UNION(pd,bVal) );
-            break;
-        case( VT_BSTR ):
-            res = VarUI1FromStr( V_UNION(ps,bstrVal), lcid, 0, &V_UNION(pd,bVal) );
-            break;
-        case( VT_CY ):
-            res = VarUI1FromCy( V_UNION(ps,cyVal), &V_UNION(pd,bVal) );
-            break;
-        case( VT_DISPATCH ):
-            /*res = VarUI1FromDisp( V_UNION(ps,pdispVal), lcid, &V_UNION(pd,bVal) );*/
-        case( VT_DECIMAL ):
-            /*res = VarUI1FromDec( V_UNION(ps,deiVal), &V_UNION(pd,bVal) );*/
-        case( VT_UNKNOWN ):
-        default:
-            res = DISP_E_TYPEMISMATCH;
-            FIXME("Coercion from %d to %d\n", vtFrom, vt );
-            break;
-        }
-        break;
-
-    case( VT_UI2 ):
-        switch( vtFrom )
-        {
-        case( VT_I1 ):
-            res = VarUI2FromI1( V_UNION(ps,cVal), &V_UNION(pd,uiVal) );
-            break;
-        case( VT_I2 ):
-            res = VarUI2FromI2( V_UNION(ps,iVal), &V_UNION(pd,uiVal) );
-            break;
-        case( VT_INT ):
-        case( VT_I4 ):
-            res = VarUI2FromI4( V_UNION(ps,lVal), &V_UNION(pd,uiVal) );
-            break;
-        case( VT_UI1 ):
-            res = VarUI2FromUI1( V_UNION(ps,bVal), &V_UNION(pd,uiVal) );
-            break;
+                case( VT_UI2 ):
+                        res = VarUI1FromUI2( V_UNION(ps,uiVal), &V_UNION(pd,bVal) );
+                        break;
+                case( VT_UINT ):
+                case( VT_UI4 ):
+                        res = VarUI1FromUI4( V_UNION(ps,ulVal), &V_UNION(pd,bVal) );
+                        break;
+                case( VT_R4 ):
+                        res = VarUI1FromR4( V_UNION(ps,fltVal), &V_UNION(pd,bVal) );
+                        break;
+                case( VT_R8 ):
+                        res = VarUI1FromR8( V_UNION(ps,dblVal), &V_UNION(pd,bVal) );
+                        break;
+                case( VT_DATE ):
+                        res = VarUI1FromDate( V_UNION(ps,date), &V_UNION(pd,bVal) );
+                        break;
+                case( VT_BOOL ):
+                        res = VarUI1FromBool( V_UNION(ps,boolVal), &V_UNION(pd,bVal) );
+                        break;
+                case( VT_BSTR ):
+                        res = VarUI1FromStr( V_UNION(ps,bstrVal), lcid, 0, &V_UNION(pd,bVal) );
+                        break;
+                case( VT_CY ):
+                        res = VarUI1FromCy( V_UNION(ps,cyVal), &V_UNION(pd,bVal) );
+                        break;
+                case( VT_DISPATCH ):
+                        /*res = VarUI1FromDisp( V_UNION(ps,pdispVal), lcid, &V_UNION(pd,bVal) );*/
+                case( VT_DECIMAL ):
+                        /*res = VarUI1FromDec( V_UNION(ps,deiVal), &V_UNION(pd,bVal) );*/
+                case( VT_UNKNOWN ):
+                default:
+                        res = DISP_E_TYPEMISMATCH;
+                        FIXME("Coercion from %d to %d\n", vtFrom, vt );
+                        break;
+                }
+                break;
+
+        case( VT_UI2 ):
+                switch( vtFrom )
+                {
+                case( VT_I1 ):
+                        res = VarUI2FromI1( V_UNION(ps,cVal), &V_UNION(pd,uiVal) );
+                        break;
+                case( VT_I2 ):
+                        res = VarUI2FromI2( V_UNION(ps,iVal), &V_UNION(pd,uiVal) );
+                        break;
+                case( VT_INT ):
+                case( VT_I4 ):
+                        res = VarUI2FromI4( V_UNION(ps,lVal), &V_UNION(pd,uiVal) );
+                        break;
+                case( VT_UI1 ):
+                        res = VarUI2FromUI1( V_UNION(ps,bVal), &V_UNION(pd,uiVal) );
+                        break;
         case( VT_UI2 ):
             res = VariantCopy( pd, ps );
             break;
-        case( VT_UINT ):
-        case( VT_UI4 ):
-            res = VarUI2FromUI4( V_UNION(ps,ulVal), &V_UNION(pd,uiVal) );
-            break;
-        case( VT_R4 ):
-            res = VarUI2FromR4( V_UNION(ps,fltVal), &V_UNION(pd,uiVal) );
-            break;
-        case( VT_R8 ):
-            res = VarUI2FromR8( V_UNION(ps,dblVal), &V_UNION(pd,uiVal) );
-            break;
-        case( VT_DATE ):
-            res = VarUI2FromDate( V_UNION(ps,date), &V_UNION(pd,uiVal) );
-            break;
-        case( VT_BOOL ):
-            res = VarUI2FromBool( V_UNION(ps,boolVal), &V_UNION(pd,uiVal) );
-            break;
-        case( VT_BSTR ):
-            res = VarUI2FromStr( V_UNION(ps,bstrVal), lcid, 0, &V_UNION(pd,uiVal) );
-            break;
-        case( VT_CY ):
-            res = VarUI2FromCy( V_UNION(ps,cyVal), &V_UNION(pd,uiVal) );
-            break;
-        case( VT_DISPATCH ):
-            /*res = VarUI2FromDisp( V_UNION(ps,pdispVal), lcid, &V_UNION(pd,uiVal) );*/
-        case( VT_DECIMAL ):
-            /*res = VarUI2FromDec( V_UNION(ps,deiVal), &V_UNION(pd,uiVal) );*/
-        case( VT_UNKNOWN ):
-        default:
-            res = DISP_E_TYPEMISMATCH;
-            FIXME("Coercion from %d to %d\n", vtFrom, vt );
-            break;
-        }
-        break;
-
-    case( VT_UINT ):
-    case( VT_UI4 ):
-        switch( vtFrom )
-        {
-        case( VT_I1 ):
-            res = VarUI4FromI1( V_UNION(ps,cVal), &V_UNION(pd,ulVal) );
-            break;
-        case( VT_I2 ):
-            res = VarUI4FromI2( V_UNION(ps,iVal), &V_UNION(pd,ulVal) );
-            break;
-        case( VT_INT ):
-        case( VT_I4 ):
-            res = VarUI4FromI4( V_UNION(ps,lVal), &V_UNION(pd,ulVal) );
-            break;
-        case( VT_UI1 ):
-            res = VarUI4FromUI1( V_UNION(ps,bVal), &V_UNION(pd,ulVal) );
-            break;
-        case( VT_UI2 ):
-            res = VarUI4FromUI2( V_UNION(ps,uiVal), &V_UNION(pd,ulVal) );
-            break;
+                case( VT_UINT ):
+                case( VT_UI4 ):
+                        res = VarUI2FromUI4( V_UNION(ps,ulVal), &V_UNION(pd,uiVal) );
+                        break;
+                case( VT_R4 ):
+                        res = VarUI2FromR4( V_UNION(ps,fltVal), &V_UNION(pd,uiVal) );
+                        break;
+                case( VT_R8 ):
+                        res = VarUI2FromR8( V_UNION(ps,dblVal), &V_UNION(pd,uiVal) );
+                        break;
+                case( VT_DATE ):
+                        res = VarUI2FromDate( V_UNION(ps,date), &V_UNION(pd,uiVal) );
+                        break;
+                case( VT_BOOL ):
+                        res = VarUI2FromBool( V_UNION(ps,boolVal), &V_UNION(pd,uiVal) );
+                        break;
+                case( VT_BSTR ):
+                        res = VarUI2FromStr( V_UNION(ps,bstrVal), lcid, 0, &V_UNION(pd,uiVal) );
+                        break;
+                case( VT_CY ):
+                        res = VarUI2FromCy( V_UNION(ps,cyVal), &V_UNION(pd,uiVal) );
+                        break;
+                case( VT_DISPATCH ):
+                        /*res = VarUI2FromDisp( V_UNION(ps,pdispVal), lcid, &V_UNION(pd,uiVal) );*/
+                case( VT_DECIMAL ):
+                        /*res = VarUI2FromDec( V_UNION(ps,deiVal), &V_UNION(pd,uiVal) );*/
+                case( VT_UNKNOWN ):
+                default:
+                        res = DISP_E_TYPEMISMATCH;
+                        FIXME("Coercion from %d to %d\n", vtFrom, vt );
+                        break;
+                }
+                break;
+
+        case( VT_UINT ):
+        case( VT_UI4 ):
+                switch( vtFrom )
+                {
+                case( VT_I1 ):
+                        res = VarUI4FromI1( V_UNION(ps,cVal), &V_UNION(pd,ulVal) );
+                        break;
+                case( VT_I2 ):
+                        res = VarUI4FromI2( V_UNION(ps,iVal), &V_UNION(pd,ulVal) );
+                        break;
+                case( VT_INT ):
+                case( VT_I4 ):
+                        res = VarUI4FromI4( V_UNION(ps,lVal), &V_UNION(pd,ulVal) );
+                        break;
+                case( VT_UI1 ):
+                        res = VarUI4FromUI1( V_UNION(ps,bVal), &V_UNION(pd,ulVal) );
+                        break;
+                case( VT_UI2 ):
+                        res = VarUI4FromUI2( V_UNION(ps,uiVal), &V_UNION(pd,ulVal) );
+                        break;
         case( VT_UI4 ):
             res = VariantCopy( pd, ps );
             break;
-        case( VT_R4 ):
-            res = VarUI4FromR4( V_UNION(ps,fltVal), &V_UNION(pd,ulVal) );
-            break;
-        case( VT_R8 ):
-            res = VarUI4FromR8( V_UNION(ps,dblVal), &V_UNION(pd,ulVal) );
-            break;
-        case( VT_DATE ):
-            res = VarUI4FromDate( V_UNION(ps,date), &V_UNION(pd,ulVal) );
-            break;
-        case( VT_BOOL ):
-            res = VarUI4FromBool( V_UNION(ps,boolVal), &V_UNION(pd,ulVal) );
-            break;
-        case( VT_BSTR ):
-            res = VarUI4FromStr( V_UNION(ps,bstrVal), lcid, 0, &V_UNION(pd,ulVal) );
-            break;
-        case( VT_CY ):
-            res = VarUI4FromCy( V_UNION(ps,cyVal), &V_UNION(pd,ulVal) );
-            break;
-        case( VT_DISPATCH ):
-            /*res = VarUI4FromDisp( V_UNION(ps,pdispVal), lcid, &V_UNION(pd,ulVal) );*/
-        case( VT_DECIMAL ):
-            /*res = VarUI4FromDec( V_UNION(ps,deiVal), &V_UNION(pd,ulVal) );*/
-        case( VT_UNKNOWN ):
-        default:
-            res = DISP_E_TYPEMISMATCH;
-            FIXME("Coercion from %d to %d\n", vtFrom, vt );
-            break;
-        }
-        break;
-
-    case( VT_R4 ):
-        switch( vtFrom )
-        {
-        case( VT_I1 ):
-            res = VarR4FromI1( V_UNION(ps,cVal), &V_UNION(pd,fltVal) );
-            break;
-        case( VT_I2 ):
-            res = VarR4FromI2( V_UNION(ps,iVal), &V_UNION(pd,fltVal) );
-            break;
-        case( VT_INT ):
-        case( VT_I4 ):
-            res = VarR4FromI4( V_UNION(ps,lVal), &V_UNION(pd,fltVal) );
-            break;
-        case( VT_UI1 ):
-            res = VarR4FromUI1( V_UNION(ps,bVal), &V_UNION(pd,fltVal) );
-            break;
-        case( VT_UI2 ):
-            res = VarR4FromUI2( V_UNION(ps,uiVal), &V_UNION(pd,fltVal) );
-            break;
-        case( VT_UINT ):
-        case( VT_UI4 ):
-            res = VarR4FromUI4( V_UNION(ps,ulVal), &V_UNION(pd,fltVal) );
-            break;
+                case( VT_R4 ):
+                        res = VarUI4FromR4( V_UNION(ps,fltVal), &V_UNION(pd,ulVal) );
+                        break;
+                case( VT_R8 ):
+                        res = VarUI4FromR8( V_UNION(ps,dblVal), &V_UNION(pd,ulVal) );
+                        break;
+                case( VT_DATE ):
+                        res = VarUI4FromDate( V_UNION(ps,date), &V_UNION(pd,ulVal) );
+                        break;
+                case( VT_BOOL ):
+                        res = VarUI4FromBool( V_UNION(ps,boolVal), &V_UNION(pd,ulVal) );
+                        break;
+                case( VT_BSTR ):
+                        res = VarUI4FromStr( V_UNION(ps,bstrVal), lcid, 0, &V_UNION(pd,ulVal) );
+                        break;
+                case( VT_CY ):
+                        res = VarUI4FromCy( V_UNION(ps,cyVal), &V_UNION(pd,ulVal) );
+                        break;
+                case( VT_DISPATCH ):
+                        /*res = VarUI4FromDisp( V_UNION(ps,pdispVal), lcid, &V_UNION(pd,ulVal) );*/
+                case( VT_DECIMAL ):
+                        /*res = VarUI4FromDec( V_UNION(ps,deiVal), &V_UNION(pd,ulVal) );*/
+                case( VT_UNKNOWN ):
+                default:
+                        res = DISP_E_TYPEMISMATCH;
+                        FIXME("Coercion from %d to %d\n", vtFrom, vt );
+                        break;
+                }
+                break;
+                
+        case( VT_R4 ):
+                switch( vtFrom )
+                {
+                case( VT_I1 ):
+                        res = VarR4FromI1( V_UNION(ps,cVal), &V_UNION(pd,fltVal) );
+                        break;
+                case( VT_I2 ):
+                        res = VarR4FromI2( V_UNION(ps,iVal), &V_UNION(pd,fltVal) );
+                        break;
+                case( VT_INT ):
+                case( VT_I4 ):
+                        res = VarR4FromI4( V_UNION(ps,lVal), &V_UNION(pd,fltVal) );
+                        break;
+                case( VT_UI1 ):
+                        res = VarR4FromUI1( V_UNION(ps,bVal), &V_UNION(pd,fltVal) );
+                        break;
+                case( VT_UI2 ):
+                        res = VarR4FromUI2( V_UNION(ps,uiVal), &V_UNION(pd,fltVal) );
+                        break;
+                case( VT_UINT ):
+                case( VT_UI4 ):
+                        res = VarR4FromUI4( V_UNION(ps,ulVal), &V_UNION(pd,fltVal) );
+                        break;
         case( VT_R4 ):
             res = VariantCopy( pd, ps );
             break;
-        case( VT_R8 ):
-            res = VarR4FromR8( V_UNION(ps,dblVal), &V_UNION(pd,fltVal) );
-            break;
-        case( VT_DATE ):
-            res = VarR4FromDate( V_UNION(ps,date), &V_UNION(pd,fltVal) );
-            break;
-        case( VT_BOOL ):
-            res = VarR4FromBool( V_UNION(ps,boolVal), &V_UNION(pd,fltVal) );
-            break;
-        case( VT_BSTR ):
-            res = VarR4FromStr( V_UNION(ps,bstrVal), lcid, 0, &V_UNION(pd,fltVal) );
-            break;
-        case( VT_CY ):
-            res = VarR4FromCy( V_UNION(ps,cyVal), &V_UNION(pd,fltVal) );
-            break;
-        case( VT_DISPATCH ):
-            /*res = VarR4FromDisp( V_UNION(ps,pdispVal), lcid, &V_UNION(pd,fltVal) );*/
-        case( VT_DECIMAL ):
-            /*res = VarR4FromDec( V_UNION(ps,deiVal), &V_UNION(pd,fltVal) );*/
-        case( VT_UNKNOWN ):
-        default:
-            res = DISP_E_TYPEMISMATCH;
-            FIXME("Coercion from %d to %d\n", vtFrom, vt );
-            break;
-        }
-        break;
-
-    case( VT_R8 ):
-        switch( vtFrom )
-        {
-        case( VT_I1 ):
-            res = VarR8FromI1( V_UNION(ps,cVal), &V_UNION(pd,dblVal) );
-            break;
-        case( VT_I2 ):
-            res = VarR8FromI2( V_UNION(ps,iVal), &V_UNION(pd,dblVal) );
-            break;
-        case( VT_INT ):
-        case( VT_I4 ):
-            res = VarR8FromI4( V_UNION(ps,lVal), &V_UNION(pd,dblVal) );
-            break;
-        case( VT_UI1 ):
-            res = VarR8FromUI1( V_UNION(ps,bVal), &V_UNION(pd,dblVal) );
-            break;
-        case( VT_UI2 ):
-            res = VarR8FromUI2( V_UNION(ps,uiVal), &V_UNION(pd,dblVal) );
-            break;
-        case( VT_UINT ):
-        case( VT_UI4 ):
-            res = VarR8FromUI4( V_UNION(ps,ulVal), &V_UNION(pd,dblVal) );
-            break;
-        case( VT_R4 ):
-            res = VarR8FromR4( V_UNION(ps,fltVal), &V_UNION(pd,dblVal) );
-            break;
+                case( VT_R8 ):
+                        res = VarR4FromR8( V_UNION(ps,dblVal), &V_UNION(pd,fltVal) );
+                        break;
+                case( VT_DATE ):
+                        res = VarR4FromDate( V_UNION(ps,date), &V_UNION(pd,fltVal) );
+                        break;
+                case( VT_BOOL ):
+                        res = VarR4FromBool( V_UNION(ps,boolVal), &V_UNION(pd,fltVal) );
+                        break;
+                case( VT_BSTR ):
+                        res = VarR4FromStr( V_UNION(ps,bstrVal), lcid, 0, &V_UNION(pd,fltVal) );
+                        break;
+                case( VT_CY ):
+                        res = VarR4FromCy( V_UNION(ps,cyVal), &V_UNION(pd,fltVal) );
+                        break;
+                case( VT_DISPATCH ):
+                        /*res = VarR4FromDisp( V_UNION(ps,pdispVal), lcid, &V_UNION(pd,fltVal) );*/
+                case( VT_DECIMAL ):
+                        /*res = VarR4FromDec( V_UNION(ps,deiVal), &V_UNION(pd,fltVal) );*/
+                case( VT_UNKNOWN ):
+                default:
+                        res = DISP_E_TYPEMISMATCH;
+                        FIXME("Coercion from %d to %d\n", vtFrom, vt );
+                        break;
+                }
+                break;
+
+        case( VT_R8 ):
+                switch( vtFrom )
+                {
+                case( VT_I1 ):
+                        res = VarR8FromI1( V_UNION(ps,cVal), &V_UNION(pd,dblVal) );
+                        break;
+                case( VT_I2 ):
+                        res = VarR8FromI2( V_UNION(ps,iVal), &V_UNION(pd,dblVal) );
+                        break;
+                case( VT_INT ):
+                case( VT_I4 ):
+                        res = VarR8FromI4( V_UNION(ps,lVal), &V_UNION(pd,dblVal) );
+                        break;
+                case( VT_UI1 ):
+                        res = VarR8FromUI1( V_UNION(ps,bVal), &V_UNION(pd,dblVal) );
+                        break;
+                case( VT_UI2 ):
+                        res = VarR8FromUI2( V_UNION(ps,uiVal), &V_UNION(pd,dblVal) );
+                        break;
+                case( VT_UINT ):
+                case( VT_UI4 ):
+                        res = VarR8FromUI4( V_UNION(ps,ulVal), &V_UNION(pd,dblVal) );
+                        break;
+                case( VT_R4 ):
+                        res = VarR8FromR4( V_UNION(ps,fltVal), &V_UNION(pd,dblVal) );
+                        break;
         case( VT_R8 ):
             res = VariantCopy( pd, ps );
             break;
-        case( VT_DATE ):
-            res = VarR8FromDate( V_UNION(ps,date), &V_UNION(pd,dblVal) );
-            break;
-        case( VT_BOOL ):
-            res = VarR8FromBool( V_UNION(ps,boolVal), &V_UNION(pd,dblVal) );
-            break;
-        case( VT_BSTR ):
-            res = VarR8FromStr( V_UNION(ps,bstrVal), lcid, 0, &V_UNION(pd,dblVal) );
-            break;
-        case( VT_CY ):
-            res = VarR8FromCy( V_UNION(ps,cyVal), &V_UNION(pd,dblVal) );
-            break;
-        case( VT_DISPATCH ):
-            /*res = VarR8FromDisp( V_UNION(ps,pdispVal), lcid, &V_UNION(pd,dblVal) );*/
-        case( VT_DECIMAL ):
-            /*res = VarR8FromDec( V_UNION(ps,deiVal), &V_UNION(pd,dblVal) );*/
-        case( VT_UNKNOWN ):
-        default:
-            res = DISP_E_TYPEMISMATCH;
-            FIXME("Coercion from %d to %d\n", vtFrom, vt );
-            break;
-        }
-        break;
-
-    case( VT_DATE ):
-        switch( vtFrom )
-        {
-        case( VT_I1 ):
-            res = VarDateFromI1( V_UNION(ps,cVal), &V_UNION(pd,date) );
-            break;
-        case( VT_I2 ):
-            res = VarDateFromI2( V_UNION(ps,iVal), &V_UNION(pd,date) );
-            break;
-        case( VT_INT ):
-            res = VarDateFromInt( V_UNION(ps,intVal), &V_UNION(pd,date) );
-            break;
-        case( VT_I4 ):
-            res = VarDateFromI4( V_UNION(ps,lVal), &V_UNION(pd,date) );
-            break;
-        case( VT_UI1 ):
-            res = VarDateFromUI1( V_UNION(ps,bVal), &V_UNION(pd,date) );
-            break;
-        case( VT_UI2 ):
-            res = VarDateFromUI2( V_UNION(ps,uiVal), &V_UNION(pd,date) );
-            break;
-        case( VT_UINT ):
-            res = VarDateFromUint( V_UNION(ps,uintVal), &V_UNION(pd,date) );
-            break;
-        case( VT_UI4 ):
-            res = VarDateFromUI4( V_UNION(ps,ulVal), &V_UNION(pd,date) );
-            break;
-        case( VT_R4 ):
-            res = VarDateFromR4( V_UNION(ps,fltVal), &V_UNION(pd,date) );
-            break;
-        case( VT_R8 ):
-            res = VarDateFromR8( V_UNION(ps,dblVal), &V_UNION(pd,date) );
-            break;
+                case( VT_DATE ):
+                        res = VarR8FromDate( V_UNION(ps,date), &V_UNION(pd,dblVal) );
+                        break;
+                case( VT_BOOL ):
+                        res = VarR8FromBool( V_UNION(ps,boolVal), &V_UNION(pd,dblVal) );
+                        break;
+                case( VT_BSTR ):
+                        res = VarR8FromStr( V_UNION(ps,bstrVal), lcid, 0, &V_UNION(pd,dblVal) );
+                        break;
+                case( VT_CY ):
+                        res = VarR8FromCy( V_UNION(ps,cyVal), &V_UNION(pd,dblVal) );
+                        break;
+                case( VT_DISPATCH ):
+                        /*res = VarR8FromDisp( V_UNION(ps,pdispVal), lcid, &V_UNION(pd,dblVal) );*/
+                case( VT_DECIMAL ):
+                        /*res = VarR8FromDec( V_UNION(ps,deiVal), &V_UNION(pd,dblVal) );*/
+                case( VT_UNKNOWN ):
+                default:
+                        res = DISP_E_TYPEMISMATCH;
+                        FIXME("Coercion from %d to %d\n", vtFrom, vt );
+                        break;
+                }
+                break;
+
+        case( VT_DATE ):
+                switch( vtFrom )
+                {
+                case( VT_I1 ):
+                        res = VarDateFromI1( V_UNION(ps,cVal), &V_UNION(pd,date) );
+                        break;
+                case( VT_I2 ):
+                        res = VarDateFromI2( V_UNION(ps,iVal), &V_UNION(pd,date) );
+                        break;
+                case( VT_INT ):
+                        res = VarDateFromInt( V_UNION(ps,intVal), &V_UNION(pd,date) );
+                        break;
+                case( VT_I4 ):
+                        res = VarDateFromI4( V_UNION(ps,lVal), &V_UNION(pd,date) );
+                        break;
+                case( VT_UI1 ):
+                        res = VarDateFromUI1( V_UNION(ps,bVal), &V_UNION(pd,date) );
+                        break;
+                case( VT_UI2 ):
+                        res = VarDateFromUI2( V_UNION(ps,uiVal), &V_UNION(pd,date) );
+                        break;
+                case( VT_UINT ):
+                        res = VarDateFromUint( V_UNION(ps,uintVal), &V_UNION(pd,date) );
+                        break;
+                case( VT_UI4 ):
+                        res = VarDateFromUI4( V_UNION(ps,ulVal), &V_UNION(pd,date) );
+                        break;
+                case( VT_R4 ):
+                        res = VarDateFromR4( V_UNION(ps,fltVal), &V_UNION(pd,date) );
+                        break;
+                case( VT_R8 ):
+                        res = VarDateFromR8( V_UNION(ps,dblVal), &V_UNION(pd,date) );
+                        break;
         case( VT_DATE ):
             res = VariantCopy( pd, ps );
             break;
-        case( VT_BOOL ):
-            res = VarDateFromBool( V_UNION(ps,boolVal), &V_UNION(pd,date) );
-            break;
-        case( VT_BSTR ):
-            res = VarDateFromStr( V_UNION(ps,bstrVal), lcid, 0, &V_UNION(pd,date) );
-            break;
-        case( VT_CY ):
-            res = VarDateFromCy( V_UNION(ps,cyVal), &V_UNION(pd,date) );
-            break;
-        case( VT_DISPATCH ):
-            /*res = VarDateFromDisp( V_UNION(ps,pdispVal), lcid, &V_UNION(pd,date) );*/
-        case( VT_DECIMAL ):
-            /*res = VarDateFromDec( V_UNION(ps,deiVal), &V_UNION(pd,date) );*/
-        case( VT_UNKNOWN ):
-        default:
-            res = DISP_E_TYPEMISMATCH;
-            FIXME("Coercion from %d to %d\n", vtFrom, vt );
-            break;
-        }
-        break;
-
-    case( VT_BOOL ):
-        switch( vtFrom )
-        {
-        case( VT_I1 ):
-            res = VarBoolFromI1( V_UNION(ps,cVal), &V_UNION(pd,boolVal) );
-            break;
-        case( VT_I2 ):
-            res = VarBoolFromI2( V_UNION(ps,iVal), &V_UNION(pd,boolVal) );
-            break;
-        case( VT_INT ):
-            res = VarBoolFromInt( V_UNION(ps,intVal), &V_UNION(pd,boolVal) );
-            break;
-        case( VT_I4 ):
-            res = VarBoolFromI4( V_UNION(ps,lVal), &V_UNION(pd,boolVal) );
-            break;
-        case( VT_UI1 ):
-            res = VarBoolFromUI1( V_UNION(ps,bVal), &V_UNION(pd,boolVal) );
-            break;
-        case( VT_UI2 ):
-            res = VarBoolFromUI2( V_UNION(ps,uiVal), &V_UNION(pd,boolVal) );
-            break;
-        case( VT_UINT ):
-            res = VarBoolFromUint( V_UNION(ps,uintVal), &V_UNION(pd,boolVal) );
-            break;
-        case( VT_UI4 ):
-            res = VarBoolFromUI4( V_UNION(ps,ulVal), &V_UNION(pd,boolVal) );
-            break;
-        case( VT_R4 ):
-            res = VarBoolFromR4( V_UNION(ps,fltVal), &V_UNION(pd,boolVal) );
-            break;
-        case( VT_R8 ):
-            res = VarBoolFromR8( V_UNION(ps,dblVal), &V_UNION(pd,boolVal) );
-            break;
-        case( VT_DATE ):
-            res = VarBoolFromDate( V_UNION(ps,date), &V_UNION(pd,boolVal) );
-            break;
+                case( VT_BOOL ):
+                        res = VarDateFromBool( V_UNION(ps,boolVal), &V_UNION(pd,date) );
+                        break;
+                case( VT_BSTR ):
+                        res = VarDateFromStr( V_UNION(ps,bstrVal), lcid, 0, &V_UNION(pd,date) );
+                        break;
+                case( VT_CY ):
+                        res = VarDateFromCy( V_UNION(ps,cyVal), &V_UNION(pd,date) );
+                        break;
+                case( VT_DISPATCH ):
+                        /*res = VarDateFromDisp( V_UNION(ps,pdispVal), lcid, &V_UNION(pd,date) );*/
+                case( VT_DECIMAL ):
+                        /*res = VarDateFromDec( V_UNION(ps,deiVal), &V_UNION(pd,date) );*/
+                case( VT_UNKNOWN ):
+                default:
+                        res = DISP_E_TYPEMISMATCH;
+                        FIXME("Coercion from %d to %d\n", vtFrom, vt );
+                        break;
+                }
+                break;
+
+        case( VT_BOOL ):
+                switch( vtFrom )
+                {
+                case( VT_I1 ):
+                        res = VarBoolFromI1( V_UNION(ps,cVal), &V_UNION(pd,boolVal) );
+                        break;
+                case( VT_I2 ):
+                        res = VarBoolFromI2( V_UNION(ps,iVal), &V_UNION(pd,boolVal) );
+                        break;
+                case( VT_INT ):
+                        res = VarBoolFromInt( V_UNION(ps,intVal), &V_UNION(pd,boolVal) );
+                        break;
+                case( VT_I4 ):
+                        res = VarBoolFromI4( V_UNION(ps,lVal), &V_UNION(pd,boolVal) );
+                        break;
+                case( VT_UI1 ):
+                        res = VarBoolFromUI1( V_UNION(ps,bVal), &V_UNION(pd,boolVal) );
+                        break;
+                case( VT_UI2 ):
+                        res = VarBoolFromUI2( V_UNION(ps,uiVal), &V_UNION(pd,boolVal) );
+                        break;
+                case( VT_UINT ):
+                        res = VarBoolFromUint( V_UNION(ps,uintVal), &V_UNION(pd,boolVal) );
+                        break;
+                case( VT_UI4 ):
+                        res = VarBoolFromUI4( V_UNION(ps,ulVal), &V_UNION(pd,boolVal) );
+                        break;
+                case( VT_R4 ):
+                        res = VarBoolFromR4( V_UNION(ps,fltVal), &V_UNION(pd,boolVal) );
+                        break;
+                case( VT_R8 ):
+                        res = VarBoolFromR8( V_UNION(ps,dblVal), &V_UNION(pd,boolVal) );
+                        break;
+                case( VT_DATE ):
+                        res = VarBoolFromDate( V_UNION(ps,date), &V_UNION(pd,boolVal) );
+                        break;
         case( VT_BOOL ):
             res = VariantCopy( pd, ps );
             break;
-        case( VT_BSTR ):
-            res = VarBoolFromStr( V_UNION(ps,bstrVal), lcid, 0, &V_UNION(pd,boolVal) );
-            break;
-        case( VT_CY ):
-            res = VarBoolFromCy( V_UNION(ps,cyVal), &V_UNION(pd,boolVal) );
-            break;
-        case( VT_DISPATCH ):
-            /*res = VarBoolFromDisp( V_UNION(ps,pdispVal), lcid, &V_UNION(pd,boolVal) );*/
-        case( VT_DECIMAL ):
-            /*res = VarBoolFromDec( V_UNION(ps,deiVal), &V_UNION(pd,boolVal) );*/
-        case( VT_UNKNOWN ):
-        default:
-            res = DISP_E_TYPEMISMATCH;
-            FIXME("Coercion from %d to %d\n", vtFrom, vt );
-            break;
-        }
-        break;
-
-    case( VT_BSTR ):
-        switch( vtFrom )
-        {
-        case( VT_EMPTY ):
-            if ((V_UNION(pd,bstrVal) = SysAllocStringLen(NULL, 0)))
-                res = S_OK;
-            else
-                res = E_OUTOFMEMORY;
-            break;
-        case( VT_I1 ):
-            res = VarBstrFromI1( V_UNION(ps,cVal), lcid, 0, &V_UNION(pd,bstrVal) );
-            break;
-        case( VT_I2 ):
-            res = VarBstrFromI2( V_UNION(ps,iVal), lcid, 0, &V_UNION(pd,bstrVal) );
-            break;
-        case( VT_INT ):
-            res = VarBstrFromInt( V_UNION(ps,intVal), lcid, 0, &V_UNION(pd,bstrVal) );
-            break;
-        case( VT_I4 ):
-            res = VarBstrFromI4( V_UNION(ps,lVal), lcid, 0, &V_UNION(pd,bstrVal) );
-            break;
-        case( VT_UI1 ):
-            res = VarBstrFromUI1( V_UNION(ps,bVal), lcid, 0, &V_UNION(pd,bstrVal) );
-            break;
-        case( VT_UI2 ):
-            res = VarBstrFromUI2( V_UNION(ps,uiVal), lcid, 0, &V_UNION(pd,bstrVal) );
-            break;
-        case( VT_UINT ):
-            res = VarBstrFromUint( V_UNION(ps,uintVal), lcid, 0, &V_UNION(pd,bstrVal) );
-            break;
-        case( VT_UI4 ):
-            res = VarBstrFromUI4( V_UNION(ps,ulVal), lcid, 0, &V_UNION(pd,bstrVal) );
-            break;
-        case( VT_R4 ):
-            res = VarBstrFromR4( V_UNION(ps,fltVal), lcid, 0, &V_UNION(pd,bstrVal) );
-            break;
-        case( VT_R8 ):
-            res = VarBstrFromR8( V_UNION(ps,dblVal), lcid, 0, &V_UNION(pd,bstrVal) );
-            break;
-        case( VT_DATE ):
-            res = VarBstrFromDate( V_UNION(ps,date), lcid, 0, &V_UNION(pd,bstrVal) );
-            break;
-        case( VT_BOOL ):
-            res = VarBstrFromBool( V_UNION(ps,boolVal), lcid, 0, &V_UNION(pd,bstrVal) );
-            break;
-        case( VT_BSTR ):
-            res = VariantCopy( pd, ps );
-            break;
-        case( VT_CY ):
-            res = VarBstrFromCy( V_UNION(ps,cyVal), lcid, 0, &V_UNION(pd,bstrVal) );
-            break;
-        case( VT_DISPATCH ):
-            /*res = VarBstrFromDisp( V_UNION(ps,pdispVal), lcid, 0, &(pd,bstrVal) );*/
-        case( VT_DECIMAL ):
-            /*res = VarBstrFromDec( V_UNION(ps,deiVal), lcid, 0, &(pd,bstrVal) );*/
-        case( VT_UNKNOWN ):
-        default:
-            res = DISP_E_TYPEMISMATCH;
-            FIXME("Coercion from %d to %d\n", vtFrom, vt );
-            break;
-        }
-        break;
+                case( VT_BSTR ):
+                        res = VarBoolFromStr( V_UNION(ps,bstrVal), lcid, 0, &V_UNION(pd,boolVal) );
+                        break;
+                case( VT_CY ):
+                        res = VarBoolFromCy( V_UNION(ps,cyVal), &V_UNION(pd,boolVal) );
+                        break;
+                case( VT_DISPATCH ):
+                        /*res = VarBoolFromDisp( V_UNION(ps,pdispVal), lcid, &V_UNION(pd,boolVal) );*/
+                case( VT_DECIMAL ):
+                        /*res = VarBoolFromDec( V_UNION(ps,deiVal), &V_UNION(pd,boolVal) );*/
+                case( VT_UNKNOWN ):
+                default:
+                        res = DISP_E_TYPEMISMATCH;
+                        FIXME("Coercion from %d to %d\n", vtFrom, vt );
+                        break;
+                }
+                break;
+
+        case( VT_BSTR ):
+                switch( vtFrom )
+                {
+                case( VT_EMPTY ):
+                        if ((V_UNION(pd,bstrVal) = SysAllocStringLen(NULL, 0)))
+                                res = S_OK;
+                        else
+                                res = E_OUTOFMEMORY;
+                        break;
+                case( VT_I1 ):
+                        res = VarBstrFromI1( V_UNION(ps,cVal), lcid, 0, &V_UNION(pd,bstrVal) );
+                        break;
+                case( VT_I2 ):
+                        res = VarBstrFromI2( V_UNION(ps,iVal), lcid, 0, &V_UNION(pd,bstrVal) );
+                        break;
+                case( VT_INT ):
+                        res = VarBstrFromInt( V_UNION(ps,intVal), lcid, 0, &V_UNION(pd,bstrVal) );
+                        break;
+                case( VT_I4 ):
+                        res = VarBstrFromI4( V_UNION(ps,lVal), lcid, 0, &V_UNION(pd,bstrVal) );
+                        break;
+                case( VT_UI1 ):
+                        res = VarBstrFromUI1( V_UNION(ps,bVal), lcid, 0, &V_UNION(pd,bstrVal) );
+                        break;
+                case( VT_UI2 ):
+                        res = VarBstrFromUI2( V_UNION(ps,uiVal), lcid, 0, &V_UNION(pd,bstrVal) );
+                        break;
+                case( VT_UINT ):
+                        res = VarBstrFromUint( V_UNION(ps,uintVal), lcid, 0, &V_UNION(pd,bstrVal) );
+                        break;
+                case( VT_UI4 ):
+                        res = VarBstrFromUI4( V_UNION(ps,ulVal), lcid, 0, &V_UNION(pd,bstrVal) );
+                        break;
+                case( VT_R4 ):
+                        res = VarBstrFromR4( V_UNION(ps,fltVal), lcid, 0, &V_UNION(pd,bstrVal) );
+                        break;
+                case( VT_R8 ):
+                        res = VarBstrFromR8( V_UNION(ps,dblVal), lcid, 0, &V_UNION(pd,bstrVal) );
+                        break;
+                case( VT_DATE ):
+                        res = VarBstrFromDate( V_UNION(ps,date), lcid, 0, &V_UNION(pd,bstrVal) );
+                        break;
+                case( VT_BOOL ):
+                        res = VarBstrFromBool( V_UNION(ps,boolVal), lcid, 0, &V_UNION(pd,bstrVal) );
+                        break;
+                case( VT_BSTR ):
+                        res = VariantCopy( pd, ps );
+                        break;
+                case( VT_CY ):
+                        res = VarBstrFromCy( V_UNION(ps,cyVal), lcid, 0, &V_UNION(pd,bstrVal) );
+                        break;
+                case( VT_DISPATCH ):
+                        /*res = VarBstrFromDisp( V_UNION(ps,pdispVal), lcid, 0, &(pd,bstrVal) );*/
+                case( VT_DECIMAL ):
+                        /*res = VarBstrFromDec( V_UNION(ps,deiVal), lcid, 0, &(pd,bstrVal) );*/
+                case( VT_UNKNOWN ):
+                default:
+                        res = DISP_E_TYPEMISMATCH;
+                        FIXME("Coercion from %d to %d\n", vtFrom, vt );
+                        break;
+                }
+                break;
 
      case( VT_CY ):
-    switch( vtFrom )
-      {
-      case( VT_I1 ):
-         res = VarCyFromI1( V_UNION(ps,cVal), &V_UNION(pd,cyVal) );
-         break;
-      case( VT_I2 ):
-         res = VarCyFromI2( V_UNION(ps,iVal), &V_UNION(pd,cyVal) );
-         break;
-      case( VT_INT ):
-         res = VarCyFromInt( V_UNION(ps,intVal), &V_UNION(pd,cyVal) );
-         break;
-      case( VT_I4 ):
-         res = VarCyFromI4( V_UNION(ps,lVal), &V_UNION(pd,cyVal) );
-         break;
-      case( VT_UI1 ):
-         res = VarCyFromUI1( V_UNION(ps,bVal), &V_UNION(pd,cyVal) );
-         break;
-      case( VT_UI2 ):
-         res = VarCyFromUI2( V_UNION(ps,uiVal), &V_UNION(pd,cyVal) );
-         break;
-      case( VT_UINT ):
-         res = VarCyFromUint( V_UNION(ps,uintVal), &V_UNION(pd,cyVal) );
-         break;
-      case( VT_UI4 ):
-         res = VarCyFromUI4( V_UNION(ps,ulVal), &V_UNION(pd,cyVal) );
-         break;
-      case( VT_R4 ):
-         res = VarCyFromR4( V_UNION(ps,fltVal), &V_UNION(pd,cyVal) );
-         break;
-      case( VT_R8 ):
-         res = VarCyFromR8( V_UNION(ps,dblVal), &V_UNION(pd,cyVal) );
-         break;
-      case( VT_DATE ):
-         res = VarCyFromDate( V_UNION(ps,date), &V_UNION(pd,cyVal) );
-         break;
-      case( VT_BOOL ):
-         res = VarCyFromBool( V_UNION(ps,date), &V_UNION(pd,cyVal) );
-         break;
-      case( VT_CY ):
-         res = VariantCopy( pd, ps );
-         break;
-      case( VT_BSTR ):
-         res = VarCyFromStr( V_UNION(ps,bstrVal), lcid, 0, &V_UNION(pd,cyVal) );
-         break;
-      case( VT_DISPATCH ):
-         /*res = VarCyFromDisp( V_UNION(ps,pdispVal), lcid, &V_UNION(pd,cyVal) );*/
-      case( VT_DECIMAL ):
-         /*res = VarCyFromDec( V_UNION(ps,deiVal), &V_UNION(pd,cyVal) );*/
-         break;
-      case( VT_UNKNOWN ):
-      default:
-         res = DISP_E_TYPEMISMATCH;
-         FIXME("Coercion from %d to %d\n", vtFrom, vt );
-         break;
-      }
-    break;
-
-    default:
-        res = DISP_E_TYPEMISMATCH;
-        FIXME("Coercion from %d to %d\n", vtFrom, vt );
-        break;
-    }
-
-    return res;
-}
-
-/******************************************************************************
- *      ValidateVtRange [INTERNAL]
+        switch( vtFrom )
+          {
+          case( VT_I1 ):
+             res = VarCyFromI1( V_UNION(ps,cVal), &V_UNION(pd,cyVal) );
+             break;
+          case( VT_I2 ):
+             res = VarCyFromI2( V_UNION(ps,iVal), &V_UNION(pd,cyVal) );
+             break;
+          case( VT_INT ):
+             res = VarCyFromInt( V_UNION(ps,intVal), &V_UNION(pd,cyVal) );
+             break;
+          case( VT_I4 ):
+             res = VarCyFromI4( V_UNION(ps,lVal), &V_UNION(pd,cyVal) );
+             break;
+          case( VT_UI1 ):
+             res = VarCyFromUI1( V_UNION(ps,bVal), &V_UNION(pd,cyVal) );
+             break;
+          case( VT_UI2 ):
+             res = VarCyFromUI2( V_UNION(ps,uiVal), &V_UNION(pd,cyVal) );
+             break;
+          case( VT_UINT ):
+             res = VarCyFromUint( V_UNION(ps,uintVal), &V_UNION(pd,cyVal) );
+             break;
+          case( VT_UI4 ):
+             res = VarCyFromUI4( V_UNION(ps,ulVal), &V_UNION(pd,cyVal) );
+             break;
+          case( VT_R4 ):
+             res = VarCyFromR4( V_UNION(ps,fltVal), &V_UNION(pd,cyVal) );
+             break;
+          case( VT_R8 ):
+             res = VarCyFromR8( V_UNION(ps,dblVal), &V_UNION(pd,cyVal) );
+             break;
+          case( VT_DATE ):
+             res = VarCyFromDate( V_UNION(ps,date), &V_UNION(pd,cyVal) );
+             break;
+          case( VT_BOOL ):
+             res = VarCyFromBool( V_UNION(ps,date), &V_UNION(pd,cyVal) );
+             break;
+          case( VT_CY ):
+             res = VariantCopy( pd, ps );
+             break;
+          case( VT_BSTR ):
+             res = VarCyFromStr( V_UNION(ps,bstrVal), lcid, 0, &V_UNION(pd,cyVal) );
+             break;
+          case( VT_DISPATCH ):
+             /*res = VarCyFromDisp( V_UNION(ps,pdispVal), lcid, &V_UNION(pd,cyVal) );*/
+          case( VT_DECIMAL ):
+             /*res = VarCyFromDec( V_UNION(ps,deiVal), &V_UNION(pd,cyVal) );*/
+             break;
+          case( VT_UNKNOWN ):
+          default:
+             res = DISP_E_TYPEMISMATCH;
+             FIXME("Coercion from %d to %d\n", vtFrom, vt );
+             break;
+          }
+        break;
+
+        default:
+                res = DISP_E_TYPEMISMATCH;
+                FIXME("Coercion from %d to %d\n", vtFrom, vt );
+                break;
+        }
+        
+        return res;
+}
+
+/******************************************************************************
+ *              ValidateVtRange [INTERNAL]
  *
  * Used internally by the hi-level Variant API to determine
@@ -1608 +1608 @@
 
 /******************************************************************************
- *      ValidateVartype [INTERNAL]
+ *              ValidateVartype [INTERNAL]
  *
  * Used internally by the hi-level Variant API to determine
@@ -1615 +1615 @@
 static HRESULT WINAPI ValidateVariantType( VARTYPE vt )
 {
-    HRESULT res = S_OK;
-
-    /* check if we have a valid argument.
-     */
-    if( vt & VT_BYREF )
+        HRESULT res = S_OK;
+
+        /* check if we have a valid argument.
+         */
+        if( vt & VT_BYREF )
     {
         /* if by reference check that the type is in
@@ -1626 +1626 @@
         if( ( vt & VT_TYPEMASK ) == VT_EMPTY ||
             ( vt & VT_TYPEMASK ) == VT_NULL ||
-            ( vt & VT_TYPEMASK ) > VT_MAXVALIDTYPE )
-        {
-            res = E_INVALIDARG;
-        }
-
+                        ( vt & VT_TYPEMASK ) > VT_MAXVALIDTYPE )
+                {
+                        res = E_INVALIDARG;
+                }
+                        
     }
     else
@@ -1636 +1636 @@
         res = ValidateVtRange( vt );
     }
-
-    return res;
-}
-
-/******************************************************************************
- *      ValidateVt  [INTERNAL]
+                
+        return res;
+}
+
+/******************************************************************************
+ *              ValidateVt      [INTERNAL]
  *
  * Used internally by the hi-level Variant API to determine
@@ -1648 +1648 @@
 static HRESULT WINAPI ValidateVt( VARTYPE vt )
 {
-    HRESULT res = S_OK;
-
-    /* check if we have a valid argument.
-     */
-    if( vt & VT_BYREF )
+        HRESULT res = S_OK;
+
+        /* check if we have a valid argument.
+         */
+        if( vt & VT_BYREF )
     {
         /* if by reference check that the type is in
@@ -1659 +1659 @@
         if( ( vt & VT_TYPEMASK ) == VT_EMPTY ||
             ( vt & VT_TYPEMASK ) == VT_NULL ||
-            ( vt & VT_TYPEMASK ) > VT_MAXVALIDTYPE )
-        {
-            res = DISP_E_BADVARTYPE;
-        }
-
+                        ( vt & VT_TYPEMASK ) > VT_MAXVALIDTYPE )
+                {
+                        res = DISP_E_BADVARTYPE;
+                }
+                        
     }
     else
@@ -1669 +1669 @@
         res = ValidateVtRange( vt );
     }
-
-    return res;
-}
-
-
-
-
-
-/******************************************************************************
- *      VariantInit [OLEAUT32.8]
+                
+        return res;
+}
+
+
+
+
+
+/******************************************************************************
+ *              VariantInit     [OLEAUT32.8]
  *
  * Initializes the Variant.  Unlike VariantClear it does not interpret the current
@@ -1694 +1694 @@
 
 /******************************************************************************
- *      VariantClear    [OLEAUT32.9]
+ *              VariantClear    [OLEAUT32.9]
  *
  * This function clears the VARIANT by setting the vt field to VT_EMPTY. It also
- * sets the wReservedX field to 0.  The current contents of the VARIANT are
+ * sets the wReservedX field to 0.      The current contents of the VARIANT are
  * freed.  If the vt is VT_BSTR the string is freed. If VT_DISPATCH the object is
  * released. If VT_ARRAY the array is freed.
@@ -1716 +1716 @@
       if ( (V_VT(pvarg) & VT_ARRAY) != 0)
       {
-    SafeArrayDestroy(V_UNION(pvarg,parray));
+        SafeArrayDestroy(V_UNION(pvarg,parray));
       }
       else
       {
-    switch( V_VT(pvarg) & VT_TYPEMASK )
-    {
-      case( VT_BSTR ):
-        SysFreeString( V_UNION(pvarg,bstrVal) );
-        break;
-      case( VT_DISPATCH ):
-        if(V_UNION(pvarg,pdispVal)!=NULL)
-          ICOM_CALL(Release,V_UNION(pvarg,pdispVal));
-        break;
-      case( VT_VARIANT ):
-        VariantClear(V_UNION(pvarg,pvarVal));
-        break;
-      case( VT_UNKNOWN ):
-        if(V_UNION(pvarg,punkVal)!=NULL)
-          ICOM_CALL(Release,V_UNION(pvarg,punkVal));
-        break;
-      case( VT_SAFEARRAY ):
-        SafeArrayDestroy(V_UNION(pvarg,parray));
-        break;
-      default:
-        break;
-    }
+        switch( V_VT(pvarg) & VT_TYPEMASK )
+        {
+          case( VT_BSTR ):
+            SysFreeString( V_UNION(pvarg,bstrVal) );
+            break;
+          case( VT_DISPATCH ):
+            if(V_UNION(pvarg,pdispVal)!=NULL)
+              ICOM_CALL(Release,V_UNION(pvarg,pdispVal));
+            break;
+          case( VT_VARIANT ):
+            VariantClear(V_UNION(pvarg,pvarVal));
+            break;
+          case( VT_UNKNOWN ):
+            if(V_UNION(pvarg,punkVal)!=NULL)
+              ICOM_CALL(Release,V_UNION(pvarg,punkVal));
+            break;
+          case( VT_SAFEARRAY ):
+            SafeArrayDestroy(V_UNION(pvarg,parray));
+            break;
+          default:
+            break;
+        }
       }
     }
-
+        
     /*
      * Empty all the fields and mark the type as empty.
@@ -1756 +1756 @@
 
 /******************************************************************************
- *      VariantCopy [OLEAUT32.10]
+ *              VariantCopy     [OLEAUT32.10]
  *
  * Frees up the designation variant and makes a copy of the source.
@@ -1774 +1774 @@
   {
     res = VariantClear( pvargDest );
-
+                
     if( res == S_OK )
     {
       if( V_VT(pvargSrc) & VT_BYREF )
       {
-    /* In the case of byreference we only need
-     * to copy the pointer.
-     */
-    pvargDest->n1.n2.n3 = pvargSrc->n1.n2.n3;
-    V_VT(pvargDest) = V_VT(pvargSrc);
+        /* In the case of byreference we only need
+         * to copy the pointer.
+         */
+        pvargDest->n1.n2.n3 = pvargSrc->n1.n2.n3;
+        V_VT(pvargDest) = V_VT(pvargSrc);
       }
       else
       {
-    /*
-     * The VT_ARRAY flag is another way to designate a safe array.
-     */
-    if (V_VT(pvargSrc) & VT_ARRAY)
-    {
-      SafeArrayCopy(V_UNION(pvargSrc,parray), &V_UNION(pvargDest,parray));
-    }
-    else
-    {
-      /* In the case of by value we need to
-       * copy the actuall value. In the case of
-       * VT_BSTR a copy of the string is made,
-       * if VT_DISPATCH or VT_IUNKNOWN AddReff is
-       * called to increment the object's reference count.
-       */
-      switch( V_VT(pvargSrc) & VT_TYPEMASK )
-      {
-        case( VT_BSTR ):
-          V_UNION(pvargDest,bstrVal) = SysAllocString( V_UNION(pvargSrc,bstrVal) );
-          break;
-        case( VT_DISPATCH ):
-          V_UNION(pvargDest,pdispVal) = V_UNION(pvargSrc,pdispVal);
-          if (V_UNION(pvargDest,pdispVal)!=NULL)
-        ICOM_CALL(AddRef,V_UNION(pvargDest,pdispVal));
-          break;
-        case( VT_VARIANT ):
-          VariantCopy(V_UNION(pvargDest,pvarVal),V_UNION(pvargSrc,pvarVal));
-          break;
-        case( VT_UNKNOWN ):
-          V_UNION(pvargDest,punkVal) = V_UNION(pvargSrc,punkVal);
-          if (V_UNION(pvargDest,pdispVal)!=NULL)
-        ICOM_CALL(AddRef,V_UNION(pvargDest,punkVal));
-          break;
-        case( VT_SAFEARRAY ):
-          SafeArrayCopy(V_UNION(pvargSrc,parray), &V_UNION(pvargDest,parray));
-          break;
-        default:
-          pvargDest->n1.n2.n3 = pvargSrc->n1.n2.n3;
-          break;
-      }
-    }
-
-    V_VT(pvargDest) = V_VT(pvargSrc);
-      }
+        /*
+         * The VT_ARRAY flag is another way to designate a safe array.
+         */
+        if (V_VT(pvargSrc) & VT_ARRAY)
+        {
+          SafeArrayCopy(V_UNION(pvargSrc,parray), &V_UNION(pvargDest,parray));
+        }
+        else
+        {
+          /* In the case of by value we need to
+           * copy the actuall value. In the case of
+           * VT_BSTR a copy of the string is made,
+           * if VT_DISPATCH or VT_IUNKNOWN AddReff is
+           * called to increment the object's reference count.
+           */
+          switch( V_VT(pvargSrc) & VT_TYPEMASK )
+          {
+            case( VT_BSTR ):
+              V_UNION(pvargDest,bstrVal) = SysAllocString( V_UNION(pvargSrc,bstrVal) );
+              break;
+            case( VT_DISPATCH ):
+              V_UNION(pvargDest,pdispVal) = V_UNION(pvargSrc,pdispVal);
+              if (V_UNION(pvargDest,pdispVal)!=NULL)
+                ICOM_CALL(AddRef,V_UNION(pvargDest,pdispVal));
+              break;
+            case( VT_VARIANT ):
+              VariantCopy(V_UNION(pvargDest,pvarVal),V_UNION(pvargSrc,pvarVal));
+              break;
+            case( VT_UNKNOWN ):
+              V_UNION(pvargDest,punkVal) = V_UNION(pvargSrc,punkVal);
+              if (V_UNION(pvargDest,pdispVal)!=NULL)
+                ICOM_CALL(AddRef,V_UNION(pvargDest,punkVal));
+              break;
+            case( VT_SAFEARRAY ):
+              SafeArrayCopy(V_UNION(pvargSrc,parray), &V_UNION(pvargDest,parray));
+              break;
+            default:
+              pvargDest->n1.n2.n3 = pvargSrc->n1.n2.n3;
+              break;
+          }
+        }
+        
+        V_VT(pvargDest) = V_VT(pvargSrc);
+      }      
     }
   }
@@ -1839 +1839 @@
 
 /******************************************************************************
- *      VariantCopyInd  [OLEAUT32.11]
+ *              VariantCopyInd  [OLEAUT32.11]
  *
  * Frees up the destination variant and makes a copy of the source.  If
@@ -1854 +1854 @@
   if( res != S_OK )
     return res;
-
+  
   if( V_VT(pvargSrc) & VT_BYREF )
   {
@@ -1876 +1876 @@
       if( res == S_OK )
       {
-    /*
-     * The VT_ARRAY flag is another way to designate a safearray variant.
-     */
-    if ( V_VT(pvargSrc) & VT_ARRAY)
-    {
-      SafeArrayCopy(*V_UNION(pvargSrc,pparray), &V_UNION(pvargDest,parray));
-    }
-    else
-    {
-      /* In the case of by reference we need
-       * to copy the date pointed to by the variant.
-       */
-
-      /* Get the variant type.
-       */
-      switch( V_VT(pvargSrc) & VT_TYPEMASK )
-      {
-        case( VT_BSTR ):
-          V_UNION(pvargDest,bstrVal) = SysAllocString( *(V_UNION(pvargSrc,pbstrVal)) );
-          break;
-        case( VT_DISPATCH ):
-          break;
-        case( VT_VARIANT ):
-          {
-        /* Prevent from cycling.  According to tests on
-         * VariantCopyInd in Windows and the documentation
-         * this API dereferences the inner Variants to only one depth.
-         * If the inner Variant itself contains an
-         * other inner variant the E_INVALIDARG error is
-         * returned.
-         */
-        if( pvargSrc->n1.n2.wReserved1 & PROCESSING_INNER_VARIANT )
-        {
-          /* If we get here we are attempting to deference
-           * an inner variant that that is itself contained
-           * in an inner variant so report E_INVALIDARG error.
-           */
-          res = E_INVALIDARG;
-        }
-        else
-        {
-          /* Set the processing inner variant flag.
-           * We will set this flag in the inner variant
-           * that will be passed to the VariantCopyInd function.
-           */
-          (V_UNION(pvargSrc,pvarVal))->n1.n2.wReserved1 |= PROCESSING_INNER_VARIANT;
-
-          /* Dereference the inner variant.
-           */
-          res = VariantCopyInd( pvargDest, V_UNION(pvargSrc,pvarVal) );
-          /* We must also copy its type, I think.
-           */
-          V_VT(pvargSrc) = V_VT(V_UNION(pvargSrc,pvarVal));
-        }
-          }
-          break;
-        case( VT_UNKNOWN ):
-          break;
-        case( VT_SAFEARRAY ):
-          SafeArrayCopy(*V_UNION(pvargSrc,pparray), &V_UNION(pvargDest,parray));
-          break;
-        default:
-          /* This is a by reference Variant which means that the union
-           * part of the Variant contains a pointer to some data of
-           * type "V_VT(pvargSrc) & VT_TYPEMASK".
-           * We will deference this data in a generic fashion using
-           * the void pointer "Variant.u.byref".
-           * We will copy this data into the union of the destination
-           * Variant.
-           */
-          memcpy( &pvargDest->n1.n2, V_UNION(pvargSrc,byref), SizeOfVariantData( pvargSrc ) );
-          break;
-      }
-    }
-
-    V_VT(pvargDest) = V_VT(pvargSrc) & VT_TYPEMASK;
+        /*
+         * The VT_ARRAY flag is another way to designate a safearray variant.
+         */
+        if ( V_VT(pvargSrc) & VT_ARRAY)
+        {
+          SafeArrayCopy(*V_UNION(pvargSrc,pparray), &V_UNION(pvargDest,parray));
+        }
+        else
+        {
+          /* In the case of by reference we need
+           * to copy the date pointed to by the variant.
+           */
+
+          /* Get the variant type.
+           */
+          switch( V_VT(pvargSrc) & VT_TYPEMASK )
+          {
+            case( VT_BSTR ):
+              V_UNION(pvargDest,bstrVal) = SysAllocString( *(V_UNION(pvargSrc,pbstrVal)) );
+              break;
+            case( VT_DISPATCH ):
+              break;
+            case( VT_VARIANT ):
+              {
+                /* Prevent from cycling.  According to tests on
+                 * VariantCopyInd in Windows and the documentation
+                 * this API dereferences the inner Variants to only one depth.
+                 * If the inner Variant itself contains an
+                 * other inner variant the E_INVALIDARG error is
+                 * returned. 
+                 */
+                if( pvargSrc->n1.n2.wReserved1 & PROCESSING_INNER_VARIANT )
+                {
+                  /* If we get here we are attempting to deference
+                   * an inner variant that that is itself contained
+                   * in an inner variant so report E_INVALIDARG error.
+                   */
+                  res = E_INVALIDARG;
+                }
+                else
+                {
+                  /* Set the processing inner variant flag.
+                   * We will set this flag in the inner variant
+                   * that will be passed to the VariantCopyInd function.
+                   */
+                  (V_UNION(pvargSrc,pvarVal))->n1.n2.wReserved1 |= PROCESSING_INNER_VARIANT;
+                  
+                  /* Dereference the inner variant.
+                   */
+                  res = VariantCopyInd( pvargDest, V_UNION(pvargSrc,pvarVal) );
+                  /* We must also copy its type, I think.
+                   */
+                  V_VT(pvargSrc) = V_VT(V_UNION(pvargSrc,pvarVal));
+                }
+              }
+              break;
+            case( VT_UNKNOWN ):
+              break;
+            case( VT_SAFEARRAY ):
+              SafeArrayCopy(*V_UNION(pvargSrc,pparray), &V_UNION(pvargDest,parray));
+              break;
+            default:
+              /* This is a by reference Variant which means that the union
+               * part of the Variant contains a pointer to some data of
+               * type "V_VT(pvargSrc) & VT_TYPEMASK".
+               * We will deference this data in a generic fashion using
+               * the void pointer "Variant.u.byref".
+               * We will copy this data into the union of the destination
+               * Variant.
+               */
+              memcpy( &pvargDest->n1.n2, V_UNION(pvargSrc,byref), SizeOfVariantData( pvargSrc ) );
+              break;
+          }
+        }
+        
+        V_VT(pvargDest) = V_VT(pvargSrc) & VT_TYPEMASK;
       }
     }
@@ -1968 +1968 @@
 
 /******************************************************************************
- *      VariantChangeType   [OLEAUT32.12]
+ *              VariantChangeType       [OLEAUT32.12]
  */
 HRESULT WINAPI VariantChangeType(VARIANTARG* pvargDest, VARIANTARG* pvargSrc,
-                            USHORT wFlags, VARTYPE vt)
-{
-    return VariantChangeTypeEx( pvargDest, pvargSrc, 0, wFlags, vt );
-}
-
-/******************************************************************************
- *      VariantChangeTypeEx [OLEAUT32.147]
+                                                        USHORT wFlags, VARTYPE vt)
+{
+        return VariantChangeTypeEx( pvargDest, pvargSrc, 0, wFlags, vt );
+}
+
+/******************************************************************************
+ *              VariantChangeTypeEx     [OLEAUT32.147]
  */
 HRESULT WINAPI VariantChangeTypeEx(VARIANTARG* pvargDest, VARIANTARG* pvargSrc,
-                              LCID lcid, USHORT wFlags, VARTYPE vt)
-{
-    HRESULT res = S_OK;
-    VARIANTARG varg;
-    VariantInit( &varg );
-
-    TRACE("(%p, %p, %ld, %u, %u),stub\n", pvargDest, pvargSrc, lcid, wFlags, vt);
-
-    /* validate our source argument.
-     */
-    res = ValidateVariantType( V_VT(pvargSrc) );
-
-    /* validate the vartype.
-     */
-    if( res == S_OK )
-    {
-        res = ValidateVt( vt );
-    }
-
-    /* if we are doing an in-place conversion make a copy of the source.
-     */
-    if( res == S_OK && pvargDest == pvargSrc )
-    {
-        res = VariantCopy( &varg, pvargSrc );
-        pvargSrc = &varg;
-    }
-
-    if( res == S_OK )
-    {
-        /* free up the destination variant.
-         */
-        res = VariantClear( pvargDest );
-    }
-
-    if( res == S_OK )
-    {
-        if( V_VT(pvargSrc) & VT_BYREF )
-        {
-            /* Convert the source variant to a "byvalue" variant.
-             */
-            VARIANTARG Variant;
-            VariantInit( &Variant );
-            res = VariantCopyInd( &Variant, pvargSrc );
-            if( res == S_OK )
-            {
-                res = Coerce( pvargDest, lcid, wFlags, &Variant, vt );
-                /* this should not fail.
-                 */
-                VariantClear( &Variant );
-            }
-
-        }
-        else
-        {
-            /* Use the current "byvalue" source variant.
-             */
-            res = Coerce( pvargDest, lcid, wFlags, pvargSrc, vt );
-        }
-    }
-    /* this should not fail.
-     */
-    VariantClear( &varg );
-
-    /* set the type of the destination
-     */
-    if ( res == S_OK )
-        V_VT(pvargDest) = vt;
-
-    return res;
-}
-
-
-
-
-/******************************************************************************
- *      VarUI1FromI2        [OLEAUT32.130]
+                                                          LCID lcid, USHORT wFlags, VARTYPE vt)
+{
+        HRESULT res = S_OK;
+        VARIANTARG varg;
+        VariantInit( &varg );
+        
+        TRACE("(%p, %p, %ld, %u, %u),stub\n", pvargDest, pvargSrc, lcid, wFlags, vt);
+
+        /* validate our source argument.
+         */
+        res = ValidateVariantType( V_VT(pvargSrc) );
+
+        /* validate the vartype.
+         */
+        if( res == S_OK )
+        {
+                res = ValidateVt( vt );
+        }
+
+        /* if we are doing an in-place conversion make a copy of the source.
+         */
+        if( res == S_OK && pvargDest == pvargSrc )
+        {
+                res = VariantCopy( &varg, pvargSrc );
+                pvargSrc = &varg;
+        }
+
+        if( res == S_OK )
+        {
+                /* free up the destination variant.
+                 */
+                res = VariantClear( pvargDest );
+        }
+
+        if( res == S_OK )
+        {
+                if( V_VT(pvargSrc) & VT_BYREF )
+                {
+                        /* Convert the source variant to a "byvalue" variant.
+                         */
+                        VARIANTARG Variant;
+                        VariantInit( &Variant );
+                        res = VariantCopyInd( &Variant, pvargSrc );
+                        if( res == S_OK )
+                        {
+                                res = Coerce( pvargDest, lcid, wFlags, &Variant, vt );
+                                /* this should not fail.
+                                 */
+                                VariantClear( &Variant );
+                        }
+        
+                }
+                else
+                {
+                        /* Use the current "byvalue" source variant.
+                         */
+                        res = Coerce( pvargDest, lcid, wFlags, pvargSrc, vt );
+                }
+        }
+        /* this should not fail.
+         */
+        VariantClear( &varg );
+        
+        /* set the type of the destination
+         */
+        if ( res == S_OK )
+                V_VT(pvargDest) = vt;
+
+        return res;
+}
+
+
+
+
+/******************************************************************************
+ *              VarUI1FromI2            [OLEAUT32.130]
  */
 HRESULT WINAPI VarUI1FromI2(short sIn, BYTE* pbOut)
 {
-    TRACE("( %d, %p ), stub\n", sIn, pbOut );
-
-    /* Check range of value.
-     */
-    if( sIn < UI1_MIN || sIn > UI1_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *pbOut = (BYTE) sIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarUI1FromI4        [OLEAUT32.131]
+        TRACE("( %d, %p ), stub\n", sIn, pbOut );
+
+        /* Check range of value.
+         */
+        if( sIn < UI1_MIN || sIn > UI1_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *pbOut = (BYTE) sIn;
+        
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarUI1FromI4            [OLEAUT32.131]
  */
 HRESULT WINAPI VarUI1FromI4(LONG lIn, BYTE* pbOut)
 {
-    TRACE("( %ld, %p ), stub\n", lIn, pbOut );
-
-    /* Check range of value.
-     */
-    if( lIn < UI1_MIN || lIn > UI1_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *pbOut = (BYTE) lIn;
-
-    return S_OK;
-}
-
-
-/******************************************************************************
- *      VarUI1FromR4        [OLEAUT32.132]
+        TRACE("( %ld, %p ), stub\n", lIn, pbOut );
+
+        /* Check range of value.
+         */
+        if( lIn < UI1_MIN || lIn > UI1_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *pbOut = (BYTE) lIn;
+        
+        return S_OK;
+}
+
+
+/******************************************************************************
+ *              VarUI1FromR4            [OLEAUT32.132]
  */
 HRESULT WINAPI VarUI1FromR4(FLOAT fltIn, BYTE* pbOut)
 {
-    TRACE("( %f, %p ), stub\n", fltIn, pbOut );
-
-    /* Check range of value.
+        TRACE("( %f, %p ), stub\n", fltIn, pbOut );
+
+        /* Check range of value.
      */
     fltIn = round( fltIn );
-    if( fltIn < UI1_MIN || fltIn > UI1_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *pbOut = (BYTE) fltIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarUI1FromR8        [OLEAUT32.133]
+        if( fltIn < UI1_MIN || fltIn > UI1_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *pbOut = (BYTE) fltIn;
+        
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarUI1FromR8            [OLEAUT32.133]
  */
 HRESULT WINAPI VarUI1FromR8(double dblIn, BYTE* pbOut)
 {
-    TRACE("( %f, %p ), stub\n", dblIn, pbOut );
-
-    /* Check range of value.
+        TRACE("( %f, %p ), stub\n", dblIn, pbOut );
+
+        /* Check range of value.
      */
     dblIn = round( dblIn );
-    if( dblIn < UI1_MIN || dblIn > UI1_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *pbOut = (BYTE) dblIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarUI1FromDate      [OLEAUT32.135]
+        if( dblIn < UI1_MIN || dblIn > UI1_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *pbOut = (BYTE) dblIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarUI1FromDate          [OLEAUT32.135]
  */
 HRESULT WINAPI VarUI1FromDate(DATE dateIn, BYTE* pbOut)
 {
-    TRACE("( %f, %p ), stub\n", dateIn, pbOut );
-
-    /* Check range of value.
+        TRACE("( %f, %p ), stub\n", dateIn, pbOut );
+
+        /* Check range of value.
      */
     dateIn = round( dateIn );
-    if( dateIn < UI1_MIN || dateIn > UI1_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *pbOut = (BYTE) dateIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarUI1FromBool      [OLEAUT32.138]
+        if( dateIn < UI1_MIN || dateIn > UI1_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *pbOut = (BYTE) dateIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarUI1FromBool          [OLEAUT32.138]
  */
 HRESULT WINAPI VarUI1FromBool(VARIANT_BOOL boolIn, BYTE* pbOut)
 {
-    TRACE("( %d, %p ), stub\n", boolIn, pbOut );
-
-    *pbOut = (BYTE) boolIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarUI1FromI1        [OLEAUT32.237]
+        TRACE("( %d, %p ), stub\n", boolIn, pbOut );
+
+        *pbOut = (BYTE) boolIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarUI1FromI1            [OLEAUT32.237]
  */
 HRESULT WINAPI VarUI1FromI1(CHAR cIn, BYTE* pbOut)
 {
-    TRACE("( %c, %p ), stub\n", cIn, pbOut );
-
-    *pbOut = cIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarUI1FromUI2       [OLEAUT32.238]
+        TRACE("( %c, %p ), stub\n", cIn, pbOut );
+
+        *pbOut = cIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarUI1FromUI2           [OLEAUT32.238]
  */
 HRESULT WINAPI VarUI1FromUI2(USHORT uiIn, BYTE* pbOut)
 {
-    TRACE("( %d, %p ), stub\n", uiIn, pbOut );
-
-    /* Check range of value.
-     */
-    if( uiIn > UI1_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *pbOut = (BYTE) uiIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarUI1FromUI4       [OLEAUT32.239]
+        TRACE("( %d, %p ), stub\n", uiIn, pbOut );
+
+        /* Check range of value.
+         */
+        if( uiIn > UI1_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *pbOut = (BYTE) uiIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarUI1FromUI4           [OLEAUT32.239]
  */
 HRESULT WINAPI VarUI1FromUI4(ULONG ulIn, BYTE* pbOut)
 {
-    TRACE("( %ld, %p ), stub\n", ulIn, pbOut );
-
-    /* Check range of value.
-     */
-    if( ulIn > UI1_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *pbOut = (BYTE) ulIn;
-
-    return S_OK;
-}
-
-
-/******************************************************************************
- *      VarUI1FromStr       [OLEAUT32.136]
+        TRACE("( %ld, %p ), stub\n", ulIn, pbOut );
+
+        /* Check range of value.
+         */
+        if( ulIn > UI1_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *pbOut = (BYTE) ulIn;
+
+        return S_OK;
+}
+
+
+/******************************************************************************
+ *              VarUI1FromStr           [OLEAUT32.136]
  */
 HRESULT WINAPI VarUI1FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, BYTE* pbOut)
 {
-    double dValue = 0.0;
-    LPSTR pNewString = NULL;
-
-    TRACE("( %p, 0x%08lx, 0x%08lx, %p ), stub\n", strIn, lcid, dwFlags, pbOut );
-
-    /* Check if we have a valid argument
-     */
-    pNewString = HEAP_strdupWtoA( GetProcessHeap(), 0, strIn );
-    RemoveCharacterFromString( pNewString, "," );
-    if( IsValidRealString( pNewString ) == FALSE )
-    {
-        return DISP_E_TYPEMISMATCH;
-    }
-
-    /* Convert the valid string to a floating point number.
-     */
-    dValue = atof( pNewString );
-
-    /* We don't need the string anymore so free it.
-     */
-    HeapFree( GetProcessHeap(), 0 , pNewString );
-
-    /* Check range of value.
+        double dValue = 0.0;
+        LPSTR pNewString = NULL;
+
+        TRACE("( %p, 0x%08lx, 0x%08lx, %p ), stub\n", strIn, lcid, dwFlags, pbOut );
+
+        /* Check if we have a valid argument
+         */
+        pNewString = HEAP_strdupWtoA( GetProcessHeap(), 0, strIn );
+        RemoveCharacterFromString( pNewString, "," );
+        if( IsValidRealString( pNewString ) == FALSE )
+        {
+                return DISP_E_TYPEMISMATCH;
+        }
+
+        /* Convert the valid string to a floating point number.
+         */
+        dValue = atof( pNewString );
+        
+        /* We don't need the string anymore so free it.
+         */
+        HeapFree( GetProcessHeap(), 0 , pNewString );
+
+        /* Check range of value.
      */
     dValue = round( dValue );
-    if( dValue < UI1_MIN || dValue > UI1_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *pbOut = (BYTE) dValue;
-
-    return S_OK;
+        if( dValue < UI1_MIN || dValue > UI1_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *pbOut = (BYTE) dValue;
+
+        return S_OK;
 }
 
@@ -2262 +2262 @@
 HRESULT WINAPI VarUI1FromCy(CY cyIn, BYTE* pbOut) {
    double t = round((((double)cyIn.s.Hi * 4294967296.0) + (double)cyIn.s.Lo) / 10000);
-
+   
    if (t > UI1_MAX || t < UI1_MIN) return DISP_E_OVERFLOW;
-
+   
    *pbOut = (BYTE)t;
    return S_OK;
@@ -2270 +2270 @@
 
 /******************************************************************************
- *      VarI2FromUI1        [OLEAUT32.48]
+ *              VarI2FromUI1            [OLEAUT32.48]
  */
 HRESULT WINAPI VarI2FromUI1(BYTE bIn, short* psOut)
 {
-    TRACE("( 0x%08x, %p ), stub\n", bIn, psOut );
-
-    *psOut = (short) bIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarI2FromI4     [OLEAUT32.49]
+        TRACE("( 0x%08x, %p ), stub\n", bIn, psOut );
+
+        *psOut = (short) bIn;
+        
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarI2FromI4             [OLEAUT32.49]
  */
 HRESULT WINAPI VarI2FromI4(LONG lIn, short* psOut)
 {
-    TRACE("( %lx, %p ), stub\n", lIn, psOut );
-
-    /* Check range of value.
-     */
-    if( lIn < I2_MIN || lIn > I2_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *psOut = (short) lIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarI2FromR4     [OLEAUT32.50]
+        TRACE("( %lx, %p ), stub\n", lIn, psOut );
+
+        /* Check range of value.
+         */
+        if( lIn < I2_MIN || lIn > I2_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *psOut = (short) lIn;
+        
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarI2FromR4             [OLEAUT32.50]
  */
 HRESULT WINAPI VarI2FromR4(FLOAT fltIn, short* psOut)
 {
-    TRACE("( %f, %p ), stub\n", fltIn, psOut );
-
-    /* Check range of value.
+        TRACE("( %f, %p ), stub\n", fltIn, psOut );
+
+        /* Check range of value.
      */
     fltIn = round( fltIn );
-    if( fltIn < I2_MIN || fltIn > I2_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *psOut = (short) fltIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarI2FromR8     [OLEAUT32.51]
+        if( fltIn < I2_MIN || fltIn > I2_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *psOut = (short) fltIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarI2FromR8             [OLEAUT32.51]
  */
 HRESULT WINAPI VarI2FromR8(double dblIn, short* psOut)
 {
-    TRACE("( %f, %p ), stub\n", dblIn, psOut );
-
-    /* Check range of value.
+        TRACE("( %f, %p ), stub\n", dblIn, psOut );
+
+        /* Check range of value.
      */
     dblIn = round( dblIn );
-    if( dblIn < I2_MIN || dblIn > I2_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *psOut = (short) dblIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarI2FromDate       [OLEAUT32.53]
+        if( dblIn < I2_MIN || dblIn > I2_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *psOut = (short) dblIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarI2FromDate           [OLEAUT32.53]
  */
 HRESULT WINAPI VarI2FromDate(DATE dateIn, short* psOut)
 {
-    TRACE("( %f, %p ), stub\n", dateIn, psOut );
-
-    /* Check range of value.
+        TRACE("( %f, %p ), stub\n", dateIn, psOut );
+
+        /* Check range of value.
      */
     dateIn = round( dateIn );
-    if( dateIn < I2_MIN || dateIn > I2_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *psOut = (short) dateIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarI2FromBool       [OLEAUT32.56]
+        if( dateIn < I2_MIN || dateIn > I2_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *psOut = (short) dateIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarI2FromBool           [OLEAUT32.56]
  */
 HRESULT WINAPI VarI2FromBool(VARIANT_BOOL boolIn, short* psOut)
 {
-    TRACE("( %d, %p ), stub\n", boolIn, psOut );
-
-    *psOut = (short) boolIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarI2FromI1     [OLEAUT32.205]
+        TRACE("( %d, %p ), stub\n", boolIn, psOut );
+
+        *psOut = (short) boolIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarI2FromI1             [OLEAUT32.205]
  */
 HRESULT WINAPI VarI2FromI1(CHAR cIn, short* psOut)
 {
-    TRACE("( %c, %p ), stub\n", cIn, psOut );
-
-    *psOut = (short) cIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarI2FromUI2        [OLEAUT32.206]
+        TRACE("( %c, %p ), stub\n", cIn, psOut );
+
+        *psOut = (short) cIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarI2FromUI2            [OLEAUT32.206]
  */
 HRESULT WINAPI VarI2FromUI2(USHORT uiIn, short* psOut)
 {
-    TRACE("( %d, %p ), stub\n", uiIn, psOut );
-
-    /* Check range of value.
-     */
-    if( uiIn > I2_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *psOut = (short) uiIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarI2FromUI4        [OLEAUT32.207]
+        TRACE("( %d, %p ), stub\n", uiIn, psOut );
+
+        /* Check range of value.
+         */
+        if( uiIn > I2_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *psOut = (short) uiIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarI2FromUI4            [OLEAUT32.207]
  */
 HRESULT WINAPI VarI2FromUI4(ULONG ulIn, short* psOut)
 {
-    TRACE("( %lx, %p ), stub\n", ulIn, psOut );
-
-    /* Check range of value.
-     */
-    if( ulIn < I2_MIN || ulIn > I2_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *psOut = (short) ulIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarI2FromStr        [OLEAUT32.54]
+        TRACE("( %lx, %p ), stub\n", ulIn, psOut );
+
+        /* Check range of value.
+         */
+        if( ulIn < I2_MIN || ulIn > I2_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *psOut = (short) ulIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarI2FromStr            [OLEAUT32.54]
  */
 HRESULT WINAPI VarI2FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, short* psOut)
 {
-    double dValue = 0.0;
-    LPSTR pNewString = NULL;
-
-    TRACE("( %p, 0x%08lx, 0x%08lx, %p ), stub\n", strIn, lcid, dwFlags, psOut );
-
-    /* Check if we have a valid argument
-     */
-    pNewString = HEAP_strdupWtoA( GetProcessHeap(), 0, strIn );
-    RemoveCharacterFromString( pNewString, "," );
-    if( IsValidRealString( pNewString ) == FALSE )
-    {
-        return DISP_E_TYPEMISMATCH;
-    }
-
-    /* Convert the valid string to a floating point number.
-     */
-    dValue = atof( pNewString );
-
-    /* We don't need the string anymore so free it.
-     */
-    HeapFree( GetProcessHeap(), 0, pNewString );
-
-    /* Check range of value.
+        double dValue = 0.0;
+        LPSTR pNewString = NULL;
+
+        TRACE("( %p, 0x%08lx, 0x%08lx, %p ), stub\n", strIn, lcid, dwFlags, psOut );
+
+        /* Check if we have a valid argument
+         */
+        pNewString = HEAP_strdupWtoA( GetProcessHeap(), 0, strIn );
+        RemoveCharacterFromString( pNewString, "," );
+        if( IsValidRealString( pNewString ) == FALSE )
+        {
+                return DISP_E_TYPEMISMATCH;
+        }
+
+        /* Convert the valid string to a floating point number.
+         */
+        dValue = atof( pNewString );
+        
+        /* We don't need the string anymore so free it.
+         */
+        HeapFree( GetProcessHeap(), 0, pNewString );
+
+        /* Check range of value.
      */
     dValue = round( dValue );
-    if( dValue < I2_MIN || dValue > I2_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *psOut = (short)  dValue;
-
-    return S_OK;
+        if( dValue < I2_MIN || dValue > I2_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *psOut = (short)  dValue;
+
+        return S_OK;
 }
 
@@ -2468 +2468 @@
 HRESULT WINAPI VarI2FromCy(CY cyIn, short* psOut) {
    double t = round((((double)cyIn.s.Hi * 4294967296.0) + (double)cyIn.s.Lo) / 10000);
-
+   
    if (t > I2_MAX || t < I2_MIN) return DISP_E_OVERFLOW;
-
+   
    *psOut = (SHORT)t;
    return S_OK;
@@ -2476 +2476 @@
 
 /******************************************************************************
- *      VarI4FromUI1        [OLEAUT32.58]
+ *              VarI4FromUI1            [OLEAUT32.58]
  */
 HRESULT WINAPI VarI4FromUI1(BYTE bIn, LONG* plOut)
 {
-    TRACE("( %X, %p ), stub\n", bIn, plOut );
-
-    *plOut = (LONG) bIn;
-
-    return S_OK;
-}
-
-
-/******************************************************************************
- *      VarI4FromR4     [OLEAUT32.60]
+        TRACE("( %X, %p ), stub\n", bIn, plOut );
+
+        *plOut = (LONG) bIn;
+
+        return S_OK;
+}
+
+
+/******************************************************************************
+ *              VarI4FromR4             [OLEAUT32.60]
  */
 HRESULT WINAPI VarI4FromR4(FLOAT fltIn, LONG* plOut)
 {
-    TRACE("( %f, %p ), stub\n", fltIn, plOut );
-
-    /* Check range of value.
+        TRACE("( %f, %p ), stub\n", fltIn, plOut );
+
+        /* Check range of value.
      */
     fltIn = round( fltIn );
-    if( fltIn < I4_MIN || fltIn > I4_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *plOut = (LONG) fltIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarI4FromR8     [OLEAUT32.61]
+        if( fltIn < I4_MIN || fltIn > I4_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *plOut = (LONG) fltIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarI4FromR8             [OLEAUT32.61]
  */
 HRESULT WINAPI VarI4FromR8(double dblIn, LONG* plOut)
 {
-    TRACE("( %f, %p ), stub\n", dblIn, plOut );
-
-    /* Check range of value.
+        TRACE("( %f, %p ), stub\n", dblIn, plOut );
+
+        /* Check range of value.
      */
     dblIn = round( dblIn );
-    if( dblIn < I4_MIN || dblIn > I4_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *plOut = (LONG) dblIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarI4FromDate       [OLEAUT32.63]
+        if( dblIn < I4_MIN || dblIn > I4_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *plOut = (LONG) dblIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarI4FromDate           [OLEAUT32.63]
  */
 HRESULT WINAPI VarI4FromDate(DATE dateIn, LONG* plOut)
 {
-    TRACE("( %f, %p ), stub\n", dateIn, plOut );
-
-    /* Check range of value.
+        TRACE("( %f, %p ), stub\n", dateIn, plOut );
+
+        /* Check range of value.
      */
     dateIn = round( dateIn );
-    if( dateIn < I4_MIN || dateIn > I4_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *plOut = (LONG) dateIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarI4FromBool       [OLEAUT32.66]
+        if( dateIn < I4_MIN || dateIn > I4_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *plOut = (LONG) dateIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarI4FromBool           [OLEAUT32.66]
  */
 HRESULT WINAPI VarI4FromBool(VARIANT_BOOL boolIn, LONG* plOut)
 {
-    TRACE("( %d, %p ), stub\n", boolIn, plOut );
-
-    *plOut = (LONG) boolIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarI4FromI1     [OLEAUT32.209]
+        TRACE("( %d, %p ), stub\n", boolIn, plOut );
+
+        *plOut = (LONG) boolIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarI4FromI1             [OLEAUT32.209]
  */
 HRESULT WINAPI VarI4FromI1(CHAR cIn, LONG* plOut)
 {
-    TRACE("( %c, %p ), stub\n", cIn, plOut );
-
-    *plOut = (LONG) cIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarI4FromUI2        [OLEAUT32.210]
+        TRACE("( %c, %p ), stub\n", cIn, plOut );
+
+        *plOut = (LONG) cIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarI4FromUI2            [OLEAUT32.210]
  */
 HRESULT WINAPI VarI4FromUI2(USHORT uiIn, LONG* plOut)
 {
-    TRACE("( %d, %p ), stub\n", uiIn, plOut );
-
-    *plOut = (LONG) uiIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarI4FromUI4        [OLEAUT32.211]
+        TRACE("( %d, %p ), stub\n", uiIn, plOut );
+
+        *plOut = (LONG) uiIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarI4FromUI4            [OLEAUT32.211]
  */
 HRESULT WINAPI VarI4FromUI4(ULONG ulIn, LONG* plOut)
 {
-    TRACE("( %lx, %p ), stub\n", ulIn, plOut );
-
-    /* Check range of value.
-     */
-    if( ulIn < I4_MIN || ulIn > I4_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *plOut = (LONG) ulIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarI4FromI2     [OLEAUT32.59]
+        TRACE("( %lx, %p ), stub\n", ulIn, plOut );
+
+        /* Check range of value.
+         */
+        if( ulIn < I4_MIN || ulIn > I4_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *plOut = (LONG) ulIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarI4FromI2             [OLEAUT32.59]
  */
 HRESULT WINAPI VarI4FromI2(short sIn, LONG* plOut)
 {
-    TRACE("( %d, %p ), stub\n", sIn, plOut );
-
-    *plOut = (LONG) sIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarI4FromStr        [OLEAUT32.64]
+        TRACE("( %d, %p ), stub\n", sIn, plOut );
+
+        *plOut = (LONG) sIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarI4FromStr            [OLEAUT32.64]
  */
 HRESULT WINAPI VarI4FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, LONG* plOut)
 {
-    double dValue = 0.0;
-    LPSTR pNewString = NULL;
-
-    TRACE("( %p, 0x%08lx, 0x%08lx, %p ), stub\n", strIn, lcid, dwFlags, plOut );
-
-    /* Check if we have a valid argument
-     */
-    pNewString = HEAP_strdupWtoA( GetProcessHeap(), 0, strIn );
-    RemoveCharacterFromString( pNewString, "," );
-    if( IsValidRealString( pNewString ) == FALSE )
-    {
-        return DISP_E_TYPEMISMATCH;
-    }
-
-    /* Convert the valid string to a floating point number.
-     */
-    dValue = atof( pNewString );
-
-    /* We don't need the string anymore so free it.
-     */
-    HeapFree( GetProcessHeap(), 0, pNewString );
-
-    /* Check range of value.
+        double dValue = 0.0;
+        LPSTR pNewString = NULL;
+
+        TRACE("( %p, 0x%08lx, 0x%08lx, %p ), stub\n", strIn, lcid, dwFlags, plOut );
+
+        /* Check if we have a valid argument
+         */
+        pNewString = HEAP_strdupWtoA( GetProcessHeap(), 0, strIn );
+        RemoveCharacterFromString( pNewString, "," );
+        if( IsValidRealString( pNewString ) == FALSE )
+        {
+                return DISP_E_TYPEMISMATCH;
+        }
+
+        /* Convert the valid string to a floating point number.
+         */
+        dValue = atof( pNewString );
+        
+        /* We don't need the string anymore so free it.
+         */
+        HeapFree( GetProcessHeap(), 0, pNewString );
+
+        /* Check range of value.
      */
     dValue = round( dValue );
-    if( dValue < I4_MIN || dValue > I4_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *plOut = (LONG) dValue;
-
-    return S_OK;
+        if( dValue < I4_MIN || dValue > I4_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *plOut = (LONG) dValue;
+
+        return S_OK;
 }
 
@@ -2661 +2661 @@
 HRESULT WINAPI VarI4FromCy(CY cyIn, LONG* plOut) {
    double t = round((((double)cyIn.s.Hi * 4294967296.0) + (double)cyIn.s.Lo) / 10000);
-
+   
    if (t > I4_MAX || t < I4_MIN) return DISP_E_OVERFLOW;
-
+   
    *plOut = (LONG)t;
    return S_OK;
@@ -2669 +2669 @@
 
 /******************************************************************************
- *      VarR4FromUI1        [OLEAUT32.68]
+ *              VarR4FromUI1            [OLEAUT32.68]
  */
 HRESULT WINAPI VarR4FromUI1(BYTE bIn, FLOAT* pfltOut)
 {
-    TRACE("( %X, %p ), stub\n", bIn, pfltOut );
-
-    *pfltOut = (FLOAT) bIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarR4FromI2     [OLEAUT32.69]
+        TRACE("( %X, %p ), stub\n", bIn, pfltOut );
+
+        *pfltOut = (FLOAT) bIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarR4FromI2             [OLEAUT32.69]
  */
 HRESULT WINAPI VarR4FromI2(short sIn, FLOAT* pfltOut)
 {
-    TRACE("( %d, %p ), stub\n", sIn, pfltOut );
-
-    *pfltOut = (FLOAT) sIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarR4FromI4     [OLEAUT32.70]
+        TRACE("( %d, %p ), stub\n", sIn, pfltOut );
+
+        *pfltOut = (FLOAT) sIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarR4FromI4             [OLEAUT32.70]
  */
 HRESULT WINAPI VarR4FromI4(LONG lIn, FLOAT* pfltOut)
 {
-    TRACE("( %lx, %p ), stub\n", lIn, pfltOut );
-
-    *pfltOut = (FLOAT) lIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarR4FromR8     [OLEAUT32.71]
+        TRACE("( %lx, %p ), stub\n", lIn, pfltOut );
+
+        *pfltOut = (FLOAT) lIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarR4FromR8             [OLEAUT32.71]
  */
 HRESULT WINAPI VarR4FromR8(double dblIn, FLOAT* pfltOut)
 {
-    TRACE("( %f, %p ), stub\n", dblIn, pfltOut );
-
-    /* Check range of value.
-     */
-    if( dblIn < -(FLT_MAX) || dblIn > FLT_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *pfltOut = (FLOAT) dblIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarR4FromDate       [OLEAUT32.73]
+        TRACE("( %f, %p ), stub\n", dblIn, pfltOut );
+
+        /* Check range of value.
+         */
+        if( dblIn < -(FLT_MAX) || dblIn > FLT_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *pfltOut = (FLOAT) dblIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarR4FromDate           [OLEAUT32.73]
  */
 HRESULT WINAPI VarR4FromDate(DATE dateIn, FLOAT* pfltOut)
 {
-    TRACE("( %f, %p ), stub\n", dateIn, pfltOut );
-
-    /* Check range of value.
-     */
-    if( dateIn < -(FLT_MAX) || dateIn > FLT_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *pfltOut = (FLOAT) dateIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarR4FromBool       [OLEAUT32.76]
+        TRACE("( %f, %p ), stub\n", dateIn, pfltOut );
+
+        /* Check range of value.
+         */
+        if( dateIn < -(FLT_MAX) || dateIn > FLT_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *pfltOut = (FLOAT) dateIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarR4FromBool           [OLEAUT32.76]
  */
 HRESULT WINAPI VarR4FromBool(VARIANT_BOOL boolIn, FLOAT* pfltOut)
 {
-    TRACE("( %d, %p ), stub\n", boolIn, pfltOut );
-
-    *pfltOut = (FLOAT) boolIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarR4FromI1     [OLEAUT32.213]
+        TRACE("( %d, %p ), stub\n", boolIn, pfltOut );
+
+        *pfltOut = (FLOAT) boolIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarR4FromI1             [OLEAUT32.213]
  */
 HRESULT WINAPI VarR4FromI1(CHAR cIn, FLOAT* pfltOut)
 {
-    TRACE("( %c, %p ), stub\n", cIn, pfltOut );
-
-    *pfltOut = (FLOAT) cIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarR4FromUI2        [OLEAUT32.214]
+        TRACE("( %c, %p ), stub\n", cIn, pfltOut );
+
+        *pfltOut = (FLOAT) cIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarR4FromUI2            [OLEAUT32.214]
  */
 HRESULT WINAPI VarR4FromUI2(USHORT uiIn, FLOAT* pfltOut)
 {
-    TRACE("( %d, %p ), stub\n", uiIn, pfltOut );
-
-    *pfltOut = (FLOAT) uiIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarR4FromUI4        [OLEAUT32.215]
+        TRACE("( %d, %p ), stub\n", uiIn, pfltOut );
+
+        *pfltOut = (FLOAT) uiIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarR4FromUI4            [OLEAUT32.215]
  */
 HRESULT WINAPI VarR4FromUI4(ULONG ulIn, FLOAT* pfltOut)
 {
-    TRACE("( %ld, %p ), stub\n", ulIn, pfltOut );
-
-    *pfltOut = (FLOAT) ulIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarR4FromStr        [OLEAUT32.74]
+        TRACE("( %ld, %p ), stub\n", ulIn, pfltOut );
+
+        *pfltOut = (FLOAT) ulIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarR4FromStr            [OLEAUT32.74]
  */
 HRESULT WINAPI VarR4FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, FLOAT* pfltOut)
 {
-    double dValue = 0.0;
-    LPSTR pNewString = NULL;
-
-    TRACE("( %p, %ld, %ld, %p ), stub\n", strIn, lcid, dwFlags, pfltOut );
-
-    /* Check if we have a valid argument
-     */
-    pNewString = HEAP_strdupWtoA( GetProcessHeap(), 0, strIn );
-    RemoveCharacterFromString( pNewString, "," );
-    if( IsValidRealString( pNewString ) == FALSE )
-    {
-        return DISP_E_TYPEMISMATCH;
-    }
-
-    /* Convert the valid string to a floating point number.
-     */
-    dValue = atof( pNewString );
-
-    /* We don't need the string anymore so free it.
-     */
-    HeapFree( GetProcessHeap(), 0, pNewString );
-
-    /* Check range of value.
-     */
-    if( dValue < -(FLT_MAX) || dValue > FLT_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *pfltOut = (FLOAT) dValue;
-
-    return S_OK;
+        double dValue = 0.0;
+        LPSTR pNewString = NULL;
+
+        TRACE("( %p, %ld, %ld, %p ), stub\n", strIn, lcid, dwFlags, pfltOut );
+
+        /* Check if we have a valid argument
+         */
+        pNewString = HEAP_strdupWtoA( GetProcessHeap(), 0, strIn );
+        RemoveCharacterFromString( pNewString, "," );
+        if( IsValidRealString( pNewString ) == FALSE )
+        {
+                return DISP_E_TYPEMISMATCH;
+        }
+
+        /* Convert the valid string to a floating point number.
+         */
+        dValue = atof( pNewString );
+        
+        /* We don't need the string anymore so free it.
+         */
+        HeapFree( GetProcessHeap(), 0, pNewString );
+
+        /* Check range of value.
+         */
+        if( dValue < -(FLT_MAX) || dValue > FLT_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *pfltOut = (FLOAT) dValue;
+
+        return S_OK;
 }
 
@@ -2835 +2835 @@
 HRESULT WINAPI VarR4FromCy(CY cyIn, FLOAT* pfltOut) {
    *pfltOut = (FLOAT)((((double)cyIn.s.Hi * 4294967296.0) + (double)cyIn.s.Lo) / 10000);
-
+   
    return S_OK;
 }
 
 /******************************************************************************
- *      VarR8FromUI1        [OLEAUT32.78]
+ *              VarR8FromUI1            [OLEAUT32.78]
  */
 HRESULT WINAPI VarR8FromUI1(BYTE bIn, double* pdblOut)
 {
-    TRACE("( %d, %p ), stub\n", bIn, pdblOut );
-
-    *pdblOut = (double) bIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarR8FromI2     [OLEAUT32.79]
+        TRACE("( %d, %p ), stub\n", bIn, pdblOut );
+
+        *pdblOut = (double) bIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarR8FromI2             [OLEAUT32.79]
  */
 HRESULT WINAPI VarR8FromI2(short sIn, double* pdblOut)
 {
-    TRACE("( %d, %p ), stub\n", sIn, pdblOut );
-
-    *pdblOut = (double) sIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarR8FromI4     [OLEAUT32.80]
+        TRACE("( %d, %p ), stub\n", sIn, pdblOut );
+
+        *pdblOut = (double) sIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarR8FromI4             [OLEAUT32.80]
  */
 HRESULT WINAPI VarR8FromI4(LONG lIn, double* pdblOut)
 {
-    TRACE("( %ld, %p ), stub\n", lIn, pdblOut );
-
-    *pdblOut = (double) lIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarR8FromR4     [OLEAUT32.81]
+        TRACE("( %ld, %p ), stub\n", lIn, pdblOut );
+
+        *pdblOut = (double) lIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarR8FromR4             [OLEAUT32.81]
  */
 HRESULT WINAPI VarR8FromR4(FLOAT fltIn, double* pdblOut)
 {
-    TRACE("( %f, %p ), stub\n", fltIn, pdblOut );
-
-    *pdblOut = (double) fltIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarR8FromDate       [OLEAUT32.83]
+        TRACE("( %f, %p ), stub\n", fltIn, pdblOut );
+
+        *pdblOut = (double) fltIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarR8FromDate           [OLEAUT32.83]
  */
 HRESULT WINAPI VarR8FromDate(DATE dateIn, double* pdblOut)
 {
-    TRACE("( %f, %p ), stub\n", dateIn, pdblOut );
-
-    *pdblOut = (double) dateIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarR8FromBool       [OLEAUT32.86]
+        TRACE("( %f, %p ), stub\n", dateIn, pdblOut );
+
+        *pdblOut = (double) dateIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarR8FromBool           [OLEAUT32.86]
  */
 HRESULT WINAPI VarR8FromBool(VARIANT_BOOL boolIn, double* pdblOut)
 {
-    TRACE("( %d, %p ), stub\n", boolIn, pdblOut );
-
-    *pdblOut = (double) boolIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarR8FromI1     [OLEAUT32.217]
+        TRACE("( %d, %p ), stub\n", boolIn, pdblOut );
+
+        *pdblOut = (double) boolIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarR8FromI1             [OLEAUT32.217]
  */
 HRESULT WINAPI VarR8FromI1(CHAR cIn, double* pdblOut)
 {
-    TRACE("( %c, %p ), stub\n", cIn, pdblOut );
-
-    *pdblOut = (double) cIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarR8FromUI2        [OLEAUT32.218]
+        TRACE("( %c, %p ), stub\n", cIn, pdblOut );
+
+        *pdblOut = (double) cIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarR8FromUI2            [OLEAUT32.218]
  */
 HRESULT WINAPI VarR8FromUI2(USHORT uiIn, double* pdblOut)
 {
-    TRACE("( %d, %p ), stub\n", uiIn, pdblOut );
-
-    *pdblOut = (double) uiIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarR8FromUI4        [OLEAUT32.219]
+        TRACE("( %d, %p ), stub\n", uiIn, pdblOut );
+
+        *pdblOut = (double) uiIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarR8FromUI4            [OLEAUT32.219]
  */
 HRESULT WINAPI VarR8FromUI4(ULONG ulIn, double* pdblOut)
 {
-    TRACE("( %ld, %p ), stub\n", ulIn, pdblOut );
-
-    *pdblOut = (double) ulIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarR8FromStr        [OLEAUT32.84]
+        TRACE("( %ld, %p ), stub\n", ulIn, pdblOut );
+
+        *pdblOut = (double) ulIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarR8FromStr            [OLEAUT32.84]
  */
 HRESULT WINAPI VarR8FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, double* pdblOut)
 {
-    double dValue = 0.0;
-    LPSTR pNewString = NULL;
-
-    TRACE("( %p, %ld, %ld, %p ), stub\n", strIn, lcid, dwFlags, pdblOut );
-
-    /* Check if we have a valid argument
-     */
-    pNewString = HEAP_strdupWtoA( GetProcessHeap(), 0, strIn );
-    RemoveCharacterFromString( pNewString, "," );
-    if( IsValidRealString( pNewString ) == FALSE )
-    {
-        return DISP_E_TYPEMISMATCH;
-    }
-
-    /* Convert the valid string to a floating point number.
-     */
-    dValue = atof( pNewString );
-
-    /* We don't need the string anymore so free it.
-     */
-    HeapFree( GetProcessHeap(), 0, pNewString );
-
-    *pdblOut = dValue;
-
-    return S_OK;
+        double dValue = 0.0;
+        LPSTR pNewString = NULL;
+
+        TRACE("( %p, %ld, %ld, %p ), stub\n", strIn, lcid, dwFlags, pdblOut );
+
+        /* Check if we have a valid argument
+         */
+        pNewString = HEAP_strdupWtoA( GetProcessHeap(), 0, strIn );
+        RemoveCharacterFromString( pNewString, "," );
+        if( IsValidRealString( pNewString ) == FALSE )
+        {
+                return DISP_E_TYPEMISMATCH;
+        }
+
+        /* Convert the valid string to a floating point number.
+         */
+        dValue = atof( pNewString );
+        
+        /* We don't need the string anymore so free it.
+         */
+        HeapFree( GetProcessHeap(), 0, pNewString );
+
+        *pdblOut = dValue;
+
+        return S_OK;
 }
 
@@ -2985 +2985 @@
 HRESULT WINAPI VarR8FromCy(CY cyIn, double* pdblOut) {
    *pdblOut = (double)((((double)cyIn.s.Hi * 4294967296.0) + (double)cyIn.s.Lo) / 10000);
-
+   
    return S_OK;
 }
 
 /******************************************************************************
- *      VarDateFromUI1      [OLEAUT32.88]
+ *              VarDateFromUI1          [OLEAUT32.88]
  */
 HRESULT WINAPI VarDateFromUI1(BYTE bIn, DATE* pdateOut)
 {
-    TRACE("( %d, %p ), stub\n", bIn, pdateOut );
-
-    *pdateOut = (DATE) bIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarDateFromI2       [OLEAUT32.89]
+        TRACE("( %d, %p ), stub\n", bIn, pdateOut );
+
+        *pdateOut = (DATE) bIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarDateFromI2           [OLEAUT32.89]
  */
 HRESULT WINAPI VarDateFromI2(short sIn, DATE* pdateOut)
 {
-    TRACE("( %d, %p ), stub\n", sIn, pdateOut );
-
-    *pdateOut = (DATE) sIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarDateFromI4       [OLEAUT32.90]
+        TRACE("( %d, %p ), stub\n", sIn, pdateOut );
+
+        *pdateOut = (DATE) sIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarDateFromI4           [OLEAUT32.90]
  */
 HRESULT WINAPI VarDateFromI4(LONG lIn, DATE* pdateOut)
 {
-    TRACE("( %ld, %p ), stub\n", lIn, pdateOut );
-
-    if( lIn < DATE_MIN || lIn > DATE_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *pdateOut = (DATE) lIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarDateFromR4       [OLEAUT32.91]
+        TRACE("( %ld, %p ), stub\n", lIn, pdateOut );
+
+        if( lIn < DATE_MIN || lIn > DATE_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *pdateOut = (DATE) lIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarDateFromR4           [OLEAUT32.91]
  */
 HRESULT WINAPI VarDateFromR4(FLOAT fltIn, DATE* pdateOut)
@@ -3038 +3038 @@
 
     if( ceil(fltIn) < DATE_MIN || floor(fltIn) > DATE_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *pdateOut = (DATE) fltIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarDateFromR8       [OLEAUT32.92]
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *pdateOut = (DATE) fltIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarDateFromR8           [OLEAUT32.92]
  */
 HRESULT WINAPI VarDateFromR8(double dblIn, DATE* pdateOut)
@@ -3054 +3054 @@
     TRACE("( %f, %p ), stub\n", dblIn, pdateOut );
 
-    if( ceil(dblIn) < DATE_MIN || floor(dblIn) > DATE_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *pdateOut = (DATE) dblIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarDateFromStr      [OLEAUT32.94]
+        if( ceil(dblIn) < DATE_MIN || floor(dblIn) > DATE_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *pdateOut = (DATE) dblIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarDateFromStr          [OLEAUT32.94]
  * The string representing the date is composed of two parts, a date and time.
  *
@@ -3074 +3074 @@
  *
  * The formats for the date part are has follows:
- * mm/[dd/][yy]yy
+ * mm/[dd/][yy]yy 
  * [dd/]mm/[yy]yy
- * [yy]yy/mm/dd
+ * [yy]yy/mm/dd 
  * January dd[,] [yy]yy
  * dd January [yy]yy
@@ -3083 +3083 @@
  *
  * The formats for the date and time string are has follows.
- * date[whitespace][time]
+ * date[whitespace][time] 
  * [time][whitespace]date
  *
@@ -3111 +3111 @@
 
 
-    return ret;
-}
-
-/******************************************************************************
- *      VarDateFromI1       [OLEAUT32.221]
+        return ret;
+}
+
+/******************************************************************************
+ *              VarDateFromI1           [OLEAUT32.221]
  */
 HRESULT WINAPI VarDateFromI1(CHAR cIn, DATE* pdateOut)
 {
-    TRACE("( %c, %p ), stub\n", cIn, pdateOut );
-
-    *pdateOut = (DATE) cIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarDateFromUI2      [OLEAUT32.222]
+        TRACE("( %c, %p ), stub\n", cIn, pdateOut );
+
+        *pdateOut = (DATE) cIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarDateFromUI2          [OLEAUT32.222]
  */
 HRESULT WINAPI VarDateFromUI2(USHORT uiIn, DATE* pdateOut)
 {
-    TRACE("( %d, %p ), stub\n", uiIn, pdateOut );
-
-    if( uiIn > DATE_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *pdateOut = (DATE) uiIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarDateFromUI4      [OLEAUT32.223]
+        TRACE("( %d, %p ), stub\n", uiIn, pdateOut );
+
+        if( uiIn > DATE_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *pdateOut = (DATE) uiIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarDateFromUI4          [OLEAUT32.223]
  */
 HRESULT WINAPI VarDateFromUI4(ULONG ulIn, DATE* pdateOut)
 {
-    TRACE("( %ld, %p ), stub\n", ulIn, pdateOut );
-
-    if( ulIn < DATE_MIN || ulIn > DATE_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *pdateOut = (DATE) ulIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarDateFromBool     [OLEAUT32.96]
+        TRACE("( %ld, %p ), stub\n", ulIn, pdateOut );
+
+        if( ulIn < DATE_MIN || ulIn > DATE_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *pdateOut = (DATE) ulIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarDateFromBool         [OLEAUT32.96]
  */
 HRESULT WINAPI VarDateFromBool(VARIANT_BOOL boolIn, DATE* pdateOut)
 {
-    TRACE("( %d, %p ), stub\n", boolIn, pdateOut );
-
-    *pdateOut = (DATE) boolIn;
-
-    return S_OK;
+        TRACE("( %d, %p ), stub\n", boolIn, pdateOut );
+
+        *pdateOut = (DATE) boolIn;
+
+        return S_OK;
 }
 
@@ -3184 +3184 @@
 
 /******************************************************************************
- *      VarBstrFromUI1      [OLEAUT32.108]
+ *              VarBstrFromUI1          [OLEAUT32.108]
  */
 HRESULT WINAPI VarBstrFromUI1(BYTE bVal, LCID lcid, ULONG dwFlags, BSTR* pbstrOut)
 {
-    TRACE("( %d, %ld, %ld, %p ), stub\n", bVal, lcid, dwFlags, pbstrOut );
-    sprintf( pBuffer, "%d", bVal );
-
-    *pbstrOut =  StringDupAtoBstr( pBuffer );
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarBstrFromI2       [OLEAUT32.109]
+        TRACE("( %d, %ld, %ld, %p ), stub\n", bVal, lcid, dwFlags, pbstrOut );
+        sprintf( pBuffer, "%d", bVal );
+
+        *pbstrOut =  StringDupAtoBstr( pBuffer );
+        
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarBstrFromI2           [OLEAUT32.109]
  */
 HRESULT WINAPI VarBstrFromI2(short iVal, LCID lcid, ULONG dwFlags, BSTR* pbstrOut)
 {
-    TRACE("( %d, %ld, %ld, %p ), stub\n", iVal, lcid, dwFlags, pbstrOut );
-    sprintf( pBuffer, "%d", iVal );
-    *pbstrOut = StringDupAtoBstr( pBuffer );
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarBstrFromI4       [OLEAUT32.110]
+        TRACE("( %d, %ld, %ld, %p ), stub\n", iVal, lcid, dwFlags, pbstrOut );
+        sprintf( pBuffer, "%d", iVal );
+        *pbstrOut = StringDupAtoBstr( pBuffer );
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarBstrFromI4           [OLEAUT32.110]
  */
 HRESULT WINAPI VarBstrFromI4(LONG lIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut)
 {
-    TRACE("( %ld, %ld, %ld, %p ), stub\n", lIn, lcid, dwFlags, pbstrOut );
-
-    sprintf( pBuffer, "%ld", lIn );
-    *pbstrOut = StringDupAtoBstr( pBuffer );
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarBstrFromR4       [OLEAUT32.111]
+        TRACE("( %ld, %ld, %ld, %p ), stub\n", lIn, lcid, dwFlags, pbstrOut );
+
+        sprintf( pBuffer, "%ld", lIn );
+        *pbstrOut = StringDupAtoBstr( pBuffer );
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarBstrFromR4           [OLEAUT32.111]
  */
 HRESULT WINAPI VarBstrFromR4(FLOAT fltIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut)
 {
-    TRACE("( %f, %ld, %ld, %p ), stub\n", fltIn, lcid, dwFlags, pbstrOut );
-
-    sprintf( pBuffer, "%.7g", fltIn );
-    *pbstrOut = StringDupAtoBstr( pBuffer );
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarBstrFromR8       [OLEAUT32.112]
+        TRACE("( %f, %ld, %ld, %p ), stub\n", fltIn, lcid, dwFlags, pbstrOut );
+
+        sprintf( pBuffer, "%.7g", fltIn );
+        *pbstrOut = StringDupAtoBstr( pBuffer );
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarBstrFromR8           [OLEAUT32.112]
  */
 HRESULT WINAPI VarBstrFromR8(double dblIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut)
 {
-    TRACE("( %f, %ld, %ld, %p ), stub\n", dblIn, lcid, dwFlags, pbstrOut );
-
-    sprintf( pBuffer, "%.15g", dblIn );
-    *pbstrOut = StringDupAtoBstr( pBuffer );
-
-    return S_OK;
+        TRACE("( %f, %ld, %ld, %p ), stub\n", dblIn, lcid, dwFlags, pbstrOut );
+
+        sprintf( pBuffer, "%.15g", dblIn );
+        *pbstrOut = StringDupAtoBstr( pBuffer );
+
+        return S_OK;
 }
 
@@ -3251 +3251 @@
  */
 HRESULT WINAPI VarBstrFromCy(CY cyIn, LCID lcid, ULONG dwFlags, BSTR *pbstrOut) {
-                /* FIXME */
-    return E_NOTIMPL;
-}
-
-
-/******************************************************************************
- *      VarBstrFromDate     [OLEAUT32.114]
+                                /* FIXME */
+        return E_NOTIMPL;
+}
+
+ 
+/******************************************************************************
+ *              VarBstrFromDate         [OLEAUT32.114]
  *
  * The date is implemented using an 8 byte floating-point number.
@@ -3274 +3274 @@
  * The tm structure is as follows:
  * struct tm {
- *        int tm_sec;      seconds after the minute - [0,59]
- *        int tm_min;      minutes after the hour - [0,59]
- *        int tm_hour;     hours since midnight - [0,23]
- *        int tm_mday;     day of the month - [1,31]
- *        int tm_mon;      months since January - [0,11]
- *        int tm_year;     years
- *        int tm_wday;     days since Sunday - [0,6]
- *        int tm_yday;     days since January 1 - [0,365]
- *        int tm_isdst;    daylight savings time flag
- *        };
+ *                int tm_sec;      seconds after the minute - [0,59]
+ *                int tm_min;      minutes after the hour - [0,59]
+ *                int tm_hour;     hours since midnight - [0,23]
+ *                int tm_mday;     day of the month - [1,31]
+ *                int tm_mon;      months since January - [0,11]
+ *                int tm_year;     years
+ *                int tm_wday;     days since Sunday - [0,6]
+ *                int tm_yday;     days since January 1 - [0,365]
+ *                int tm_isdst;    daylight savings time flag
+ *                };
  */
 HRESULT WINAPI VarBstrFromDate(DATE dateIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut)
@@ -3293 +3293 @@
 
     if( DateToTm( dateIn, dwFlags, &TM ) == FALSE )
-            {
+                        {
         return E_INVALIDARG;
-        }
+                }
 
     if( dwFlags & VAR_DATEVALUEONLY )
-            strftime( pBuffer, BUFFER_MAX, "%x", &TM );
+                        strftime( pBuffer, BUFFER_MAX, "%x", &TM );
     else if( dwFlags & VAR_TIMEVALUEONLY )
-            strftime( pBuffer, BUFFER_MAX, "%X", &TM );
-        else
+                        strftime( pBuffer, BUFFER_MAX, "%X", &TM );
+                else
         strftime( pBuffer, BUFFER_MAX, "%x %X", &TM );
 
-        *pbstrOut = StringDupAtoBstr( pBuffer );
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarBstrFromBool     [OLEAUT32.116]
+                *pbstrOut = StringDupAtoBstr( pBuffer );
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarBstrFromBool         [OLEAUT32.116]
  */
 HRESULT WINAPI VarBstrFromBool(VARIANT_BOOL boolIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut)
 {
-    TRACE("( %d, %ld, %ld, %p ), stub\n", boolIn, lcid, dwFlags, pbstrOut );
-
-    if( boolIn == VARIANT_FALSE )
-    {
-        sprintf( pBuffer, "False" );
-    }
-    else
-    {
-        sprintf( pBuffer, "True" );
-    }
-
-    *pbstrOut = StringDupAtoBstr( pBuffer );
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarBstrFromI1       [OLEAUT32.229]
+        TRACE("( %d, %ld, %ld, %p ), stub\n", boolIn, lcid, dwFlags, pbstrOut );
+
+        if( boolIn == VARIANT_FALSE )
+        {
+                sprintf( pBuffer, "False" );
+        }
+        else
+        {
+                sprintf( pBuffer, "True" );
+        }
+
+        *pbstrOut = StringDupAtoBstr( pBuffer );
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarBstrFromI1           [OLEAUT32.229]
  */
 HRESULT WINAPI VarBstrFromI1(CHAR cIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut)
 {
-    TRACE("( %c, %ld, %ld, %p ), stub\n", cIn, lcid, dwFlags, pbstrOut );
-    sprintf( pBuffer, "%d", cIn );
-    *pbstrOut = StringDupAtoBstr( pBuffer );
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarBstrFromUI2      [OLEAUT32.230]
+        TRACE("( %c, %ld, %ld, %p ), stub\n", cIn, lcid, dwFlags, pbstrOut );
+        sprintf( pBuffer, "%d", cIn );
+        *pbstrOut = StringDupAtoBstr( pBuffer );
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarBstrFromUI2          [OLEAUT32.230]
  */
 HRESULT WINAPI VarBstrFromUI2(USHORT uiIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut)
 {
-    TRACE("( %d, %ld, %ld, %p ), stub\n", uiIn, lcid, dwFlags, pbstrOut );
-    sprintf( pBuffer, "%d", uiIn );
-    *pbstrOut = StringDupAtoBstr( pBuffer );
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarBstrFromUI4      [OLEAUT32.231]
+        TRACE("( %d, %ld, %ld, %p ), stub\n", uiIn, lcid, dwFlags, pbstrOut );
+        sprintf( pBuffer, "%d", uiIn );
+        *pbstrOut = StringDupAtoBstr( pBuffer );
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarBstrFromUI4          [OLEAUT32.231]
  */
 HRESULT WINAPI VarBstrFromUI4(ULONG ulIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut)
 {
-    TRACE("( %ld, %ld, %ld, %p ), stub\n", ulIn, lcid, dwFlags, pbstrOut );
-    sprintf( pBuffer, "%ld", ulIn );
-    *pbstrOut = StringDupAtoBstr( pBuffer );
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarBoolFromUI1      [OLEAUT32.118]
+        TRACE("( %ld, %ld, %ld, %p ), stub\n", ulIn, lcid, dwFlags, pbstrOut );
+        sprintf( pBuffer, "%ld", ulIn );
+        *pbstrOut = StringDupAtoBstr( pBuffer );
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarBoolFromUI1          [OLEAUT32.118]
  */
 HRESULT WINAPI VarBoolFromUI1(BYTE bIn, VARIANT_BOOL* pboolOut)
 {
-    TRACE("( %d, %p ), stub\n", bIn, pboolOut );
-
-    if( bIn == 0 )
-    {
-        *pboolOut = VARIANT_FALSE;
-    }
-    else
-    {
-        *pboolOut = VARIANT_TRUE;
-    }
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarBoolFromI2       [OLEAUT32.119]
+        TRACE("( %d, %p ), stub\n", bIn, pboolOut );
+
+        if( bIn == 0 )
+        {
+                *pboolOut = VARIANT_FALSE;
+        }
+        else
+        {
+                *pboolOut = VARIANT_TRUE;
+        }
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarBoolFromI2           [OLEAUT32.119]
  */
 HRESULT WINAPI VarBoolFromI2(short sIn, VARIANT_BOOL* pboolOut)
 {
-    TRACE("( %d, %p ), stub\n", sIn, pboolOut );
-
-    if( sIn == 0 )
-    {
-        *pboolOut = VARIANT_FALSE;
-    }
-    else
-    {
-        *pboolOut = VARIANT_TRUE;
-    }
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarBoolFromI4       [OLEAUT32.120]
+        TRACE("( %d, %p ), stub\n", sIn, pboolOut );
+
+        if( sIn == 0 )
+        {
+                *pboolOut = VARIANT_FALSE;
+        }
+        else
+        {
+                *pboolOut = VARIANT_TRUE;
+        }
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarBoolFromI4           [OLEAUT32.120]
  */
 HRESULT WINAPI VarBoolFromI4(LONG lIn, VARIANT_BOOL* pboolOut)
 {
-    TRACE("( %ld, %p ), stub\n", lIn, pboolOut );
-
-    if( lIn == 0 )
-    {
-        *pboolOut = VARIANT_FALSE;
-    }
-    else
-    {
-        *pboolOut = VARIANT_TRUE;
-    }
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarBoolFromR4       [OLEAUT32.121]
+        TRACE("( %ld, %p ), stub\n", lIn, pboolOut );
+
+        if( lIn == 0 )
+        {
+                *pboolOut = VARIANT_FALSE;
+        }
+        else
+        {
+                *pboolOut = VARIANT_TRUE;
+        }
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarBoolFromR4           [OLEAUT32.121]
  */
 HRESULT WINAPI VarBoolFromR4(FLOAT fltIn, VARIANT_BOOL* pboolOut)
 {
-    TRACE("( %f, %p ), stub\n", fltIn, pboolOut );
-
-    if( fltIn == 0.0 )
-    {
-        *pboolOut = VARIANT_FALSE;
-    }
-    else
-    {
-        *pboolOut = VARIANT_TRUE;
-    }
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarBoolFromR8       [OLEAUT32.122]
+        TRACE("( %f, %p ), stub\n", fltIn, pboolOut );
+
+        if( fltIn == 0.0 )
+        {
+                *pboolOut = VARIANT_FALSE;
+        }
+        else
+        {
+                *pboolOut = VARIANT_TRUE;
+        }
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarBoolFromR8           [OLEAUT32.122]
  */
 HRESULT WINAPI VarBoolFromR8(double dblIn, VARIANT_BOOL* pboolOut)
 {
-    TRACE("( %f, %p ), stub\n", dblIn, pboolOut );
-
-    if( dblIn == 0.0 )
-    {
-        *pboolOut = VARIANT_FALSE;
-    }
-    else
-    {
-        *pboolOut = VARIANT_TRUE;
-    }
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarBoolFromDate     [OLEAUT32.123]
+        TRACE("( %f, %p ), stub\n", dblIn, pboolOut );
+
+        if( dblIn == 0.0 )
+        {
+                *pboolOut = VARIANT_FALSE;
+        }
+        else
+        {
+                *pboolOut = VARIANT_TRUE;
+        }
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarBoolFromDate         [OLEAUT32.123]
  */
 HRESULT WINAPI VarBoolFromDate(DATE dateIn, VARIANT_BOOL* pboolOut)
 {
-    TRACE("( %f, %p ), stub\n", dateIn, pboolOut );
-
-    if( dateIn == 0.0 )
-    {
-        *pboolOut = VARIANT_FALSE;
-    }
-    else
-    {
-        *pboolOut = VARIANT_TRUE;
-    }
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarBoolFromStr      [OLEAUT32.125]
+        TRACE("( %f, %p ), stub\n", dateIn, pboolOut );
+
+        if( dateIn == 0.0 )
+        {
+                *pboolOut = VARIANT_FALSE;
+        }
+        else
+        {
+                *pboolOut = VARIANT_TRUE;
+        }
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarBoolFromStr          [OLEAUT32.125]
  */
 HRESULT WINAPI VarBoolFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, VARIANT_BOOL* pboolOut)
 {
-    HRESULT ret = S_OK;
-    char* pNewString = NULL;
-
-    TRACE("( %p, %ld, %ld, %p ), stub\n", strIn, lcid, dwFlags, pboolOut );
+        HRESULT ret = S_OK;
+        char* pNewString = NULL;
+
+        TRACE("( %p, %ld, %ld, %p ), stub\n", strIn, lcid, dwFlags, pboolOut );
 
     pNewString = HEAP_strdupWtoA( GetProcessHeap(), 0, strIn );
 
-    if( pNewString == NULL || strlen( pNewString ) == 0 )
-    {
-        ret = DISP_E_TYPEMISMATCH;
-    }
-
-    if( ret == S_OK )
-    {
-        if( strncasecmp( pNewString, "True", strlen( pNewString ) ) == 0 )
-        {
-            *pboolOut = VARIANT_TRUE;
-        }
-        else if( strncasecmp( pNewString, "False", strlen( pNewString ) ) == 0 )
-        {
-            *pboolOut = VARIANT_FALSE;
-        }
-        else
-        {
-            /* Try converting the string to a floating point number.
-             */
-            double dValue = 0.0;
-            HRESULT res = VarR8FromStr( strIn, lcid, dwFlags, &dValue );
-            if( res != S_OK )
-            {
-                ret = DISP_E_TYPEMISMATCH;
-            }
-            else if( dValue == 0.0 )
-            {
-                *pboolOut = VARIANT_FALSE;
-            }
-            else
-            {
-                *pboolOut = VARIANT_TRUE;
-            }
-        }
-    }
-
-    HeapFree( GetProcessHeap(), 0, pNewString );
-
-    return ret;
-}
-
-/******************************************************************************
- *      VarBoolFromI1       [OLEAUT32.233]
+        if( pNewString == NULL || strlen( pNewString ) == 0 )
+        {
+                ret = DISP_E_TYPEMISMATCH;
+        }
+
+        if( ret == S_OK )
+        {
+                if( strncasecmp( pNewString, "True", strlen( pNewString ) ) == 0 )
+                {
+                        *pboolOut = VARIANT_TRUE;
+                }
+                else if( strncasecmp( pNewString, "False", strlen( pNewString ) ) == 0 )
+                {
+                        *pboolOut = VARIANT_FALSE;
+                }
+                else
+                {
+                        /* Try converting the string to a floating point number.
+                         */
+                        double dValue = 0.0;
+                        HRESULT res = VarR8FromStr( strIn, lcid, dwFlags, &dValue );
+                        if( res != S_OK )
+                        {
+                                ret = DISP_E_TYPEMISMATCH;
+                        }
+                        else if( dValue == 0.0 )
+                        {
+                                *pboolOut = VARIANT_FALSE;
+                        }
+                        else
+                        {
+                                *pboolOut = VARIANT_TRUE;
+                        }
+                }
+        }
+
+        HeapFree( GetProcessHeap(), 0, pNewString );
+        
+        return ret;
+}
+
+/******************************************************************************
+ *              VarBoolFromI1           [OLEAUT32.233]
  */
 HRESULT WINAPI VarBoolFromI1(CHAR cIn, VARIANT_BOOL* pboolOut)
 {
-    TRACE("( %c, %p ), stub\n", cIn, pboolOut );
-
-    if( cIn == 0 )
-    {
-        *pboolOut = VARIANT_FALSE;
-    }
-    else
-    {
-        *pboolOut = VARIANT_TRUE;
-    }
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarBoolFromUI2      [OLEAUT32.234]
+        TRACE("( %c, %p ), stub\n", cIn, pboolOut );
+
+        if( cIn == 0 )
+        {
+                *pboolOut = VARIANT_FALSE;
+        }
+        else
+        {
+                *pboolOut = VARIANT_TRUE;
+        }
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarBoolFromUI2          [OLEAUT32.234]
  */
 HRESULT WINAPI VarBoolFromUI2(USHORT uiIn, VARIANT_BOOL* pboolOut)
 {
-    TRACE("( %d, %p ), stub\n", uiIn, pboolOut );
-
-    if( uiIn == 0 )
-    {
-        *pboolOut = VARIANT_FALSE;
-    }
-    else
-    {
-        *pboolOut = VARIANT_TRUE;
-    }
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarBoolFromUI4      [OLEAUT32.235]
+        TRACE("( %d, %p ), stub\n", uiIn, pboolOut );
+
+        if( uiIn == 0 )
+        {
+                *pboolOut = VARIANT_FALSE;
+        }
+        else
+        {
+                *pboolOut = VARIANT_TRUE;
+        }
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarBoolFromUI4          [OLEAUT32.235]
  */
 HRESULT WINAPI VarBoolFromUI4(ULONG ulIn, VARIANT_BOOL* pboolOut)
 {
-    TRACE("( %ld, %p ), stub\n", ulIn, pboolOut );
-
-    if( ulIn == 0 )
-    {
-        *pboolOut = VARIANT_FALSE;
-    }
-    else
-    {
-        *pboolOut = VARIANT_TRUE;
-    }
-
-    return S_OK;
+        TRACE("( %ld, %p ), stub\n", ulIn, pboolOut );
+
+        if( ulIn == 0 )
+        {
+                *pboolOut = VARIANT_FALSE;
+        }
+        else
+        {
+                *pboolOut = VARIANT_TRUE;
+        }
+
+        return S_OK;
 }
 
@@ -3597 +3597 @@
       if (cyIn.s.Hi || cyIn.s.Lo) *pboolOut = -1;
       else *pboolOut = 0;
-
+      
       return S_OK;
 }
 
 /******************************************************************************
- *      VarI1FromUI1        [OLEAUT32.244]
+ *              VarI1FromUI1            [OLEAUT32.244]
  */
 HRESULT WINAPI VarI1FromUI1(BYTE bIn, CHAR* pcOut)
 {
-    TRACE("( %d, %p ), stub\n", bIn, pcOut );
-
-    /* Check range of value.
-     */
-    if( bIn > CHAR_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *pcOut = (CHAR) bIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarI1FromI2     [OLEAUT32.245]
+        TRACE("( %d, %p ), stub\n", bIn, pcOut );
+
+        /* Check range of value.
+         */
+        if( bIn > CHAR_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *pcOut = (CHAR) bIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarI1FromI2             [OLEAUT32.245]
  */
 HRESULT WINAPI VarI1FromI2(short uiIn, CHAR* pcOut)
 {
-    TRACE("( %d, %p ), stub\n", uiIn, pcOut );
-
-    if( uiIn > CHAR_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *pcOut = (CHAR) uiIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarI1FromI4     [OLEAUT32.246]
+        TRACE("( %d, %p ), stub\n", uiIn, pcOut );
+
+        if( uiIn > CHAR_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *pcOut = (CHAR) uiIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarI1FromI4             [OLEAUT32.246]
  */
 HRESULT WINAPI VarI1FromI4(LONG lIn, CHAR* pcOut)
 {
-    TRACE("( %ld, %p ), stub\n", lIn, pcOut );
-
-    if( lIn < CHAR_MIN || lIn > CHAR_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *pcOut = (CHAR) lIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarI1FromR4     [OLEAUT32.247]
+        TRACE("( %ld, %p ), stub\n", lIn, pcOut );
+
+        if( lIn < CHAR_MIN || lIn > CHAR_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *pcOut = (CHAR) lIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarI1FromR4             [OLEAUT32.247]
  */
 HRESULT WINAPI VarI1FromR4(FLOAT fltIn, CHAR* pcOut)
 {
-    TRACE("( %f, %p ), stub\n", fltIn, pcOut );
+        TRACE("( %f, %p ), stub\n", fltIn, pcOut );
 
     fltIn = round( fltIn );
-    if( fltIn < CHAR_MIN || fltIn > CHAR_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *pcOut = (CHAR) fltIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarI1FromR8     [OLEAUT32.248]
+        if( fltIn < CHAR_MIN || fltIn > CHAR_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *pcOut = (CHAR) fltIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarI1FromR8             [OLEAUT32.248]
  */
 HRESULT WINAPI VarI1FromR8(double dblIn, CHAR* pcOut)
 {
-    TRACE("( %f, %p ), stub\n", dblIn, pcOut );
+        TRACE("( %f, %p ), stub\n", dblIn, pcOut );
 
     dblIn = round( dblIn );
     if( dblIn < CHAR_MIN || dblIn > CHAR_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *pcOut = (CHAR) dblIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarI1FromDate       [OLEAUT32.249]
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *pcOut = (CHAR) dblIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarI1FromDate           [OLEAUT32.249]
  */
 HRESULT WINAPI VarI1FromDate(DATE dateIn, CHAR* pcOut)
 {
-    TRACE("( %f, %p ), stub\n", dateIn, pcOut );
+        TRACE("( %f, %p ), stub\n", dateIn, pcOut );
 
     dateIn = round( dateIn );
-    if( dateIn < CHAR_MIN || dateIn > CHAR_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *pcOut = (CHAR) dateIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarI1FromStr        [OLEAUT32.251]
+        if( dateIn < CHAR_MIN || dateIn > CHAR_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *pcOut = (CHAR) dateIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarI1FromStr            [OLEAUT32.251]
  */
 HRESULT WINAPI VarI1FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, CHAR* pcOut)
 {
-    double dValue = 0.0;
-    LPSTR pNewString = NULL;
-
-    TRACE("( %p, %ld, %ld, %p ), stub\n", strIn, lcid, dwFlags, pcOut );
-
-    /* Check if we have a valid argument
-     */
-    pNewString = HEAP_strdupWtoA( GetProcessHeap(), 0, strIn );
-    RemoveCharacterFromString( pNewString, "," );
-    if( IsValidRealString( pNewString ) == FALSE )
-    {
-        return DISP_E_TYPEMISMATCH;
-    }
-
-    /* Convert the valid string to a floating point number.
-     */
-    dValue = atof( pNewString );
-
-    /* We don't need the string anymore so free it.
-     */
-    HeapFree( GetProcessHeap(), 0, pNewString );
-
-    /* Check range of value.
+        double dValue = 0.0;
+        LPSTR pNewString = NULL;
+
+        TRACE("( %p, %ld, %ld, %p ), stub\n", strIn, lcid, dwFlags, pcOut );
+
+        /* Check if we have a valid argument
+         */
+        pNewString = HEAP_strdupWtoA( GetProcessHeap(), 0, strIn );
+        RemoveCharacterFromString( pNewString, "," );
+        if( IsValidRealString( pNewString ) == FALSE )
+        {
+                return DISP_E_TYPEMISMATCH;
+        }
+
+        /* Convert the valid string to a floating point number.
+         */
+        dValue = atof( pNewString );
+  
+        /* We don't need the string anymore so free it.
+         */
+        HeapFree( GetProcessHeap(), 0, pNewString );
+
+        /* Check range of value.
      */
     dValue = round( dValue );
-    if( dValue < CHAR_MIN || dValue > CHAR_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *pcOut = (CHAR) dValue;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarI1FromBool       [OLEAUT32.253]
+        if( dValue < CHAR_MIN || dValue > CHAR_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *pcOut = (CHAR) dValue;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarI1FromBool           [OLEAUT32.253]
  */
 HRESULT WINAPI VarI1FromBool(VARIANT_BOOL boolIn, CHAR* pcOut)
 {
-    TRACE("( %d, %p ), stub\n", boolIn, pcOut );
-
-    *pcOut = (CHAR) boolIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarI1FromUI2        [OLEAUT32.254]
+        TRACE("( %d, %p ), stub\n", boolIn, pcOut );
+
+        *pcOut = (CHAR) boolIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarI1FromUI2            [OLEAUT32.254]
  */
 HRESULT WINAPI VarI1FromUI2(USHORT uiIn, CHAR* pcOut)
 {
-    TRACE("( %d, %p ), stub\n", uiIn, pcOut );
-
-    if( uiIn > CHAR_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *pcOut = (CHAR) uiIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarI1FromUI4        [OLEAUT32.255]
+        TRACE("( %d, %p ), stub\n", uiIn, pcOut );
+
+        if( uiIn > CHAR_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *pcOut = (CHAR) uiIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarI1FromUI4            [OLEAUT32.255]
  */
 HRESULT WINAPI VarI1FromUI4(ULONG ulIn, CHAR* pcOut)
 {
-    TRACE("( %ld, %p ), stub\n", ulIn, pcOut );
-
-    if( ulIn > CHAR_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *pcOut = (CHAR) ulIn;
-
-    return S_OK;
+        TRACE("( %ld, %p ), stub\n", ulIn, pcOut );
+
+        if( ulIn > CHAR_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *pcOut = (CHAR) ulIn;
+
+        return S_OK;
 }
 
@@ -3800 +3800 @@
 HRESULT WINAPI VarI1FromCy(CY cyIn, CHAR* pcOut) {
    double t = round((((double)cyIn.s.Hi * 4294967296.0) + (double)cyIn.s.Lo) / 10000);
-
+   
    if (t > CHAR_MAX || t < CHAR_MIN) return DISP_E_OVERFLOW;
-
+   
    *pcOut = (CHAR)t;
    return S_OK;
@@ -3808 +3808 @@
 
 /******************************************************************************
- *      VarUI2FromUI1       [OLEAUT32.257]
+ *              VarUI2FromUI1           [OLEAUT32.257]
  */
 HRESULT WINAPI VarUI2FromUI1(BYTE bIn, USHORT* puiOut)
 {
-    TRACE("( %d, %p ), stub\n", bIn, puiOut );
-
-    *puiOut = (USHORT) bIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarUI2FromI2        [OLEAUT32.258]
+        TRACE("( %d, %p ), stub\n", bIn, puiOut );
+
+        *puiOut = (USHORT) bIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarUI2FromI2            [OLEAUT32.258]
  */
 HRESULT WINAPI VarUI2FromI2(short uiIn, USHORT* puiOut)
 {
-    TRACE("( %d, %p ), stub\n", uiIn, puiOut );
-
-    if( uiIn < UI2_MIN )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *puiOut = (USHORT) uiIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarUI2FromI4        [OLEAUT32.259]
+        TRACE("( %d, %p ), stub\n", uiIn, puiOut );
+
+        if( uiIn < UI2_MIN )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *puiOut = (USHORT) uiIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarUI2FromI4            [OLEAUT32.259]
  */
 HRESULT WINAPI VarUI2FromI4(LONG lIn, USHORT* puiOut)
 {
-    TRACE("( %ld, %p ), stub\n", lIn, puiOut );
-
-    if( lIn < UI2_MIN || lIn > UI2_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *puiOut = (USHORT) lIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarUI2FromR4        [OLEAUT32.260]
+        TRACE("( %ld, %p ), stub\n", lIn, puiOut );
+
+        if( lIn < UI2_MIN || lIn > UI2_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *puiOut = (USHORT) lIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarUI2FromR4            [OLEAUT32.260]
  */
 HRESULT WINAPI VarUI2FromR4(FLOAT fltIn, USHORT* puiOut)
 {
-    TRACE("( %f, %p ), stub\n", fltIn, puiOut );
+        TRACE("( %f, %p ), stub\n", fltIn, puiOut );
 
     fltIn = round( fltIn );
-    if( fltIn < UI2_MIN || fltIn > UI2_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *puiOut = (USHORT) fltIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarUI2FromR8        [OLEAUT32.261]
+        if( fltIn < UI2_MIN || fltIn > UI2_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *puiOut = (USHORT) fltIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarUI2FromR8            [OLEAUT32.261]
  */
 HRESULT WINAPI VarUI2FromR8(double dblIn, USHORT* puiOut)
 {
-    TRACE("( %f, %p ), stub\n", dblIn, puiOut );
+        TRACE("( %f, %p ), stub\n", dblIn, puiOut );
 
     dblIn = round( dblIn );
     if( dblIn < UI2_MIN || dblIn > UI2_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *puiOut = (USHORT) dblIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarUI2FromDate      [OLEAUT32.262]
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *puiOut = (USHORT) dblIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarUI2FromDate          [OLEAUT32.262]
  */
 HRESULT WINAPI VarUI2FromDate(DATE dateIn, USHORT* puiOut)
 {
-    TRACE("( %f, %p ), stub\n", dateIn, puiOut );
+        TRACE("( %f, %p ), stub\n", dateIn, puiOut );
 
     dateIn = round( dateIn );
-    if( dateIn < UI2_MIN || dateIn > UI2_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *puiOut = (USHORT) dateIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarUI2FromStr       [OLEAUT32.264]
+        if( dateIn < UI2_MIN || dateIn > UI2_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *puiOut = (USHORT) dateIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarUI2FromStr           [OLEAUT32.264]
  */
 HRESULT WINAPI VarUI2FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, USHORT* puiOut)
 {
-    double dValue = 0.0;
-    LPSTR pNewString = NULL;
-
-    TRACE("( %p, %ld, %ld, %p ), stub\n", strIn, lcid, dwFlags, puiOut );
-
-    /* Check if we have a valid argument
-     */
-    pNewString = HEAP_strdupWtoA( GetProcessHeap(), 0, strIn );
-    RemoveCharacterFromString( pNewString, "," );
-    if( IsValidRealString( pNewString ) == FALSE )
-    {
-        return DISP_E_TYPEMISMATCH;
-    }
-
-    /* Convert the valid string to a floating point number.
-     */
-    dValue = atof( pNewString );
-
-    /* We don't need the string anymore so free it.
-     */
-    HeapFree( GetProcessHeap(), 0, pNewString );
-
-    /* Check range of value.
+        double dValue = 0.0;
+        LPSTR pNewString = NULL;
+
+        TRACE("( %p, %ld, %ld, %p ), stub\n", strIn, lcid, dwFlags, puiOut );
+
+        /* Check if we have a valid argument
+         */
+        pNewString = HEAP_strdupWtoA( GetProcessHeap(), 0, strIn );
+        RemoveCharacterFromString( pNewString, "," );
+        if( IsValidRealString( pNewString ) == FALSE )
+        {
+                return DISP_E_TYPEMISMATCH;
+        }
+
+        /* Convert the valid string to a floating point number.
+         */
+        dValue = atof( pNewString );
+  
+        /* We don't need the string anymore so free it.
+         */
+        HeapFree( GetProcessHeap(), 0, pNewString );
+
+        /* Check range of value.
      */
     dValue = round( dValue );
-    if( dValue < UI2_MIN || dValue > UI2_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *puiOut = (USHORT) dValue;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarUI2FromBool      [OLEAUT32.266]
+        if( dValue < UI2_MIN || dValue > UI2_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *puiOut = (USHORT) dValue;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarUI2FromBool          [OLEAUT32.266]
  */
 HRESULT WINAPI VarUI2FromBool(VARIANT_BOOL boolIn, USHORT* puiOut)
 {
-    TRACE("( %d, %p ), stub\n", boolIn, puiOut );
-
-    *puiOut = (USHORT) boolIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarUI2FromI1        [OLEAUT32.267]
+        TRACE("( %d, %p ), stub\n", boolIn, puiOut );
+
+        *puiOut = (USHORT) boolIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarUI2FromI1            [OLEAUT32.267]
  */
 HRESULT WINAPI VarUI2FromI1(CHAR cIn, USHORT* puiOut)
 {
-    TRACE("( %c, %p ), stub\n", cIn, puiOut );
-
-    *puiOut = (USHORT) cIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarUI2FromUI4       [OLEAUT32.268]
+        TRACE("( %c, %p ), stub\n", cIn, puiOut );
+
+        *puiOut = (USHORT) cIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarUI2FromUI4           [OLEAUT32.268]
  */
 HRESULT WINAPI VarUI2FromUI4(ULONG ulIn, USHORT* puiOut)
 {
-    TRACE("( %ld, %p ), stub\n", ulIn, puiOut );
-
-    if( ulIn < UI2_MIN || ulIn > UI2_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *puiOut = (USHORT) ulIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarUI4FromStr       [OLEAUT32.277]
+        TRACE("( %ld, %p ), stub\n", ulIn, puiOut );
+
+        if( ulIn < UI2_MIN || ulIn > UI2_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *puiOut = (USHORT) ulIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarUI4FromStr           [OLEAUT32.277]
  */
 HRESULT WINAPI VarUI4FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, ULONG* pulOut)
 {
-    double dValue = 0.0;
-    LPSTR pNewString = NULL;
-
-    TRACE("( %p, %ld, %ld, %p ), stub\n", strIn, lcid, dwFlags, pulOut );
-
-    /* Check if we have a valid argument
-     */
-    pNewString = HEAP_strdupWtoA( GetProcessHeap(), 0, strIn );
-    RemoveCharacterFromString( pNewString, "," );
-    if( IsValidRealString( pNewString ) == FALSE )
-    {
-        return DISP_E_TYPEMISMATCH;
-    }
-
-    /* Convert the valid string to a floating point number.
-     */
-    dValue = atof( pNewString );
-
-    /* We don't need the string anymore so free it.
-     */
-    HeapFree( GetProcessHeap(), 0, pNewString );
-
-    /* Check range of value.
+        double dValue = 0.0;
+        LPSTR pNewString = NULL;
+
+        TRACE("( %p, %ld, %ld, %p ), stub\n", strIn, lcid, dwFlags, pulOut );
+
+        /* Check if we have a valid argument
+         */
+        pNewString = HEAP_strdupWtoA( GetProcessHeap(), 0, strIn );
+        RemoveCharacterFromString( pNewString, "," );
+        if( IsValidRealString( pNewString ) == FALSE )
+        {
+                return DISP_E_TYPEMISMATCH;
+        }
+
+        /* Convert the valid string to a floating point number.
+         */
+        dValue = atof( pNewString );
+  
+        /* We don't need the string anymore so free it.
+         */
+        HeapFree( GetProcessHeap(), 0, pNewString );
+
+        /* Check range of value.
      */
     dValue = round( dValue );
-    if( dValue < UI4_MIN || dValue > UI4_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *pulOut = (ULONG) dValue;
-
-    return S_OK;
+        if( dValue < UI4_MIN || dValue > UI4_MAX )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *pulOut = (ULONG) dValue;
+
+        return S_OK;
 }
 
@@ -4034 +4034 @@
 HRESULT WINAPI VarUI2FromCy(CY cyIn, USHORT* pusOut) {
    double t = round((((double)cyIn.s.Hi * 4294967296.0) + (double)cyIn.s.Lo) / 10000);
-
+   
    if (t > UI2_MAX || t < UI2_MIN) return DISP_E_OVERFLOW;
-
+      
    *pusOut = (USHORT)t;
-
+   
    return S_OK;
 }
 
 /******************************************************************************
- *      VarUI4FromUI1       [OLEAUT32.270]
+ *              VarUI4FromUI1           [OLEAUT32.270]
  */
 HRESULT WINAPI VarUI4FromUI1(BYTE bIn, ULONG* pulOut)
 {
-    TRACE("( %d, %p ), stub\n", bIn, pulOut );
-
-    *pulOut = (USHORT) bIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarUI4FromI2        [OLEAUT32.271]
+        TRACE("( %d, %p ), stub\n", bIn, pulOut );
+
+        *pulOut = (USHORT) bIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarUI4FromI2            [OLEAUT32.271]
  */
 HRESULT WINAPI VarUI4FromI2(short uiIn, ULONG* pulOut)
 {
-    TRACE("( %d, %p ), stub\n", uiIn, pulOut );
-
-    if( uiIn < UI4_MIN )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *pulOut = (ULONG) uiIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarUI4FromI4        [OLEAUT32.272]
+        TRACE("( %d, %p ), stub\n", uiIn, pulOut );
+
+        if( uiIn < UI4_MIN )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *pulOut = (ULONG) uiIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarUI4FromI4            [OLEAUT32.272]
  */
 HRESULT WINAPI VarUI4FromI4(LONG lIn, ULONG* pulOut)
 {
-    TRACE("( %ld, %p ), stub\n", lIn, pulOut );
-
-    if( lIn < UI4_MIN )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *pulOut = (ULONG) lIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarUI4FromR4        [OLEAUT32.273]
+        TRACE("( %ld, %p ), stub\n", lIn, pulOut );
+
+        if( lIn < UI4_MIN )
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *pulOut = (ULONG) lIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarUI4FromR4            [OLEAUT32.273]
  */
 HRESULT WINAPI VarUI4FromR4(FLOAT fltIn, ULONG* pulOut)
@@ -4095 +4095 @@
     fltIn = round( fltIn );
     if( fltIn < UI4_MIN || fltIn > UI4_MAX )
-    {
-        return DISP_E_OVERFLOW;
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *pulOut = (ULONG) fltIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarUI4FromR8            [OLEAUT32.274]
+ */
+HRESULT WINAPI VarUI4FromR8(double dblIn, ULONG* pulOut)
+{
+        TRACE("( %f, %p ), stub\n", dblIn, pulOut );
+
+    dblIn = round( dblIn );
+        if( dblIn < UI4_MIN || dblIn > UI4_MAX )
+        {
+                return DISP_E_OVERFLOW;
     }
 
-    *pulOut = (ULONG) fltIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarUI4FromR8        [OLEAUT32.274]
- */
-HRESULT WINAPI VarUI4FromR8(double dblIn, ULONG* pulOut)
-{
-    TRACE("( %f, %p ), stub\n", dblIn, pulOut );
-
-    dblIn = round( dblIn );
-    if( dblIn < UI4_MIN || dblIn > UI4_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *pulOut = (ULONG) dblIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarUI4FromDate      [OLEAUT32.275]
+        *pulOut = (ULONG) dblIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarUI4FromDate          [OLEAUT32.275]
  */
 HRESULT WINAPI VarUI4FromDate(DATE dateIn, ULONG* pulOut)
 {
-    TRACE("( %f, %p ), stub\n", dateIn, pulOut );
+        TRACE("( %f, %p ), stub\n", dateIn, pulOut );
 
     dateIn = round( dateIn );
     if( dateIn < UI4_MIN || dateIn > UI4_MAX )
-    {
-        return DISP_E_OVERFLOW;
-    }
-
-    *pulOut = (ULONG) dateIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarUI4FromBool      [OLEAUT32.279]
+        {
+                return DISP_E_OVERFLOW;
+        }
+
+        *pulOut = (ULONG) dateIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarUI4FromBool          [OLEAUT32.279]
  */
 HRESULT WINAPI VarUI4FromBool(VARIANT_BOOL boolIn, ULONG* pulOut)
 {
-    TRACE("( %d, %p ), stub\n", boolIn, pulOut );
-
-    *pulOut = (ULONG) boolIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarUI4FromI1        [OLEAUT32.280]
+        TRACE("( %d, %p ), stub\n", boolIn, pulOut );
+
+        *pulOut = (ULONG) boolIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarUI4FromI1            [OLEAUT32.280]
  */
 HRESULT WINAPI VarUI4FromI1(CHAR cIn, ULONG* pulOut)
 {
-    TRACE("( %c, %p ), stub\n", cIn, pulOut );
-
-    *pulOut = (ULONG) cIn;
-
-    return S_OK;
-}
-
-/******************************************************************************
- *      VarUI4FromUI2       [OLEAUT32.281]
+        TRACE("( %c, %p ), stub\n", cIn, pulOut );
+
+        *pulOut = (ULONG) cIn;
+
+        return S_OK;
+}
+
+/******************************************************************************
+ *              VarUI4FromUI2           [OLEAUT32.281]
  */
 HRESULT WINAPI VarUI4FromUI2(USHORT uiIn, ULONG* pulOut)
 {
-    TRACE("( %d, %p ), stub\n", uiIn, pulOut );
-
-    *pulOut = (ULONG) uiIn;
-
-    return S_OK;
+        TRACE("( %d, %p ), stub\n", uiIn, pulOut );
+
+        *pulOut = (ULONG) uiIn;
+
+        return S_OK;
 }
 
@@ -4182 +4182 @@
 HRESULT WINAPI VarUI4FromCy(CY cyIn, ULONG* pulOut) {
    double t = round((((double)cyIn.s.Hi * 4294967296.0) + (double)cyIn.s.Lo) / 10000);
-
+   
    if (t > UI4_MAX || t < UI4_MIN) return DISP_E_OVERFLOW;
 
@@ -4197 +4197 @@
    pcyOut->s.Hi = 0;
    pcyOut->s.Lo = ((ULONG)bIn) * 10000;
-
+   
    return S_OK;
 }
@@ -4209 +4209 @@
    else pcyOut->s.Hi = 0;
    pcyOut->s.Lo = ((ULONG)sIn) * 10000;
-
+   
    return S_OK;
 }
@@ -4222 +4222 @@
       pcyOut->s.Lo = (ULONG)fmod(t, (double)4294967296.0);
       if (lIn < 0) pcyOut->s.Hi--;
-
+   
       return S_OK;
 }
@@ -4235 +4235 @@
    pcyOut->s.Lo = (ULONG)fmod(t, (double)4294967296.0);
    if (fltIn < 0) pcyOut->s.Hi--;
-
+   
    return S_OK;
 }
@@ -4269 +4269 @@
  */
 HRESULT WINAPI VarCyFromStr(OLECHAR *strIn, LCID lcid, ULONG dwFlags, CY *pcyOut) {
-                /* FIXME */
-        return E_NOTIMPL;
-}
-
-
+                                /* FIXME */
+                return E_NOTIMPL;
+}
+
+ 
 /**********************************************************************
  *              VarCyFromBool [OLEAUT32.106]
@@ -4282 +4282 @@
    else pcyOut->s.Hi = 0;
    pcyOut->s.Lo = (ULONG)boolIn * (ULONG)10000;
-
+   
    return S_OK;
 }
@@ -4294 +4294 @@
    else pcyOut->s.Hi = 0;
    pcyOut->s.Lo = (ULONG)cIn * (ULONG)10000;
-
+   
    return S_OK;
 }
@@ -4305 +4305 @@
    pcyOut->s.Hi = 0;
    pcyOut->s.Lo = (ULONG)usIn * (ULONG)10000;
-
+   
    return S_OK;
 }
@@ -4317 +4317 @@
    pcyOut->s.Hi = (LONG)(t / (double)4294967296.0);
    pcyOut->s.Lo = (ULONG)fmod(t, (double)4294967296.0);
-
+      
    return S_OK;
 }
@@ -4333 +4333 @@
 
     TRACE("( 0x%x, 0x%x, 0x%p ), stub\n", wDosDate, wDosTime, pvtime );
-
+    
     t.tm_sec = (wDosTime & 0x001f) * 2;
     t.tm_min = (wDosTime & 0x07e0) >> 5;
     t.tm_hour = (wDosTime & 0xf800) >> 11;
-
+    
     t.tm_mday = (wDosDate & 0x001f);
     t.tm_mon = (wDosDate & 0x01e0) >> 5;
@@ -4363 +4363 @@
     cDig = 0;
     for (i=0; strIn[i] ;i++) {
-    if ((strIn[i]>='0') && (strIn[i]<='9')) {
-        if (pnumprs->cDig > cDig) {
-        *(rgbDig++)=strIn[i]-'0';
-        cDig++;
-        lastent = i;
-        }
+        if ((strIn[i]>='0') && (strIn[i]<='9')) {
+            if (pnumprs->cDig > cDig) {
+                *(rgbDig++)=strIn[i]-'0';
+                cDig++;
+                lastent = i;
+            }
+        }
     }
-    }
-    pnumprs->cDig   = cDig;
+    pnumprs->cDig       = cDig;
 
     /* FIXME: Just patching some values in */
-    pnumprs->nPwr10 = 0;
-    pnumprs->nBaseShift = 0;
-    pnumprs->cchUsed    = lastent;
-    pnumprs->dwOutFlags = NUMPRS_DECIMAL;
+    pnumprs->nPwr10     = 0;
+    pnumprs->nBaseShift = 0;
+    pnumprs->cchUsed    = lastent;
+    pnumprs->dwOutFlags = NUMPRS_DECIMAL;
     return S_OK;
 }
@@ -4394 +4394 @@
     xint = 0;
     for (i=0;i<pnumprs->cDig;i++)
-    xint = xint*10 + rgbDig[i];
+        xint = xint*10 + rgbDig[i];
 
     VariantInit(pvar);
     if (dwVtBits & VTBIT_I4) {
-    V_VT(pvar) = VT_I4;
-    V_UNION(pvar,intVal) = xint;
-    return S_OK;
+        V_VT(pvar) = VT_I4;
+        V_UNION(pvar,intVal) = xint;
+        return S_OK;
     }
     if (dwVtBits & VTBIT_R8) {
-    V_VT(pvar) = VT_R8;
-    V_UNION(pvar,dblVal) = xint;
-    return S_OK;
+        V_VT(pvar) = VT_R8;
+        V_UNION(pvar,dblVal) = xint;
+        return S_OK;
     } else {
-    FIXME("vtbitmask is unsupported %lx\n",dwVtBits);
-    return E_FAIL;
+        FIXME("vtbitmask is unsupported %lx\n",dwVtBits);
+        return E_FAIL;
     }
 }
@@ -4659 +4659 @@
  *              VarBstrCmp [OLEAUT32.440]
  *
- * flags can be:
+ * flags can be: 
  *   NORM_IGNORECASE, NORM_IGNORENONSPACE, NORM_IGNORESYMBOLS
  *   NORM_IGNORESTRINGWIDTH, NORM_IGNOREKANATYPE, NORM_IGNOREKASHIDA