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

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


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

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

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

Fix the code so it compiles without warnings.

---

 dlls/mshtml/tests/protocol.c |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c
index 2cb50d2..a76791d 100644
--- a/dlls/mshtml/tests/protocol.c
+++ b/dlls/mshtml/tests/protocol.c
@@ -307,27 +307,29 @@ static void test_res_protocol(void)
         ok(buf[0] == '?', "buf changed\n");
         ok(size == sizeof(wrong_url1)/sizeof(WCHAR), "size=%d\n", size);
 
-#if 0   /* Crashes on win9x */
+        if (0)
+        {
+        /* Crashes on win9x */
         size = 0xdeadbeef;
         buf[0] = '?';
         hres = IInternetProtocolInfo_ParseUrl(protocol_info, NULL, PARSE_DOMAIN, 0, buf,
                 sizeof(buf)/sizeof(buf[0]), &size, 0);
-        ok(hres == E_FAIL, "ParseUrl failed: %08lx\n", hres);
+        ok(hres == E_FAIL, "ParseUrl failed: %08x\n", hres);
         ok(buf[0] == '?', "buf changed\n");
-        ok(size == 1, "size=%ld, ezpected 1\n", size);
+        ok(size == 1, "size=%u, ezpected 1\n", size);
 
         buf[0] = '?';
         hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_DOMAIN, 0, buf,
                 sizeof(buf)/sizeof(buf[0]), NULL, 0);
-        ok(hres == E_POINTER, "ParseUrl failed: %08lx\n", hres);
+        ok(hres == E_POINTER, "ParseUrl failed: %08x\n", hres);
         ok(buf[0] == '?', "buf changed\n");
 
         buf[0] = '?';
         hres = IInternetProtocolInfo_ParseUrl(protocol_info, NULL, PARSE_DOMAIN, 0, buf,
                 sizeof(buf)/sizeof(buf[0]), NULL, 0);
-        ok(hres == E_POINTER, "ParseUrl failed: %08lx\n", hres);
+        ok(hres == E_POINTER, "ParseUrl failed: %08x\n", hres);
         ok(buf[0] == '?', "buf changed\n");
-#endif
+        }
 
         buf[0] = '?';
         hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_UNESCAPE+1, 0, buf,
@@ -499,27 +501,29 @@ static void test_about_protocol(void)
         ok(buf[0] == '?', "buf changed\n");
         ok(size == sizeof(blank_url)/sizeof(WCHAR), "size=%d\n", size);
 
-#if 0   /* Crashes on win9x */
+        if (0)
+        {
+        /* Crashes on win9x */
         size = 0xdeadbeef;
         buf[0] = '?';
         hres = IInternetProtocolInfo_ParseUrl(protocol_info, NULL, PARSE_DOMAIN, 0, buf,
                 sizeof(buf)/sizeof(buf[0]), &size, 0);
-        ok(hres == E_FAIL, "ParseUrl failed: %08lx\n", hres);
+        ok(hres == E_FAIL, "ParseUrl failed: %08x\n", hres);
         ok(buf[0] == '?', "buf changed\n");
-        ok(size == 1, "size=%ld, ezpected 1\n", size);
+        ok(size == 1, "size=%u, ezpected 1\n", size);
 
         buf[0] = '?';
         hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_DOMAIN, 0, buf,
                 sizeof(buf)/sizeof(buf[0]), NULL, 0);
-        ok(hres == E_POINTER, "ParseUrl failed: %08lx\n", hres);
+        ok(hres == E_POINTER, "ParseUrl failed: %08x\n", hres);
         ok(buf[0] == '?', "buf changed\n");
 
         buf[0] = '?';
         hres = IInternetProtocolInfo_ParseUrl(protocol_info, NULL, PARSE_DOMAIN, 0, buf,
                 sizeof(buf)/sizeof(buf[0]), NULL, 0);
-        ok(hres == E_POINTER, "ParseUrl failed: %08lx\n", hres);
+        ok(hres == E_POINTER, "ParseUrl failed: %08x\n", hres);
         ok(buf[0] == '?', "buf changed\n");
-#endif
+        }
 
         hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_UNESCAPE+1, 0, buf,
                 sizeof(buf)/sizeof(buf[0]), &size, 0);




More information about the wine-cvs mailing list