ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oleaut32: Print error messages as ERR.

This commit is contained in:
Kirill K. Smirnov 2008-10-16 13:20:45 +04:00 committed by Alexandre Julliard
parent 723f3656e5
commit 4dfaf90ab2
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dlls/oleaut32/olepicture.c
View File

@ -1036,7 +1036,7 @@ static int _gif_inputfunc(GifFileType *gif, GifByteType *data, int len) {
struct gifdata *gd = (struct gifdata*)gif->UserData; struct gifdata *gd = (struct gifdata*)gif->UserData;
if (len+gd->curoff > gd->len) { if (len+gd->curoff > gd->len) {
FIXME("Trying to read %d bytes, but only %d available.\n",len, gd->len-gd->curoff); ERR("Trying to read %d bytes, but only %d available.\n",len, gd->len-gd->curoff);
len = gd->len - gd->curoff; len = gd->len - gd->curoff;
} }
memcpy(data, gd->data+gd->curoff, len); memcpy(data, gd->data+gd->curoff, len);
@ -1066,14 +1066,14 @@ static HRESULT OLEPictureImpl_LoadGif(OLEPictureImpl *This, BYTE *xbuf, ULONG xr
gif = DGifOpen((void*)&gd, _gif_inputfunc); gif = DGifOpen((void*)&gd, _gif_inputfunc);
ret = DGifSlurp(gif); ret = DGifSlurp(gif);
if (ret == GIF_ERROR) { if (ret == GIF_ERROR) {
FIXME("Failed reading GIF using libgif.\n"); ERR("Failed reading GIF using libgif.\n");
return E_FAIL; return E_FAIL;
} }
TRACE("screen height %d, width %d\n", gif->SWidth, gif->SHeight); TRACE("screen height %d, width %d\n", gif->SWidth, gif->SHeight);
TRACE("color res %d, backgcolor %d\n", gif->SColorResolution, gif->SBackGroundColor); TRACE("color res %d, backgcolor %d\n", gif->SColorResolution, gif->SBackGroundColor);
TRACE("imgcnt %d\n", gif->ImageCount); TRACE("imgcnt %d\n", gif->ImageCount);
if (gif->ImageCount<1) { if (gif->ImageCount<1) {
FIXME("GIF stream does not have images inside?\n"); ERR("GIF stream does not have images inside?\n");
return E_FAIL; return E_FAIL;
} }
TRACE("curimage: %d x %d, on %dx%d, interlace %d\n", TRACE("curimage: %d x %d, on %dx%d, interlace %d\n",
@ -1259,7 +1259,7 @@ static HRESULT OLEPictureImpl_LoadJpeg(OLEPictureImpl *This, BYTE *xbuf, ULONG x
if(!libjpeg_handle) { if(!libjpeg_handle) {
if(!load_libjpeg()) { if(!load_libjpeg()) {
FIXME("Failed reading JPEG because unable to find %s\n", SONAME_LIBJPEG); ERR("Failed reading JPEG because unable to find %s\n", SONAME_LIBJPEG);
return E_FAIL; return E_FAIL;
} }
} }
@ -1298,7 +1298,7 @@ static HRESULT OLEPictureImpl_LoadJpeg(OLEPictureImpl *This, BYTE *xbuf, ULONG x
while ( jd.output_scanline<jd.output_height ) { while ( jd.output_scanline<jd.output_height ) {
x = pjpeg_read_scanlines(&jd,&samprow,1); x = pjpeg_read_scanlines(&jd,&samprow,1);
if (x != 1) { if (x != 1) {
FIXME("failed to read current scanline?\n"); ERR("failed to read current scanline?\n");
break; break;
} }
/* We have to convert from RGB to BGR, see MSDN/ BITMAPINFOHEADER */ /* We have to convert from RGB to BGR, see MSDN/ BITMAPINFOHEADER */
@ -1672,7 +1672,7 @@ static HRESULT OLEPictureImpl_LoadIcon(OLEPictureImpl *This, BYTE *xbuf, ULONG x
0 0
); );
if (!hicon) { if (!hicon) {
FIXME("CreateIcon failed.\n"); ERR("CreateIcon failed.\n");
return E_FAIL; return E_FAIL;
} else { } else {
This->desc.picType = PICTYPE_ICON; This->desc.picType = PICTYPE_ICON;
@ -1801,7 +1801,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) {
do { do {
hr=IStream_Read(pStm,header,8,&xread); hr=IStream_Read(pStm,header,8,&xread);
if (hr || xread!=8) { if (hr || xread!=8) {
FIXME("Failure while reading picture header (hr is %x, nread is %d).\n",hr,xread); ERR("Failure while reading picture header (hr is %x, nread is %d).\n",hr,xread);
return hr; return hr;
} }
headerread += xread; headerread += xread;
@ -1879,7 +1879,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) {
break; break;
} }
if (xread != This->datalen) if (xread != This->datalen)
FIXME("Could only read %d of %d bytes out of stream?\n",xread,This->datalen); ERR("Could only read %d of %d bytes out of stream?\n",xread,This->datalen);
} }
if (This->datalen == 0) { /* Marks the "NONE" picture */ if (This->datalen == 0) { /* Marks the "NONE" picture */
This->desc.picType = PICTYPE_NONE; This->desc.picType = PICTYPE_NONE;
@ -2637,7 +2637,7 @@ HRESULT WINAPI OleLoadPicture( LPSTREAM lpstream, LONG lSize, BOOL fRunmode,
return hr; return hr;
hr = IPicture_QueryInterface(newpic,&IID_IPersistStream, (LPVOID*)&ps); hr = IPicture_QueryInterface(newpic,&IID_IPersistStream, (LPVOID*)&ps);
if (hr) { if (hr) {
FIXME("Could not get IPersistStream iface from Ole Picture?\n"); ERR("Could not get IPersistStream iface from Ole Picture?\n");
IPicture_Release(newpic); IPicture_Release(newpic);
*ppvObj = NULL; *ppvObj = NULL;
return hr; return hr;
@ -2653,7 +2653,7 @@ HRESULT WINAPI OleLoadPicture( LPSTREAM lpstream, LONG lSize, BOOL fRunmode,
} }
hr = IPicture_QueryInterface(newpic,riid,ppvObj); hr = IPicture_QueryInterface(newpic,riid,ppvObj);
if (hr) if (hr)
FIXME("Failed to get interface %s from IPicture.\n",debugstr_guid(riid)); ERR("Failed to get interface %s from IPicture.\n",debugstr_guid(riid));
IPicture_Release(newpic); IPicture_Release(newpic);
return hr; return hr;
} }
@ -2676,7 +2676,7 @@ HRESULT WINAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunmode,
return hr; return hr;
hr = IPicture_QueryInterface(newpic,&IID_IPersistStream, (LPVOID*)&ps); hr = IPicture_QueryInterface(newpic,&IID_IPersistStream, (LPVOID*)&ps);
if (hr) { if (hr) {
FIXME("Could not get IPersistStream iface from Ole Picture?\n"); ERR("Could not get IPersistStream iface from Ole Picture?\n");
IPicture_Release(newpic); IPicture_Release(newpic);
*ppvObj = NULL; *ppvObj = NULL;
return hr; return hr;
@ -2692,7 +2692,7 @@ HRESULT WINAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunmode,
} }
hr = IPicture_QueryInterface(newpic,riid,ppvObj); hr = IPicture_QueryInterface(newpic,riid,ppvObj);
if (hr) if (hr)
FIXME("Failed to get interface %s from IPicture.\n",debugstr_guid(riid)); ERR("Failed to get interface %s from IPicture.\n",debugstr_guid(riid));
IPicture_Release(newpic); IPicture_Release(newpic);
return hr; return hr;
} }
@ -2798,7 +2798,7 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller,
hRes = IPicture_QueryInterface(ipicture,riid,ppvRet); hRes = IPicture_QueryInterface(ipicture,riid,ppvRet);
if (hRes) if (hRes)
FIXME("Failed to get interface %s from IPicture.\n",debugstr_guid(riid)); ERR("Failed to get interface %s from IPicture.\n",debugstr_guid(riid));
IPicture_Release(ipicture); IPicture_Release(ipicture);
return hRes; return hRes;