windowscodecs: Use FAILED instead of !SUCCEEDED.

Michael Stefaniuc mstefani at redhat.de
Wed Sep 9 17:28:37 CDT 2009


---
 dlls/windowscodecs/info.c            |    2 +-
 dlls/windowscodecs/tests/bmpformat.c |   12 ++++++------
 dlls/windowscodecs/tests/palette.c   |    2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c
index 64c3855..f909d3a 100644
--- a/dlls/windowscodecs/info.c
+++ b/dlls/windowscodecs/info.c
@@ -952,7 +952,7 @@ HRESULT CreateComponentEnumerator(DWORD componentTypes, DWORD options, IEnumUnkn
                             list_add_tail(&This->objects, &item->entry);
                     }
 
-                    if (!SUCCEEDED(hr))
+                    if (FAILED(hr))
                     {
                         HeapFree(GetProcessHeap(), 0, item);
                         hr = S_OK;
diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c
index c793dd7..1f114a2 100644
--- a/dlls/windowscodecs/tests/bmpformat.c
+++ b/dlls/windowscodecs/tests/bmpformat.c
@@ -70,7 +70,7 @@ static void test_decode_24bpp(void)
     hr = CoCreateInstance(&CLSID_WICBmpDecoder, NULL, CLSCTX_INPROC_SERVER,
         &IID_IWICBitmapDecoder, (void**)&decoder);
     ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr);
-    if (!SUCCEEDED(hr)) return;
+    if (FAILED(hr)) return;
 
     hbmpdata = GlobalAlloc(GMEM_MOVEABLE, sizeof(testbmp_24bpp));
     ok(hbmpdata != 0, "GlobalAlloc failed\n");
@@ -277,7 +277,7 @@ static void test_decode_1bpp(void)
     hr = CoCreateInstance(&CLSID_WICBmpDecoder, NULL, CLSCTX_INPROC_SERVER,
         &IID_IWICBitmapDecoder, (void**)&decoder);
     ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr);
-    if (!SUCCEEDED(hr)) return;
+    if (FAILED(hr)) return;
 
     hbmpdata = GlobalAlloc(GMEM_MOVEABLE, sizeof(testbmp_1bpp));
     ok(hbmpdata != 0, "GlobalAlloc failed\n");
@@ -435,7 +435,7 @@ static void test_decode_4bpp(void)
     hr = CoCreateInstance(&CLSID_WICBmpDecoder, NULL, CLSCTX_INPROC_SERVER,
         &IID_IWICBitmapDecoder, (void**)&decoder);
     ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr);
-    if (!SUCCEEDED(hr)) return;
+    if (FAILED(hr)) return;
 
     hbmpdata = GlobalAlloc(GMEM_MOVEABLE, sizeof(testbmp_4bpp));
     ok(hbmpdata != 0, "GlobalAlloc failed\n");
@@ -614,7 +614,7 @@ static void test_decode_rle8(void)
     hr = CoCreateInstance(&CLSID_WICBmpDecoder, NULL, CLSCTX_INPROC_SERVER,
         &IID_IWICBitmapDecoder, (void**)&decoder);
     ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr);
-    if (!SUCCEEDED(hr)) return;
+    if (FAILED(hr)) return;
 
     hbmpdata = GlobalAlloc(GMEM_MOVEABLE, sizeof(testbmp_rle8));
     ok(hbmpdata != 0, "GlobalAlloc failed\n");
@@ -780,7 +780,7 @@ static void test_decode_rle4(void)
     hr = CoCreateInstance(&CLSID_WICBmpDecoder, NULL, CLSCTX_INPROC_SERVER,
         &IID_IWICBitmapDecoder, (void**)&decoder);
     ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr);
-    if (!SUCCEEDED(hr)) return;
+    if (FAILED(hr)) return;
 
     hbmpdata = GlobalAlloc(GMEM_MOVEABLE, sizeof(testbmp_rle4));
     ok(hbmpdata != 0, "GlobalAlloc failed\n");
@@ -999,7 +999,7 @@ static void test_createfromstream(void)
     hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER,
         &IID_IWICImagingFactory, (void**)&factory);
     ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr);
-    if (!SUCCEEDED(hr)) return;
+    if (FAILED(hr)) return;
 
     hbmpdata = GlobalAlloc(GMEM_MOVEABLE, sizeof(testbmp_1bpp));
     ok(hbmpdata != 0, "GlobalAlloc failed\n");
diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c
index d1e5c88..ee9dfbc 100644
--- a/dlls/windowscodecs/tests/palette.c
+++ b/dlls/windowscodecs/tests/palette.c
@@ -39,7 +39,7 @@ static void test_custom_palette(void)
     hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER,
         &IID_IWICImagingFactory, (void**)&factory);
     ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr);
-    if (!SUCCEEDED(hr)) return;
+    if (FAILED(hr)) return;
 
     hr = IWICImagingFactory_CreatePalette(factory, &palette);
     ok(SUCCEEDED(hr), "CreatePalette failed, hr=%x\n", hr);
-- 
1.6.4.2



More information about the wine-patches mailing list