Francois Gouget : oleaut32/tests: Replace some '#if 0's with 'if
(0)'s.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Jan 8 06:35:20 CST 2007
Module: wine
Branch: master
Commit: 3dd1a8b4f1ea16d5c4c5c4168a1f0a3bab15159b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dd1a8b4f1ea16d5c4c5c4168a1f0a3bab15159b
Author: Francois Gouget <fgouget at free.fr>
Date: Sat Jan 6 19:29:07 2007 +0100
oleaut32/tests: Replace some '#if 0's with 'if (0)'s.
---
dlls/oleaut32/tests/olepicture.c | 7 ++-----
dlls/oleaut32/tests/safearray.c | 10 ++++++----
dlls/oleaut32/tests/vartest.c | 4 +---
dlls/oleaut32/tests/vartype.c | 13 ++++++++-----
4 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c
index 64f225b..1f65c3d 100644
--- a/dlls/oleaut32/tests/olepicture.c
+++ b/dlls/oleaut32/tests/olepicture.c
@@ -75,7 +75,6 @@ static const unsigned char jpgimage[285]
0x00,0x02,0x11,0x03,0x11,0x00,0x3f,0x00,0xb2,0xc0,0x07,0xff,0xd9
};
-#if 0 /* no png support yet */
/* 1x1 pixel png */
static const unsigned char pngimage[285] = {
0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,0x44,0x52,
@@ -86,7 +85,6 @@ static const unsigned char pngimage[285]
0x54,0x08,0xd7,0x63,0xf8,0xff,0xff,0x3f,0x00,0x05,0xfe,0x02,0xfe,0xdc,0xcc,0x59,
0xe7,0x00,0x00,0x00,0x00,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
};
-#endif
/* 1x1 pixel bmp */
static const unsigned char bmpimage[66] = {
@@ -410,9 +408,8 @@ START_TEST(olepicture)
test_pic(jpgimage, sizeof(jpgimage));
test_pic(bmpimage, sizeof(bmpimage));
test_pic(gif4pixel, sizeof(gif4pixel));
- /* No PNG support yet here or in older Windows...
- test_pic(pngimage, sizeof(pngimage));
- */
+ /* FIXME: No PNG support yet in Wine or in older Windows... */
+ if (0) test_pic(pngimage, sizeof(pngimage));
test_empty_image();
test_empty_image_2();
diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c
index b80c733..429f08c 100644
--- a/dlls/oleaut32/tests/safearray.c
+++ b/dlls/oleaut32/tests/safearray.c
@@ -649,11 +649,12 @@ static void test_SafeArrayAllocDestroyDe
ok(IS_ANCIENT || hres == E_INVALIDARG,
"65536 dimensions gave hres 0x%x\n", hres);
-#if 0
+ if (0)
+ {
/* Crashes on 95: XP & Wine return E_POINTER */
hres=SafeArrayAllocDescriptor(1, NULL);
ok(hres == E_POINTER,"NULL parm gave hres 0x%x\n", hres);
-#endif
+ }
/* Test up to the dimension boundary case */
for (i = 5; i <= 65535; i += 30)
@@ -985,13 +986,14 @@ static void test_SafeArrayGetPutElement(
hres = SafeArrayGetElement(sa, NULL, &value);
ok(hres == E_INVALIDARG, "Get NULL indices hres 0x%x\n", hres);
-#if 0
+ if (0)
+ {
/* This is retarded. Windows checks every case of invalid parameters
* except the following, which crashes. We ERR this in Wine.
*/
hres = SafeArrayPutElement(sa, indices, NULL);
ok(hres == E_INVALIDARG, "Put NULL value hres 0x%x\n", hres);
-#endif
+ }
hres = SafeArrayGetElement(sa, indices, NULL);
ok(hres == E_INVALIDARG, "Get NULL value hres 0x%x\n", hres);
diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c
index d97d46f..b2bedc2 100644
--- a/dlls/oleaut32/tests/vartest.c
+++ b/dlls/oleaut32/tests/vartest.c
@@ -316,10 +316,8 @@ static void test_VariantClear(void)
LONG i4;
IUnknown *punk;
-#if 0
/* Crashes: Native does not test input for NULL, so neither does Wine */
- hres = VariantClear(NULL);
-#endif
+ if (0) hres = VariantClear(NULL);
/* Only the type field is set, to VT_EMPTY */
V_VT(&v) = VT_UI4;
diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c
index b2ec5f9..3b65a4e 100644
--- a/dlls/oleaut32/tests/vartype.c
+++ b/dlls/oleaut32/tests/vartype.c
@@ -2558,10 +2558,12 @@ static void test_VarUI8FromDec(void)
CONVERT_BADDEC(VarUI8FromDec);
-#if 0
/* This returns 1 under native; Wine fixes this bug and returns overflow */
- CONVERT_DEC(VarUI8FromDec,0,0x80,0,1);
-#endif
+ if (0)
+ {
+ CONVERT_DEC(VarUI8FromDec,0,0x80,0,1);
+ }
+
CONVERT_DEC(VarUI8FromDec,0,0,0,0); EXPECTI8(0);
CONVERT_DEC(VarUI8FromDec,0,0,0,1); EXPECTI8(1);
CONVERT_DEC(VarUI8FromDec,0,0,0,255); EXPECTI8(255);
@@ -5012,12 +5014,13 @@ static void test_SysAllocStringLen(void)
BSTR str;
/* Very early native dlls do not limit the size of strings, so skip this test */
-#if 0
+ if (0)
+ {
str = SysAllocStringLen(szTest, 0x80000000);
todo_wine {
ok (str == NULL, "Expected NULL, got %p\n", str);
}
-#endif
+ }
str = SysAllocStringLen(NULL, 0);
ok (str != NULL, "Expected non-NULL\n");
More information about the wine-cvs
mailing list