January 2007 - Wine-Commits

Francois Gouget : gdi32/tests: Tweak a test to avoid an '#if 0'.
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: c579d474a4a370547c16ef265b3630135df42b13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c579d474a4a370547c16ef265… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 6 19:30:19 2007 +0100 gdi32/tests: Tweak a test to avoid an '#if 0'. --- dlls/gdi32/tests/dc.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 59555fa..72cd155 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -90,17 +90,17 @@ todo_wine } ret = IntersectClipRect(hdc, 0, 0, 50, 50); -#if 0 /* XP returns COMPLEXREGION although dump_region reports only 1 rect */ - ok(ret == SIMPLEREGION, "IntersectClipRect returned %d instead of SIMPLEREGION\n", ret); -#endif - if (ret != SIMPLEREGION) + if (ret == COMPLEXREGION) { + /* XP returns COMPLEXREGION although dump_region reports only 1 rect */ trace("Windows BUG: IntersectClipRect returned %d instead of SIMPLEREGION\n", ret); /* let's make sure that it's a simple region */ ret = GetClipRgn(hdc, hrgn); ok(ret == 1, "GetClipRgn returned %d instead of 1\n", ret); dump_region(hrgn); } + else + ok(ret == SIMPLEREGION, "IntersectClipRect returned %d instead of SIMPLEREGION\n", ret); ret = GetClipBox(hdc, &rc_clip); ok(ret == SIMPLEREGION, "GetClipBox returned %d instead of SIMPLEREGION\n", ret);

1 0

Francois Gouget : rpcrt4/tests: Remove an unneeded '#if 0' and fix the code so it compiles without warnings.
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: f43b549081e41b5abd588e20811a8bd1d638329e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f43b549081e41b5abd588e208… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 6 19:29:49 2007 +0100 rpcrt4/tests: Remove an unneeded '#if 0' and fix the code so it compiles without warnings. --- dlls/rpcrt4/tests/cstub.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index ceed0d0..ef0c156 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -869,12 +869,9 @@ static void test_delegating_Invoke(IPSFa memset(&msg, 0, sizeof(msg)); msg.dataRepresentation = NDR_LOCAL_DATA_REPRESENTATION; msg.iMethod = 3; -#if 0 /* FIXME: Figure out why this fails in Windows */ + /* FIXME: Figure out why this fails on Windows */ r = IRpcStubBuffer_Invoke(pstub, &msg, pchan); - ok(r == S_OK, "ret %08lx\n", r); -#else - pchan = NULL; /* stop compiler waring */ -#endif + ok(r == S_OK, "ret %08x\n", r); if(r == S_OK) { ok(*(DWORD*)msg.Buffer == 0xabcdef, "buf[0] %08x\n", *(DWORD*)msg.Buffer);

1 0

Francois Gouget : rpcrt4/tests: Replace some '#if 0's with 'if (0)'s, or remove them if not needed anymore.
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: 9f586f1b79407864f4d8c117ca44160c940e9ba7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f586f1b79407864f4d8c117c… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 6 19:26:59 2007 +0100 rpcrt4/tests: Replace some '#if 0's with 'if (0)'s, or remove them if not needed anymore. Fix the code so it compiles without warnings. --- dlls/rpcrt4/tests/ndr_marshall.c | 61 +++++++++++++++++++------------------ 1 files changed, 31 insertions(+), 30 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 667e86e..c625e26 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -119,36 +119,37 @@ static void test_pointer_marshal(const u StubMsg.Buffer = StubMsg.BufferStart; StubMsg.MemorySize = 0; -#if 0 /* NdrPointerMemorySize crashes under Wine, remove #if 0 when this is fixed */ + if (0) + { + /* NdrPointerMemorySize crashes under Wine */ size = NdrPointerMemorySize( &StubMsg, formattypes ); - ok(size == StubMsg.MemorySize, "%s: mem size %ld size %ld\n", msgpfx, StubMsg.MemorySize, size); - ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %ld\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); + ok(size == StubMsg.MemorySize, "%s: mem size %u size %u\n", msgpfx, StubMsg.MemorySize, size); + ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %ld\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); if(formattypes[1] & 0x10 /* FC_POINTER_DEREF */) - ok(size == srcsize + 4, "%s: mem size %ld\n", msgpfx, size); + ok(size == srcsize + 4, "%s: mem size %u\n", msgpfx, size); else - ok(size == srcsize, "%s: mem size %ld\n", msgpfx, size); + ok(size == srcsize, "%s: mem size %u\n", msgpfx, size); StubMsg.Buffer = StubMsg.BufferStart; StubMsg.MemorySize = 16; size = NdrPointerMemorySize( &StubMsg, formattypes ); - ok(size == StubMsg.MemorySize, "%s: mem size %ld size %ld\n", msgpfx, StubMsg.MemorySize, size); - ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %ld\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); + ok(size == StubMsg.MemorySize, "%s: mem size %u size %u\n", msgpfx, StubMsg.MemorySize, size); + ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %ld\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); if(formattypes[1] & 0x10 /* FC_POINTER_DEREF */) - ok(size == srcsize + 4 + 16, "%s: mem size %ld\n", msgpfx, size); + ok(size == srcsize + 4 + 16, "%s: mem size %u\n", msgpfx, size); else - ok(size == srcsize + 16, "%s: mem size %ld\n", msgpfx, size); - + ok(size == srcsize + 16, "%s: mem size %u\n", msgpfx, size); + StubMsg.Buffer = StubMsg.BufferStart; StubMsg.MemorySize = 1; size = NdrPointerMemorySize( &StubMsg, formattypes ); - ok(size == StubMsg.MemorySize, "%s: mem size %ld size %ld\n", msgpfx, StubMsg.MemorySize, size); - ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %ld\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); + ok(size == StubMsg.MemorySize, "%s: mem size %u size %u\n", msgpfx, StubMsg.MemorySize, size); + ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %ld\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); if(formattypes[1] & 0x10 /* FC_POINTER_DEREF */) - ok(size == srcsize + 4 + (srcsize == 8 ? 8 : 4), "%s: mem size %ld\n", msgpfx, size); + ok(size == srcsize + 4 + (srcsize == 8 ? 8 : 4), "%s: mem size %u\n", msgpfx, size); else - ok(size == srcsize + (srcsize == 8 ? 8 : 4), "%s: mem size %ld\n", msgpfx, size); - -#endif + ok(size == srcsize + (srcsize == 8 ? 8 : 4), "%s: mem size %u\n", msgpfx, size); + } size = srcsize; if(formattypes[1] & 0x10) size += 4; @@ -305,14 +306,12 @@ static void test_simple_types(void) 0x7, /* FC_USHORT */ 0x5c, /* FC_PAD */ }; -#if 0 static const unsigned char fmtstr_up_enum16[] = { 0x12, 0x8, /* FC_UP [simple_pointer] */ 0xd, /* FC_ENUM16 */ 0x5c, /* FC_PAD */ }; -#endif static const unsigned char fmtstr_up_long[] = { 0x12, 0x8, /* FC_UP [simple_pointer] */ @@ -382,9 +381,7 @@ static void test_simple_types(void) i = s; *(void**)wiredata = &i; -#if 0 /* Not sure why this crashes under Windows */ test_pointer_marshal(fmtstr_up_enum16, &i, 2, wiredata, 6, NULL, 0, "up_enum16"); -#endif l = 0xcafebabe; *(void**)wiredata = &l; @@ -449,12 +446,14 @@ static void test_simple_struct_marshal(c ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart); ok(!memcmp(StubMsg.BufferStart, wiredata, wiredatalen), "%s: incorrectly marshaled %08x %08x %08x\n", msgpfx, *(DWORD*)StubMsg.BufferStart,*((DWORD*)StubMsg.BufferStart+1),*((DWORD*)StubMsg.BufferStart+2)); -#if 0 + if (0) + { + /* FIXME: Causes Wine to crash */ StubMsg.Buffer = StubMsg.BufferStart; StubMsg.MemorySize = 0; size = NdrSimpleStructMemorySize( &StubMsg, formattypes ); ok(size == StubMsg.MemorySize, "%s: size != MemorySize\n", msgpfx); - ok(size == srcsize, "%s: mem size %ld\n", msgpfx, size); + ok(size == srcsize, "%s: mem size %u\n", msgpfx, size); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart); StubMsg.Buffer = StubMsg.BufferStart; @@ -462,9 +461,9 @@ static void test_simple_struct_marshal(c todo_wine { ok(size == StubMsg.MemorySize, "%s: size != MemorySize\n", msgpfx); } - ok(StubMsg.MemorySize == ((srcsize + 3) & ~3) + srcsize, "%s: mem size %ld\n", msgpfx, size); + ok(StubMsg.MemorySize == ((srcsize + 3) & ~3) + srcsize, "%s: mem size %u\n", msgpfx, size); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart); -#endif + } size = srcsize; /*** Unmarshalling first with must_alloc false ***/ @@ -668,9 +667,11 @@ static void test_simple_struct(void) *(void**)wiredata = &s1; memcpy(wiredata + 4, &s1, wiredatalen); -#if 0 /* one of the unmarshallings crashes Wine */ + if (0) + { + /* one of the unmarshallings crashes Wine */ test_pointer_marshal(fmtstr_simple_struct, &s1, 24, wiredata, 28, NULL, 0, "struct"); -#endif + } /* FC_PSTRUCT */ ps1.l1 = 0xdeadbeef; @@ -684,9 +685,11 @@ static void test_simple_struct(void) test_simple_struct_marshal(fmtstr_pointer_struct + 4, &ps1, 17, wiredata + 4, 17, ps1_cmp, 2, "pointer_struct"); *(void**)wiredata = &ps1; -#if 0 /* one of the unmarshallings crashes Wine */ + if (0) + { + /* one of the unmarshallings crashes Wine */ test_pointer_marshal(fmtstr_pointer_struct, &ps1, 17, wiredata, 21, ps1_cmp, 2, "pointer_struct"); -#endif + } } static void test_fullpointer_xlat(void) @@ -889,13 +892,11 @@ static void test_client_init(void) TEST_POINTER_UNSET(VarianceMark); ok(stubMsg.Unused == 0xcccccccc, "Unused should have be unset instead of 0x%x\n", stubMsg.Unused); TEST_POINTER_UNSET(pContext); -#if 0 TEST_ULONG_UNSET(Reserved51_1); TEST_ULONG_UNSET(Reserved51_2); TEST_ULONG_UNSET(Reserved51_3); TEST_ULONG_UNSET(Reserved51_4); TEST_ULONG_UNSET(Reserved51_5); -#endif #undef TEST_ULONG_UNSET #undef TEST_POINTER_UNSET #undef TEST_ZERO

1 0

Francois Gouget : urlmon/tests: Replace some '#if 0's with 'if (0)'s.
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: f96ddb27ac0c79ff04952e7cf32e90ca91e2e0a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f96ddb27ac0c79ff04952e7cf… Author: Francois Gouget <fgouget(a)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);

1 0

Francois Gouget : oleaut32/tests: Replace some '#if 0's with 'if (0)'s.
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: 3dd1a8b4f1ea16d5c4c5c4168a1f0a3bab15159b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dd1a8b4f1ea16d5c4c5c4168… Author: Francois Gouget <fgouget(a)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");

1 0

Francois Gouget : oleaut32/tests: Fix compilation on systems with no nameless unions (e.g. gcc 2.95).
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: ac25a3f93dcfc535f39c20a9ed0bc675913e2f9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac25a3f93dcfc535f39c20a9e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 6 19:26:12 2007 +0100 oleaut32/tests: Fix compilation on systems with no nameless unions (e.g. gcc 2.95). --- dlls/oleaut32/tests/vartest.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 845e433..d97d46f 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2406,8 +2406,8 @@ static void test_VarMod(void) else if (l == VT_DECIMAL) { V_DECIMAL(&v1).Hi32 = 0; - V_DECIMAL(&v1).Lo64 = 100; - V_DECIMAL(&v1).signscale = 0; + U1(V_DECIMAL(&v1)).Lo64 = 100; + U(V_DECIMAL(&v1)).signscale = 0; } else V_I4(&v1) = 10000; @@ -2427,8 +2427,8 @@ static void test_VarMod(void) else if (r == VT_DECIMAL) { V_DECIMAL(&v2).Hi32 = 0; - V_DECIMAL(&v2).Lo64 = 100; - V_DECIMAL(&v2).signscale = 0; + U1(V_DECIMAL(&v2)).Lo64 = 100; + U(V_DECIMAL(&v2)).signscale = 0; } else V_I4(&v2) = 10000;

1 0

Francois Gouget : setupapi/tests: Print GetLastError() in decimal with '%u' .
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: 5d0da6f6660992a9dc66b1695052bd02d68648ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d0da6f6660992a9dc66b1695… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 6 19:25:23 2007 +0100 setupapi/tests: Print GetLastError() in decimal with '%u'. --- dlls/setupapi/tests/parser.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index 4bf316d..2bb493e 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -143,20 +143,20 @@ static void test_invalid_files(void) err_line = 0xdeadbeef; hinf = test_file_contents( invalid_files[i].data, &err_line ); err = GetLastError(); - trace( "hinf=%p err=%x line=%d\n", hinf, err, err_line ); + trace( "hinf=%p err=0x%x line=%d\n", hinf, err, err_line ); if (invalid_files[i].error) /* should fail */ { ok( hinf == INVALID_HANDLE_VALUE, "file %u: Open succeeded\n", i ); if (invalid_files[i].todo) todo_wine { - ok( err == invalid_files[i].error, "file %u: Bad error %x/%x\n", + ok( err == invalid_files[i].error, "file %u: Bad error %u/%u\n", i, err, invalid_files[i].error ); ok( err_line == invalid_files[i].err_line, "file %u: Bad error line %d/%d\n", i, err_line, invalid_files[i].err_line ); } else { - ok( err == invalid_files[i].error, "file %u: Bad error %x/%x\n", + ok( err == invalid_files[i].error, "file %u: Bad error %u/%u\n", i, err, invalid_files[i].error ); ok( err_line == invalid_files[i].err_line, "file %u: Bad error line %d/%d\n", i, err_line, invalid_files[i].err_line ); @@ -165,7 +165,7 @@ static void test_invalid_files(void) else /* should succeed */ { ok( hinf != INVALID_HANDLE_VALUE, "file %u: Open failed\n", i ); - ok( err == 0, "file %u: Error code set to %x\n", i, err ); + ok( err == 0, "file %u: Error code set to %u\n", i, err ); } if (hinf != INVALID_HANDLE_VALUE) SetupCloseInfFile( hinf ); } @@ -223,23 +223,23 @@ static void test_section_names(void) { SetLastError( 0xdeadbeef ); hinf = test_file_contents( section_names[i].data, &err_line ); - ok( hinf != INVALID_HANDLE_VALUE, "line %u: open failed err %x\n", i, GetLastError() ); + ok( hinf != INVALID_HANDLE_VALUE, "line %u: open failed err %u\n", i, GetLastError() ); if (hinf == INVALID_HANDLE_VALUE) continue; ret = SetupGetLineCountA( hinf, section_names[i].section ); err = GetLastError(); - trace( "hinf=%p ret=%d err=%x\n", hinf, ret, err ); + trace( "hinf=%p ret=%d err=0x%x\n", hinf, ret, err ); if (ret != -1) { ok( !section_names[i].error, "line %u: section name %s found\n", i, section_names[i].section ); - ok( !err, "line %u: bad error code %x\n", i, err ); + ok( !err, "line %u: bad error code %u\n", i, err ); } else { ok( section_names[i].error, "line %u: section name %s not found\n", i, section_names[i].section ); - ok( err == section_names[i].error, "line %u: bad error %x/%x\n", + ok( err == section_names[i].error, "line %u: bad error %u/%u\n", i, err, section_names[i].error ); } SetupCloseInfFile( hinf ); @@ -328,12 +328,12 @@ static const char *check_key( INFCONTEXT if (!key) { ok( !wanted, "missing key %s\n", wanted ); - ok( err == 0 || err == ERROR_INVALID_PARAMETER, "last error set to %x\n", err ); + ok( err == 0 || err == ERROR_INVALID_PARAMETER, "last error set to %u\n", err ); } else { ok( !strcmp( key, wanted ), "bad key %s/%s\n", key, wanted ); - ok( err == 0, "last error set to %x\n", err ); + ok( err == 0, "last error set to %u\n", err ); } return key; } @@ -355,7 +355,7 @@ static void test_key_names(void) strcat( buffer, key_names[i].data ); SetLastError( 0xdeadbeef ); hinf = test_file_contents( buffer, &err_line ); - ok( hinf != INVALID_HANDLE_VALUE, "line %u: open failed err %x\n", i, GetLastError() ); + ok( hinf != INVALID_HANDLE_VALUE, "line %u: open failed err %u\n", i, GetLastError() ); if (hinf == INVALID_HANDLE_VALUE) continue; ret = SetupFindFirstLineA( hinf, "Test", 0, &context ); @@ -370,7 +370,7 @@ static void test_key_names(void) err = GetLastError(); if (field) { - ok( err == 0, "line %u: bad error %x\n", i, GetLastError() ); + ok( err == 0, "line %u: bad error %u\n", i, err ); if (key_names[i].fields[index]) ok( !strcmp( field, key_names[i].fields[index] ), "line %u: bad field %s/%s\n", i, field, key_names[i].fields[index] ); @@ -382,7 +382,7 @@ static void test_key_names(void) else { ok( err == 0 || err == ERROR_INVALID_PARAMETER, - "line %u: bad error %x\n", i, GetLastError() ); + "line %u: bad error %u\n", i, err ); if (key_names[i].fields[index]) ok( 0, "line %u: missing field %s\n", i, key_names[i].fields[index] ); } @@ -404,7 +404,7 @@ static void test_close_inf_file(void) { SetLastError(0xdeadbeef); SetupCloseInfFile(NULL); - ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %u\n", GetLastError()); } static const char *contents = "[Version]\n" @@ -448,7 +448,7 @@ static void test_pSetupGetField(void) ret = HeapFree( GetProcessHeap(), 0, (LPVOID)field ); ok( !ret, "Expected HeapFree to fail\n" ); ok( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError() ); + "Expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError() ); } field = pSetupGetField( &context, 3 ); @@ -458,7 +458,7 @@ static void test_pSetupGetField(void) field = pSetupGetField( &context, 4 ); ok( field == NULL, "Expected NULL, got %p\n", field ); ok( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError() ); + "Expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError() ); SetupCloseInfFile( hinf ); }

1 0

Francois Gouget : wininet/tests: Print GetLastError() in decimal with '%u'.
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: bf81fdc248405ed06aada72fa7f816afee973e6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf81fdc248405ed06aada72fa… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 6 19:25:07 2007 +0100 wininet/tests: Print GetLastError() in decimal with '%u'. --- dlls/wininet/tests/http.c | 76 ++++++++++++++++++++++---------------------- dlls/wininet/tests/url.c | 10 +++--- 2 files changed, 43 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf81fdc248405ed06aada…

1 0

Francois Gouget : winspool.drv/tests: Replace some '#if 0's with 'if (0)'s.
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: 48ca5fce3b50be4b06bf2294625418fb969180dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ca5fce3b50be4b06bf22946… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 6 19:24:22 2007 +0100 winspool.drv/tests: Replace some '#if 0's with 'if (0)'s. --- dlls/winspool.drv/tests/info.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 0963e3e..c7478b7 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -227,7 +227,8 @@ static void test_AddMonitor(void) "returned %d with %d (expected '0' with ERROR_INVALID_LEVEL)\n", res, GetLastError()); -#if 0 + if (0) + { /* This test crash with win9x on vmware (works with win9x on qemu 0.8.1) */ SetLastError(MAGIC_DEAD); res = AddMonitorA(NULL, 2, NULL); @@ -237,7 +238,7 @@ static void test_AddMonitor(void) (GetLastError() == ERROR_PRIVILEGE_NOT_HELD)), "returned %d with %d (expected '0' with: MAGIC_DEAD or " "ERROR_PRIVILEGE_NOT_HELD)\n", res, GetLastError()); -#endif + } ZeroMemory(&mi2a, sizeof(MONITOR_INFO_2A)); SetLastError(MAGIC_DEAD); @@ -260,7 +261,8 @@ static void test_AddMonitor(void) return; } -#if 0 + if (0) + { /* The Test is deactivated, because when mi2a.pName is NULL, the subkey HKLM\System\CurrentControlSet\Control\Print\Monitors\C:\WINDOWS\SYSTEM or HKLM\System\CurrentControlSet\Control\Print\Monitors\� @@ -270,7 +272,7 @@ static void test_AddMonitor(void) SetLastError(MAGIC_DEAD); res = AddMonitorA(NULL, 2, (LPBYTE) &mi2a); /* NT: ERROR_INVALID_PARAMETER, 9x: ERROR_PRIVILEGE_NOT_HELD */ -#endif + } mi2a.pEnvironment = entry->env; mi2a.pName = empty; @@ -1149,13 +1151,14 @@ static void test_GetPrintProcessorDirect "returned %d with %d (expected '0' with ERROR_INSUFFICIENT_BUFFER)\n", res, GetLastError()); -#if 0 + if (0) + { /* XPsp2: the program will crash here, when the spooler is not running */ /* GetPrinterDriverDirectory has the same bug */ pcbNeeded = 0; SetLastError(0xdeadbeef); res = GetPrintProcessorDirectoryA( NULL, NULL, 1, NULL, cbBuf, &pcbNeeded); -#endif + } buffer[0] = '\0'; SetLastError(0xdeadbeef);

1 0

Francois Gouget : shell32/tests: Hack SHGetFileInfo() so it does not crash and add a test for it.
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: d2daa384e96e21659cc33354f4d622a6224ae889 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2daa384e96e21659cc33354f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 6 19:24:06 2007 +0100 shell32/tests: Hack SHGetFileInfo() so it does not crash and add a test for it. --- dlls/shell32/shell32_main.c | 8 ++++++++ dlls/shell32/tests/shlfileop.c | 22 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 797f98e..476a4ae 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -356,6 +356,14 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR (flags & (SHGFI_ATTRIBUTES|SHGFI_EXETYPE|SHGFI_PIDL))) return FALSE; + if ( (flags & SHGFI_USEFILEATTRIBUTES) && + (flags & (SHGFI_ICONLOCATION | SHGFI_ICON | SHGFI_SYSICONINDEX)) ) + { + FIXME("This combination of flags is not supported yet\n"); + /* And it would cause a crash, so return false instead */ + return FALSE; + } + /* windows initializes these values regardless of the flags */ if (psfi != NULL) { diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index c016b56..c6d8004 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -111,6 +111,26 @@ static void clean_after_shfo_tests(void) RemoveDirectoryA("nonexistent"); } + +static void test_get_file_info(void) +{ + DWORD rc; + SHFILEINFO shfi; + + strcpy(shfi.szDisplayName, "dummy"); + shfi.iIcon=0xdeadbeef; + rc=SHGetFileInfoA("c:\\nonexistent", FILE_ATTRIBUTE_DIRECTORY, + &shfi, sizeof(shfi), + SHGFI_ICONLOCATION | SHGFI_USEFILEATTRIBUTES); + todo_wine ok(rc, "SHGetFileInfoA(c:\\nonexistent) returned %d\n", rc); + if (rc) + { + ok(strcpy(shfi.szDisplayName, "dummy") != 0, "SHGetFileInfoA(c:\\nonexistent) displayname is not set\n"); + ok(shfi.iIcon != 0xdeadbeef, "SHGetFileInfoA(c:\\nonexistent) iIcon is not set\n"); + } +} + + /* puts into the specified buffer file names with current directory. files - string with file names, separated by null characters. Ends on a double @@ -855,6 +875,8 @@ START_TEST(shlfileop) clean_after_shfo_tests(); + test_get_file_info(); + init_shfo_tests(); test_delete(); clean_after_shfo_tests();

1 0