Francois Gouget : urlmon/tests: Replace some '#if 0's with 'if (0)'s.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Jan 8 06:35:21 CST 2007


Module: wine
Branch: master
Commit: f96ddb27ac0c79ff04952e7cf32e90ca91e2e0a4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f96ddb27ac0c79ff04952e7cf32e90ca91e2e0a4

Author: Francois Gouget <fgouget at free.fr>
Date:   Sat Jan  6 19:30:06 2007 +0100

urlmon/tests: Replace some '#if 0's with 'if (0)'s.

Fix the code so it compiles without warnings.

---

 dlls/urlmon/tests/url.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c
index 7734f42..0cd1e04 100644
--- a/dlls/urlmon/tests/url.c
+++ b/dlls/urlmon/tests/url.c
@@ -466,23 +466,25 @@ static HRESULT WINAPI statusclb_OnDataAv
 
     CHECK_EXPECT2(OnDataAvailable);
 
-#if 0 /* Uncomment after removing BindToStorage hack. */
+    if (0)
+    {
+    /* FIXME: Uncomment after removing BindToStorage hack. */
     ok(pformatetc != NULL, "pformatetx == NULL\n");
     if(pformatetc) {
         ok(pformatetc->cfFormat == 0xc02d, "clipformat=%x\n", pformatetc->cfFormat); 
         ok(pformatetc->ptd == NULL, "ptd = %p\n", pformatetc->ptd);
-        ok(pformatetc->dwAspect == 1, "dwAspect=%ld\n", pformatetc->dwAspect);
-        ok(pformatetc->lindex == -1, "lindex=%ld\n", pformatetc->lindex);
-        ok(pformatetc->tymed == TYMED_ISTREAM, "tymed=%ld\n", pformatetc->tymed);
+        ok(pformatetc->dwAspect == 1, "dwAspect=%u\n", pformatetc->dwAspect);
+        ok(pformatetc->lindex == -1, "lindex=%d\n", pformatetc->lindex);
+        ok(pformatetc->tymed == TYMED_ISTREAM, "tymed=%u\n", pformatetc->tymed);
     }
 
     ok(pstgmed != NULL, "stgmeg == NULL\n");
     if(pstgmed) {
-        ok(pstgmed->tymed == TYMED_ISTREAM, "tymed=%ld\n", pstgmed->tymed);
+        ok(pstgmed->tymed == TYMED_ISTREAM, "tymed=%u\n", pstgmed->tymed);
         ok(U(*pstgmed).pstm != NULL, "pstm == NULL\n");
         ok(pstgmed->pUnkForRelease != NULL, "pUnkForRelease == NULL\n");
     }
-#endif
+    }
 
     if(U(*pstgmed).pstm) {
         do hres = IStream_Read(U(*pstgmed).pstm, buf, 512, &readed);




More information about the wine-cvs mailing list