* Sync up to trunk HEAD (r62975).

[reactos.git] / dll / win32 / windowscodecs / jpegformat.c

diff --git a/dll/win32/windowscodecs/jpegformat.c b/dll/win32/windowscodecs/jpegformat.c
index 9ecc25b..50ea8c0 100644 (file)
--- a/dll/win32/windowscodecs/jpegformat.c
+++ b/dll/win32/windowscodecs/jpegformat.c
@@ -231,7 +231,7 @@ static jpeg_boolean source_mgr_fill_input_buffer(j_decompress_ptr cinfo)
 
     hr = IStream_Read(This->stream, This->source_buffer, 1024, &bytesread);
 
-    if (hr != S_OK || bytesread == 0)
+    if (FAILED(hr) || bytesread == 0)
     {
         return FALSE;
     }
@@ -696,12 +696,12 @@ static const IWICBitmapFrameDecodeVtbl JpegDecoder_Frame_Vtbl = {
     JpegDecoder_Frame_GetThumbnail
 };
 
-HRESULT JpegDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv)
+HRESULT JpegDecoder_CreateInstance(REFIID iid, void** ppv)
 {
     JpegDecoder *This;
     HRESULT ret;
 
-    TRACE("(%p,%s,%p)\n", pUnkOuter, debugstr_guid(iid), ppv);
+    TRACE("(%s,%p)\n", debugstr_guid(iid), ppv);
 
     if (!libjpeg_handle && !load_libjpeg())
     {
@@ -711,8 +711,6 @@ HRESULT JpegDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv)
 
     *ppv = NULL;
 
-    if (pUnkOuter) return CLASS_E_NOAGGREGATION;
-
     This = HeapAlloc(GetProcessHeap(), 0, sizeof(JpegDecoder));
     if (!This) return E_OUTOFMEMORY;
 
@@ -754,13 +752,13 @@ typedef struct JpegEncoder {
     struct jpeg_compress_struct cinfo;
     struct jpeg_error_mgr jerr;
     struct jpeg_destination_mgr dest_mgr;
-    int initialized;
+    BOOL initialized;
     int frame_count;
-    int frame_initialized;
-    int started_compress;
+    BOOL frame_initialized;
+    BOOL started_compress;
     int lines_written;
-    int frame_committed;
-    int committed;
+    BOOL frame_committed;
+    BOOL committed;
     UINT width, height;
     double xres, yres;
     const jpeg_compress_format *format;
@@ -1031,7 +1029,7 @@ static HRESULT WINAPI JpegEncoder_Frame_WritePixels(IWICBitmapFrameEncode *iface
 
         pjpeg_start_compress(&This->cinfo, TRUE);
 
-        This->started_compress = 1;
+        This->started_compress = TRUE;
     }
 
     row_size = This->format->bpp / 8 * This->width;
@@ -1438,17 +1436,15 @@ static const IWICBitmapEncoderVtbl JpegEncoder_Vtbl = {
     JpegEncoder_GetMetadataQueryWriter
 };
 
-HRESULT JpegEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv)
+HRESULT JpegEncoder_CreateInstance(REFIID iid, void** ppv)
 {
     JpegEncoder *This;
     HRESULT ret;
 
-    TRACE("(%p,%s,%p)\n", pUnkOuter, debugstr_guid(iid), ppv);
+    TRACE("(%s,%p)\n", debugstr_guid(iid), ppv);
 
     *ppv = NULL;
 
-    if (pUnkOuter) return CLASS_E_NOAGGREGATION;
-
     if (!libjpeg_handle && !load_libjpeg())
     {
         ERR("Failed writing JPEG because unable to find %s\n",SONAME_LIBJPEG);
@@ -1461,13 +1457,13 @@ HRESULT JpegEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv)
     This->IWICBitmapEncoder_iface.lpVtbl = &JpegEncoder_Vtbl;
     This->IWICBitmapFrameEncode_iface.lpVtbl = &JpegEncoder_FrameVtbl;
     This->ref = 1;
-    This->initialized = 0;
+    This->initialized = FALSE;
     This->frame_count = 0;
-    This->frame_initialized = 0;
-    This->started_compress = 0;
+    This->frame_initialized = FALSE;
+    This->started_compress = FALSE;
     This->lines_written = 0;
-    This->frame_committed = 0;
-    This->committed = 0;
+    This->frame_committed = FALSE;
+    This->committed = FALSE;
     This->width = This->height = 0;
     This->xres = This->yres = 0.0;
     This->format = NULL;
@@ -1483,13 +1479,13 @@ HRESULT JpegEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv)
 
 #else /* !defined(SONAME_LIBJPEG) */
 
-HRESULT JpegDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv)
+HRESULT JpegDecoder_CreateInstance(REFIID iid, void** ppv)
 {
     ERR("Trying to load JPEG picture, but JPEG support is not compiled in.\n");
     return E_FAIL;
 }
 
-HRESULT JpegEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv)
+HRESULT JpegEncoder_CreateInstance(REFIID iid, void** ppv)
 {
     ERR("Trying to save JPEG picture, but JPEG support is not compiled in.\n");
     return E_FAIL;