Changeset 6711 for trunk/src/oleaut32/olepicture.c

Timestamp:

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

Author:

sandervl

Message:

restored old version + wine update

File:

• trunk/src/oleaut32/olepicture.c (modified) (50 diffs)

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"));