Ros-diffs May 2006

ros-diffs@reactos.org

19 participants
377 discussions

[arty] 21996: Recompute broadcast address upon ip change (spotted by elrond)

by arty＠svn.reactos.org

Author: arty Date: Wed May 24 01:24:01 2006 New Revision: 21996 URL: http://svn.reactos.ru/svn/reactos?rev=21996&view=rev Log: Recompute broadcast address upon ip change (spotted by elrond) Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpip… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c Wed May 24 01:24:01 2006 @@ -1522,6 +1522,9 @@ IF->Unicast.Address.IPv4Address = IpAddrChange->Address; IF->Netmask.Type = IP_ADDRESS_V4; IF->Netmask.Address.IPv4Address = IpAddrChange->Netmask; + IF->Broadcast.Address.IPv4Address = + IF->Unicast.Address.IPv4Address | + ~IF->Netmask.Address.IPv4Address; TI_DbgPrint(MID_TRACE,("New Unicast Address: %x\n", IF->Unicast.Address.IPv4Address));

18 years, 5 months

[greatlrd] 21995: Fixing strechblt dib16 and dib32 can be compile with -O2 (gcc) reporeted by jimtalor, it did not work on real hardware with -O2 when it was run with winqauke with some setting see bug 1520

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed May 24 01:18:08 2006 New Revision: 21995 URL: http://svn.reactos.ru/svn/reactos?rev=21995&view=rev Log: Fixing strechblt dib16 and dib32 can be compile with -O2 (gcc) reporeted by jimtalor, it did not work on real hardware with -O2 when it was run with winqauke with some setting see bug 1520 Modified: trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c Modified: trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/dib… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c Wed May 24 01:18:08 2006 @@ -687,8 +687,9 @@ sx = ((DesX * SrcSizeX) / DesSizeX) + SourceRect->left; color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); + color = XLATEOBJ_iXlate(ColorTranslation, color); - *DestBits = XLATEOBJ_iXlate(ColorTranslation, color); + *DestBits = color; DestBits = (PULONG)((ULONG_PTR)DestBits + 2); } DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); @@ -713,8 +714,8 @@ sx = ((DesX * SrcSizeX) / DesSizeX) + SourceRect->left; color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); - - *DestBits = XLATEOBJ_iXlate(ColorTranslation, color); + color = XLATEOBJ_iXlate(ColorTranslation, color); + *DestBits = color; DestBits = (PULONG)((ULONG_PTR)DestBits + 2); } DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); @@ -740,8 +741,9 @@ sx = ((DesX * SrcSizeX) / DesSizeX) + SourceRect->left; color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); + color = XLATEOBJ_iXlate(ColorTranslation, color); - *DestBits = XLATEOBJ_iXlate(ColorTranslation, color); + *DestBits = color; DestBits = (PULONG)((ULONG_PTR)DestBits + 2); } DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); @@ -766,8 +768,9 @@ sx = ((DesX * SrcSizeX) / DesSizeX) + SourceRect->left; color = DIB_32BPP_GetPixel(SourceSurf, sx, sy); + color = XLATEOBJ_iXlate(ColorTranslation, color); - *DestBits = XLATEOBJ_iXlate(ColorTranslation, color); + *DestBits = color; DestBits = (PULONG)((ULONG_PTR)DestBits + 2); } DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); Modified: trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/dib… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c Wed May 24 01:18:08 2006 @@ -609,7 +609,8 @@ { sx = ((DesX * SrcSizeX) / DesSizeX) + SourceRect->left; color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); - *DestBits = XLATEOBJ_iXlate(ColorTranslation, color); + color = XLATEOBJ_iXlate(ColorTranslation, color); + *DestBits = color; } DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); @@ -633,7 +634,8 @@ { sx = ((DesX * SrcSizeX) / DesSizeX) + SourceRect->left; color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); - *DestBits = XLATEOBJ_iXlate(ColorTranslation, color); + color = XLATEOBJ_iXlate(ColorTranslation, color); + *DestBits = color; } DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); } @@ -656,7 +658,8 @@ { sx = ((DesX * SrcSizeX) / DesSizeX) + SourceRect->left; color = DIB_16BPP_GetPixel(SourceSurf, sx, sy); - *DestBits = XLATEOBJ_iXlate(ColorTranslation, color); + color = XLATEOBJ_iXlate(ColorTranslation, color); + *DestBits = color; } DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); } @@ -679,7 +682,8 @@ { sx = ((DesX * SrcSizeX) / DesSizeX) + SourceRect->left; color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); - *DestBits = XLATEOBJ_iXlate(ColorTranslation, color); + color = XLATEOBJ_iXlate(ColorTranslation, color); + *DestBits = color; } DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); }

18 years, 5 months

[fireball] 21994: Update msvcrt_winetest to Wine-23052006

by fireball＠svn.reactos.org

Author: fireball Date: Wed May 24 00:16:57 2006 New Revision: 21994 URL: http://svn.reactos.ru/svn/reactos?rev=21994&view=rev Log: Update msvcrt_winetest to Wine-23052006 Modified: trunk/reactos/regtests/winetests/msvcrt/cpp.c trunk/reactos/regtests/winetests/msvcrt/environ.c trunk/reactos/regtests/winetests/msvcrt/file.c trunk/reactos/regtests/winetests/msvcrt/msvcrt.rbuild trunk/reactos/regtests/winetests/msvcrt/printf.c trunk/reactos/regtests/winetests/msvcrt/scanf.c trunk/reactos/regtests/winetests/msvcrt/string.c trunk/reactos/regtests/winetests/msvcrt/testlist.c trunk/reactos/regtests/winetests/msvcrt/time.c Modified: trunk/reactos/regtests/winetests/msvcrt/cpp.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/msvcrt/c… ============================================================================== --- trunk/reactos/regtests/winetests/msvcrt/cpp.c (original) +++ trunk/reactos/regtests/winetests/msvcrt/cpp.c Wed May 24 00:16:57 2006 @@ -117,12 +117,16 @@ static void* (*p__RTCastToVoid)(void*); static void* (*p__RTDynamicCast)(void*,int,void*,void*,int); +/*Demangle*/ +static char* (*p__unDName)(char*,const char*,int,void*,void*,unsigned short int); + + /* _very_ early native versions have serious RTTI bugs, so we check */ static void* bAncientVersion; /* Emulate a __thiscall */ #ifdef _MSC_VER -__inline static void* do_call_func1(void *func, void *_this) +inline static void* do_call_func1(void *func, void *_this) { volatile void* retval = 0; __asm @@ -136,7 +140,7 @@ return (void*)retval; } -__inline static void* do_call_func2(void *func, void *_this, void* arg) +inline static void* do_call_func2(void *func, void *_this, void* arg) { volatile void* retval = 0; __asm @@ -178,7 +182,7 @@ #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) -static void InitFunctionPtrs() +static void InitFunctionPtrs(void) { hMsvcrt = LoadLibraryA("msvcrt.dll"); ok(hMsvcrt != 0, "LoadLibraryA failed\n"); @@ -238,9 +242,7 @@ SET(ptype_info_dtor, "??1type_info@@UAE@XZ"); SET(ptype_info_raw_name, "?raw_name@type_info@@QBEPBDXZ"); -#ifndef __REACTOS__ SET(ptype_info_name, "?name@type_info@@QBEPBDXZ"); -#endif SET(ptype_info_before, "?before@type_info@@QBEHABV1@@Z"); SET(ptype_info_opequals_equals, "??8type_info@@QBEHABV0@@Z"); SET(ptype_info_opnot_equals, "??9type_info@@QBEHABV0@@Z"); @@ -248,6 +250,8 @@ SET(p__RTtypeid, "__RTtypeid"); SET(p__RTCastToVoid, "__RTCastToVoid"); SET(p__RTDynamicCast, "__RTDynamicCast"); + + SET(p__unDName,"__unDName"); /* Extremely early versions export logic_error, and crash in RTTI */ SETNOFAIL(bAncientVersion, "??0logic_error@@QAE@ABQBD@Z"); @@ -814,6 +818,174 @@ ok (casted == NULL, "Cast succeeded\n"); } +struct _demangle { + LPCSTR mangled; + LPCSTR result; + BOOL test_in_wine; +}; + +static void test_demangle_datatype(void) +{ + char * name; + struct _demangle demangle[]={ +/* { "BlaBla"," ?? ::Bla", FALSE}, */ + { "ABVVec4@ref2@dice@@","class dice::ref2::Vec4 const &",TRUE}, + { "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$0H@@@", "class CDB_GEN_BIG_ENUM_FLAG<enum CDB_WYSIWYG_BITS_ENUM,7>", TRUE}, + { "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$0HO@@@", "class CDB_GEN_BIG_ENUM_FLAG<enum CDB_WYSIWYG_BITS_ENUM,126>",TRUE}, + { "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$0HOA@@@", "class CDB_GEN_BIG_ENUM_FLAG<enum CDB_WYSIWYG_BITS_ENUM,2016>",TRUE}, + { "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$0HOAA@@@", "class CDB_GEN_BIG_ENUM_FLAG<enum CDB_WYSIWYG_BITS_ENUM,32256>",TRUE}, + { "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$01@@@", "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$01@@@", FALSE}, +/* { "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$011@@@", "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$011@@@",FALSE}, */ + }; + int i, num_test = (sizeof(demangle)/sizeof(struct _demangle)); + + for (i = 0; i < num_test; i++) + { + name = p__unDName(0, demangle[i].mangled, 0, pmalloc, pfree, 0x2800); + if (demangle[i].test_in_wine) + ok(name != NULL && !strcmp(name,demangle[i].result), "Got name \"%s\" for %d\n", name, i); + else + todo_wine ok(name != NULL && !strcmp(name,demangle[i].result), "Got name %s for %d\n", name, i); + + } +} + +/* Compare two strings treating multiple spaces (' ', ascii 0x20) in s2 + as single space. Needed for test_demangle as __unDName() returns sometimes + two spaces instead of one in some older native msvcrt dlls. */ +static int strcmp_space(const char *s1, const char *s2) +{ + const char* s2start = s2; + do { + while (*s1 == *s2 && *s1) { + s1++; + s2++; + } + if (*s2 == ' ' && s2 > s2start && *(s2 - 1) == ' ') + s2++; + else + break; + } while (*s1 && *s2); + return *s1 - *s2; +} + +static void test_demangle(void) +{ + static struct {const char* in; const char* out;} test[] = { +{"??0bad_alloc@std@@QAE@ABV01@@Z", "public: __thiscall std::bad_alloc::bad_alloc(class std::bad_alloc const &)"}, +{"??0bad_alloc@std@@QAE@PBD@Z", "public: __thiscall std::bad_alloc::bad_alloc(char const *)"}, +{"??0bad_cast@@AAE@PBQBD@Z", "private: __thiscall bad_cast::bad_cast(char const * const *)"}, +{"??0bad_cast@@QAE@ABQBD@Z", "public: __thiscall bad_cast::bad_cast(char const * const &)"}, +{"??0bad_cast@@QAE@ABV0@@Z", "public: __thiscall bad_cast::bad_cast(class bad_cast const &)"}, +{"??0bad_exception@std@@QAE@ABV01@@Z", "public: __thiscall std::bad_exception::bad_exception(class std::bad_exception const &)"}, +{"??0bad_exception@std@@QAE@PBD@Z", "public: __thiscall std::bad_exception::bad_exception(char const *)"}, +{"??0?$basic_filebuf@DU?$char_traits@D@std@@@std@@QAE@ABV01@@Z", "public: __thiscall std::basic_filebuf<char,struct std::char_traits<char> >::basic_filebuf<char,struct std::char_traits<char> >(class std::basic_filebuf<char,struct std::char_traits<char> > const &)"}, +{"??0?$basic_filebuf@DU?$char_traits@D@std@@@std@@QAE@PAU_iobuf@@@Z", "public: __thiscall std::basic_filebuf<char,struct std::char_traits<char> >::basic_filebuf<char,struct std::char_traits<char> >(struct _iobuf *)"}, +{"??0?$basic_filebuf@DU?$char_traits@D@std@@@std@@QAE@W4_Uninitialized@1@@Z", "public: __thiscall std::basic_filebuf<char,struct std::char_traits<char> >::basic_filebuf<char,struct std::char_traits<char> >(enum std::_Uninitialized)"}, +{"??0?$basic_filebuf@GU?$char_traits@G@std@@@std@@QAE@ABV01@@Z", "public: __thiscall std::basic_filebuf<unsigned short,struct std::char_traits<unsigned short> >::basic_filebuf<unsigned short,struct std::char_traits<unsigned short> >(class std::basic_filebuf<unsigned short,struct std::char_traits<unsigned short> > const &)"}, +{"??0?$basic_filebuf@GU?$char_traits@G@std@@@std@@QAE@PAU_iobuf@@@Z", "public: __thiscall std::basic_filebuf<unsigned short,struct std::char_traits<unsigned short> >::basic_filebuf<unsigned short,struct std::char_traits<unsigned short> >(struct _iobuf *)"}, +{"??0?$basic_filebuf@GU?$char_traits@G@std@@@std@@QAE@W4_Uninitialized@1@@Z", "public: __thiscall std::basic_filebuf<unsigned short,struct std::char_traits<unsigned short> >::basic_filebuf<unsigned short,struct std::char_traits<unsigned short> >(enum std::_Uninitialized)"}, +{"??0?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV01@@Z", "public: __thiscall std::basic_stringstream<char,struct std::char_traits<char>,class std::allocator<char> >::basic_stringstream<char,struct std::char_traits<char>,class std::allocator<char> >(class std::basic_stringstream<char,struct std::char_traits<char>,class std::allocator<char> > const &)"}, +{"??0?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@H@Z", "public: __thiscall std::basic_stringstream<char,struct std::char_traits<char>,class std::allocator<char> >::basic_stringstream<char,struct std::char_traits<char>,class std::allocator<char> >(class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const &,int)"}, +{"??0?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@H@Z", "public: __thiscall std::basic_stringstream<char,struct std::char_traits<char>,class std::allocator<char> >::basic_stringstream<char,struct std::char_traits<char>,class std::allocator<char> >(int)"}, +{"??0?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE@ABV01@@Z", "public: __thiscall std::basic_stringstream<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> >::basic_stringstream<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> >(class std::basic_stringstream<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> > const &)"}, +{"??0?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE@ABV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@1@H@Z", "public: __thiscall std::basic_stringstream<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> >::basic_stringstream<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> >(class std::basic_string<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> > const &,int)"}, +{"??0?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE@H@Z", "public: __thiscall std::basic_stringstream<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> >::basic_stringstream<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> >(int)"}, +{"??0?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@QAE@ABV_Locinfo@1@I@Z", "public: __thiscall std::num_get<char,class std::istreambuf_iterator<char,struct std::char_traits<char> > >::num_get<char,class std::istreambuf_iterator<char,struct std::char_traits<char> > >(class std::_Locinfo const &,unsigned int)"}, +{"??0?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@QAE@I@Z", "public: __thiscall std::num_get<char,class std::istreambuf_iterator<char,struct std::char_traits<char> > >::num_get<char,class std::istreambuf_iterator<char,struct std::char_traits<char> > >(unsigned int)"}, +{"??0?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@QAE@ABV_Locinfo@1@I@Z", "public: __thiscall std::num_get<unsigned short,class std::istreambuf_iterator<unsigned short,struct std::char_traits<unsigned short> > >::num_get<unsigned short,class std::istreambuf_iterator<unsigned short,struct std::char_traits<unsigned short> > >(class std::_Locinfo const &,unsigned int)"}, +{"??0?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@QAE@I@Z", "public: __thiscall std::num_get<unsigned short,class std::istreambuf_iterator<unsigned short,struct std::char_traits<unsigned short> > >::num_get<unsigned short,class std::istreambuf_iterator<unsigned short,struct std::char_traits<unsigned short> > >(unsigned int)"}, +{"??0streambuf@@QAE@ABV0@@Z", "public: __thiscall streambuf::streambuf(class streambuf const &)"}, +{"??0strstreambuf@@QAE@ABV0@@Z", "public: __thiscall strstreambuf::strstreambuf(class strstreambuf const &)"}, +{"??0strstreambuf@@QAE@H@Z", "public: __thiscall strstreambuf::strstreambuf(int)"}, +{"??0strstreambuf@@QAE@P6APAXJ@ZP6AXPAX@Z@Z", "public: __thiscall strstreambuf::strstreambuf(void * (__cdecl*)(long),void (__cdecl*)(void *))"}, +{"??0strstreambuf@@QAE@PADH0@Z", "public: __thiscall strstreambuf::strstreambuf(char *,int,char *)"}, +{"??0strstreambuf@@QAE@PAEH0@Z", "public: __thiscall strstreambuf::strstreambuf(unsigned char *,int,unsigned char *)"}, +{"??0strstreambuf@@QAE@XZ", "public: __thiscall strstreambuf::strstreambuf(void)"}, +{"??1__non_rtti_object@std@@UAE@XZ", "public: virtual __thiscall std::__non_rtti_object::~__non_rtti_object(void)"}, +{"??1__non_rtti_object@@UAE@XZ", "public: virtual __thiscall __non_rtti_object::~__non_rtti_object(void)"}, +{"??1?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@UAE@XZ", "public: virtual __thiscall std::num_get<char,class std::istreambuf_iterator<char,struct std::char_traits<char> > >::~num_get<char,class std::istreambuf_iterator<char,struct std::char_traits<char> > >(void)"}, +{"??1?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@UAE@XZ", "public: virtual __thiscall std::num_get<unsigned short,class std::istreambuf_iterator<unsigned short,struct std::char_traits<unsigned short> > >::~num_get<unsigned short,class std::istreambuf_iterator<unsigned short,struct std::char_traits<unsigned short> > >(void)"}, +{"??4istream_withassign@@QAEAAV0@ABV0@@Z", "public: class istream_withassign & __thiscall istream_withassign::operator=(class istream_withassign const &)"}, +{"??4istream_withassign@@QAEAAVistream@@ABV1@@Z", "public: class istream & __thiscall istream_withassign::operator=(class istream const &)"}, +{"??4istream_withassign@@QAEAAVistream@@PAVstreambuf@@@Z", "public: class istream & __thiscall istream_withassign::operator=(class streambuf *)"}, +{"??5std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@0@AAV10@AAC@Z", "class std::basic_istream<char,struct std::char_traits<char> > & __cdecl std::operator>>(class std::basic_istream<char,struct std::char_traits<char> > &,signed char &)"}, +{"??5std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@0@AAV10@AAD@Z", "class std::basic_istream<char,struct std::char_traits<char> > & __cdecl std::operator>>(class std::basic_istream<char,struct std::char_traits<char> > &,char &)"}, +{"??5std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@0@AAV10@AAE@Z", "class std::basic_istream<char,struct std::char_traits<char> > & __cdecl std::operator>>(class std::basic_istream<char,struct std::char_traits<char> > &,unsigned char &)"}, +{"??6?$basic_ostream@GU?$char_traits@G@std@@@std@@QAEAAV01@P6AAAVios_base@1@AAV21@@Z@Z", "public: class std::basic_ostream<unsigned short,struct std::char_traits<unsigned short> > & __thiscall std::basic_ostream<unsigned short,struct std::char_traits<unsigned short> >::operator<<(class std::ios_base & (__cdecl*)(class std::ios_base &))"}, +{"??6?$basic_ostream@GU?$char_traits@G@std@@@std@@QAEAAV01@PAV?$basic_streambuf@GU?$char_traits@G@std@@@1@@Z", "public: class std::basic_ostream<unsigned short,struct std::char_traits<unsigned short> > & __thiscall std::basic_ostream<unsigned short,struct std::char_traits<unsigned short> >::operator<<(class std::basic_streambuf<unsigned short,struct std::char_traits<unsigned short> > *)"}, +{"??6?$basic_ostream@GU?$char_traits@G@std@@@std@@QAEAAV01@PBX@Z", "public: class std::basic_ostream<unsigned short,struct std::char_traits<unsigned short> > & __thiscall std::basic_ostream<unsigned short,struct std::char_traits<unsigned short> >::operator<<(void const *)"}, +{"??_8?$basic_fstream@DU?$char_traits@D@std@@@std@@7B?$basic_ostream@DU?$char_traits@D@std@@@1@@", "const std::basic_fstream<char,struct std::char_traits<char> >::`vbtable'{for `std::basic_ostream<char,struct std::char_traits<char> >'}"}, +{"??_8?$basic_fstream@GU?$char_traits@G@std@@@std@@7B?$basic_istream@GU?$char_traits@G@std@@@1@@", "const std::basic_fstream<unsigned short,struct std::char_traits<unsigned short> >::`vbtable'{for `std::basic_istream<unsigned short,struct std::char_traits<unsigned short> >'}"}, +{"??_8?$basic_fstream@GU?$char_traits@G@std@@@std@@7B?$basic_ostream@GU?$char_traits@G@std@@@1@@", "const std::basic_fstream<unsigned short,struct std::char_traits<unsigned short> >::`vbtable'{for `std::basic_ostream<unsigned short,struct std::char_traits<unsigned short> >'}"}, +{"??9std@@YA_NPBDABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z", "bool __cdecl std::operator!=(char const *,class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const &)"}, +{"??9std@@YA_NPBGABV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z", "bool __cdecl std::operator!=(unsigned short const *,class std::basic_string<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> > const &)"}, +{"??A?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAADI@Z", "public: char & __thiscall std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> >::operator[](unsigned int)"}, +{"??A?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEABDI@Z", "public: char const & __thiscall std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> >::operator[](unsigned int)const "}, +{"??A?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEAAGI@Z", "public: unsigned short & __thiscall std::basic_string<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> >::operator[](unsigned int)"}, +{"??A?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEABGI@Z", "public: unsigned short const & __thiscall std::basic_string<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> >::operator[](unsigned int)const "}, +{"?abs@std@@YAMABV?$complex@M@1@@Z", "float __cdecl std::abs(class std::complex<float> const &)"}, +{"?abs@std@@YANABV?$complex@N@1@@Z", "double __cdecl std::abs(class std::complex<double> const &)"}, +{"?abs@std@@YAOABV?$complex@O@1@@Z", "long double __cdecl std::abs(class std::complex<long double> const &)"}, +{"?cin@std@@3V?$basic_istream@DU?$char_traits@D@std@@@1@A", "class std::basic_istream<char,struct std::char_traits<char> > std::cin"}, +{"?do_get@?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MBE?AV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@V32@0AAVios_base@2@AAHAAG@Z", "protected: virtual class std::istreambuf_iterator<char,struct std::char_traits<char> > __thiscall std::num_get<char,class std::istreambuf_iterator<char,struct std::char_traits<char> > >::do_get(class std::istreambuf_iterator<char,struct std::char_traits<char> >,class std::istreambuf_iterator<char,struct std::char_traits<char> >,class std::ios_base &,int &,unsigned short &)const "}, +{"?do_get@?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MBE?AV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@V32@0AAVios_base@2@AAHAAI@Z", "protected: virtual class std::istreambuf_iterator<char,struct std::char_traits<char> > __thiscall std::num_get<char,class std::istreambuf_iterator<char,struct std::char_traits<char> > >::do_get(class std::istreambuf_iterator<char,struct std::char_traits<char> >,class std::istreambuf_iterator<char,struct std::char_traits<char> >,class std::ios_base &,int &,unsigned int &)const "}, +{"?do_get@?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MBE?AV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@V32@0AAVios_base@2@AAHAAJ@Z", "protected: virtual class std::istreambuf_iterator<char,struct std::char_traits<char> > __thiscall std::num_get<char,class std::istreambuf_iterator<char,struct std::char_traits<char> > >::do_get(class std::istreambuf_iterator<char,struct std::char_traits<char> >,class std::istreambuf_iterator<char,struct std::char_traits<char> >,class std::ios_base &,int &,long &)const "}, +{"?do_get@?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MBE?AV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@V32@0AAVios_base@2@AAHAAK@Z", "protected: virtual class std::istreambuf_iterator<char,struct std::char_traits<char> > __thiscall std::num_get<char,class std::istreambuf_iterator<char,struct std::char_traits<char> > >::do_get(class std::istreambuf_iterator<char,struct std::char_traits<char> >,class std::istreambuf_iterator<char,struct std::char_traits<char> >,class std::ios_base &,int &,unsigned long &)const "}, +{"?do_get@?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MBE?AV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@V32@0AAVios_base@2@AAHAAM@Z", "protected: virtual class std::istreambuf_iterator<char,struct std::char_traits<char> > __thiscall std::num_get<char,class std::istreambuf_iterator<char,struct std::char_traits<char> > >::do_get(class std::istreambuf_iterator<char,struct std::char_traits<char> >,class std::istreambuf_iterator<char,struct std::char_traits<char> >,class std::ios_base &,int &,float &)const "}, +{"?_query_new_handler@@YAP6AHI@ZXZ", "int (__cdecl*__cdecl _query_new_handler(void))(unsigned int)"}, +{"?register_callback@ios_base@std@@QAEXP6AXW4event@12@AAV12@H@ZH@Z", "public: void __thiscall std::ios_base::register_callback(void (__cdecl*)(enum std::ios_base::event,class std::ios_base &,int),int)"}, +{"?seekg@?$basic_istream@DU?$char_traits@D@std@@@std@@QAEAAV12@JW4seekdir@ios_base@2@@Z", "public: class std::basic_istream<char,struct std::char_traits<char> > & __thiscall std::basic_istream<char,struct std::char_traits<char> >::seekg(long,enum std::ios_base::seekdir)"}, +{"?seekg@?$basic_istream@DU?$char_traits@D@std@@@std@@QAEAAV12@V?$fpos@H@2@@Z", "public: class std::basic_istream<char,struct std::char_traits<char> > & __thiscall std::basic_istream<char,struct std::char_traits<char> >::seekg(class std::fpos<int>)"}, +{"?seekg@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@JW4seekdir@ios_base@2@@Z", "public: class std::basic_istream<unsigned short,struct std::char_traits<unsigned short> > & __thiscall std::basic_istream<unsigned short,struct std::char_traits<unsigned short> >::seekg(long,enum std::ios_base::seekdir)"}, +{"?seekg@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@V?$fpos@H@2@@Z", "public: class std::basic_istream<unsigned short,struct std::char_traits<unsigned short> > & __thiscall std::basic_istream<unsigned short,struct std::char_traits<unsigned short> >::seekg(class std::fpos<int>)"}, +{"?seekoff@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MAE?AV?$fpos@H@2@JW4seekdir@ios_base@2@H@Z", "protected: virtual class std::fpos<int> __thiscall std::basic_filebuf<char,struct std::char_traits<char> >::seekoff(long,enum std::ios_base::seekdir,int)"}, +{"?seekoff@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAE?AV?$fpos@H@2@JW4seekdir@ios_base@2@H@Z", "protected: virtual class std::fpos<int> __thiscall std::basic_filebuf<unsigned short,struct std::char_traits<unsigned short> >::seekoff(long,enum std::ios_base::seekdir,int)"}, +{"?set_new_handler@@YAP6AXXZP6AXXZ@Z", "void (__cdecl*__cdecl set_new_handler(void (__cdecl*)(void)))(void)"}, +{"?str@?$basic_istringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z", "public: void __thiscall std::basic_istringstream<char,struct std::char_traits<char>,class std::allocator<char> >::str(class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const &)"}, +{"?str@?$basic_istringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ", "public: class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > __thiscall std::basic_istringstream<char,struct std::char_traits<char>,class std::allocator<char> >::str(void)const "}, +{"?str@?$basic_istringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEXABV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@@Z", "public: void __thiscall std::basic_istringstream<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> >::str(class std::basic_string<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> > const &)"}, +{"?str@?$basic_istringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBE?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ", "public: class std::basic_string<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> > __thiscall std::basic_istringstream<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> >::str(void)const "}, +{"?str@?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z", "public: void __thiscall std::basic_ostringstream<char,struct std::char_traits<char>,class std::allocator<char> >::str(class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const &)"}, +{"?str@?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ", "public: class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > __thiscall std::basic_ostringstream<char,struct std::char_traits<char>,class std::allocator<char> >::str(void)const "}, +{"?str@?$basic_ostringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEXABV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@@Z", "public: void __thiscall std::basic_ostringstream<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> >::str(class std::basic_string<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> > const &)"}, +{"?str@?$basic_ostringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBE?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ", "public: class std::basic_string<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> > __thiscall std::basic_ostringstream<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> >::str(void)const "}, +{"?str@?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z", "public: void __thiscall std::basic_stringbuf<char,struct std::char_traits<char>,class std::allocator<char> >::str(class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const &)"}, +{"?str@?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ", "public: class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > __thiscall std::basic_stringbuf<char,struct std::char_traits<char>,class std::allocator<char> >::str(void)const "}, +{"?str@?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEXABV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@@Z", "public: void __thiscall std::basic_stringbuf<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> >::str(class std::basic_string<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> > const &)"}, +{"?str@?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBE?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ", "public: class std::basic_string<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> > __thiscall std::basic_stringbuf<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> >::str(void)const "}, +{"?str@?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z", "public: void __thiscall std::basic_stringstream<char,struct std::char_traits<char>,class std::allocator<char> >::str(class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const &)"}, +{"?str@?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ", "public: class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > __thiscall std::basic_stringstream<char,struct std::char_traits<char>,class std::allocator<char> >::str(void)const "}, +{"?str@?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEXABV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@@Z", "public: void __thiscall std::basic_stringstream<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> >::str(class std::basic_string<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> > const &)"}, +{"?str@?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBE?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ", "public: class std::basic_string<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> > __thiscall std::basic_stringstream<unsigned short,struct std::char_traits<unsigned short>,class std::allocator<unsigned short> >::str(void)const "}, +{"?_Sync@ios_base@std@@0_NA", "private: static bool std::ios_base::_Sync"}, +{"??_U@YAPAXI@Z", "void * __cdecl operator new[](unsigned int)"}, +{"??_V@YAXPAX@Z", "void __cdecl operator delete[](void *)"}, +{"??X?$_Complex_base@M@std@@QAEAAV01@ABM@Z", "public: class std::_Complex_base<float> & __thiscall std::_Complex_base<float>::operator*=(float const &)"}, +{"??Xstd@@YAAAV?$complex@M@0@AAV10@ABV10@@Z", "class std::complex<float> & __cdecl std::operator*=(class std::complex<float> &,class std::complex<float> const &)"}, +{"?aaa@@YAHAAUbbb@@@Z", "int __cdecl aaa(struct bbb &)"}, +{"?aaa@@YAHBAUbbb@@@Z", "int __cdecl aaa(struct bbb & volatile)"}, +{"?aaa@@YAHPAUbbb@@@Z", "int __cdecl aaa(struct bbb *)"}, +{"?aaa@@YAHQAUbbb@@@Z", "int __cdecl aaa(struct bbb * const)"}, +{"?aaa@@YAHRAUbbb@@@Z", "int __cdecl aaa(struct bbb * volatile)"}, +{"?aaa@@YAHSAUbbb@@@Z", "int __cdecl aaa(struct bbb * const volatile)"}, +{"??0aa.a@@QAE@XZ", "??0aa.a@@QAE@XZ"}, +{"??0aa$_3a@@QAE@XZ", "public: __thiscall aa$_3a::aa$_3a(void)"}, +{"??2?$aaa@AAUbbb@@AAUccc@@AAU2@@ddd@1eee@2@QAEHXZ", "public: int __thiscall eee::eee::ddd::ddd::aaa<struct bbb &,struct ccc &,struct ccc &>::operator new(void)"}, +{"?pSW@@3P6GHKPAX0PAU_tagSTACKFRAME@@0P6GH0K0KPAK@ZP6GPAX0K@ZP6GK0K@ZP6GK00PAU_tagADDRESS@@@Z@ZA", "int (__stdcall* pSW)(unsigned long,void *,void *,struct _tagSTACKFRAME *,void *,int (__stdcall*)(void *,unsigned long,void *,unsigned long,unsigned long *),void * (__stdcall*)(void *,unsigned long),unsigned long (__stdcall*)(void *,unsigned long),unsigned long (__stdcall*)(void *,void *,struct _tagADDRESS *))"}, + }; + int i, num_test = (sizeof(test)/sizeof(test[0])); + char* name; + + for (i = 0; i < num_test; i++) + { + name = p__unDName(0, test[i].in, 0, pmalloc, pfree, 0); + ok(name != NULL && !strcmp_space(test[i].out, name), + "Got name \"%s\" for %d\n", name, i); + pfree(name); + } +} + START_TEST(cpp) { InitFunctionPtrs(); @@ -824,6 +996,8 @@ test___non_rtti_object(); test_type_info(); test_rtti(); + test_demangle_datatype(); + test_demangle(); if (hMsvcrt) FreeLibrary(hMsvcrt); Modified: trunk/reactos/regtests/winetests/msvcrt/environ.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/msvcrt/e… ============================================================================== --- trunk/reactos/regtests/winetests/msvcrt/environ.c (original) +++ trunk/reactos/regtests/winetests/msvcrt/environ.c Wed May 24 00:16:57 2006 @@ -23,16 +23,13 @@ START_TEST(environ) { -#ifndef __REACTOS__ - ok( _putenv("cat=") == 0, "_putenv failed on deletion of non-existent environment variable\n" ); -#endif + ok( _putenv("cat=") == 0, "_putenv failed on deletion of nonexistent environment variable\n" ); ok( _putenv("cat=dog") == 0, "failed setting cat=dog\n" ); ok( strcmp(getenv("cat"), "dog") == 0, "getenv did not return 'dog'\n" ); ok( _putenv("cat=") == 0, "failed deleting cat\n" ); ok( _putenv("=") == -1, "should not accept '=' as input\n" ); -#ifndef __REACTOS__ ok( _putenv("=dog") == -1, "should not accept '=dog' as input\n" ); -#endif + ok( getenv("nonexistent") == NULL, "getenv should fail with nonexistent var name\n" ); } Modified: trunk/reactos/regtests/winetests/msvcrt/file.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/msvcrt/f… ============================================================================== --- trunk/reactos/regtests/winetests/msvcrt/file.c (original) +++ trunk/reactos/regtests/winetests/msvcrt/file.c Wed May 24 00:16:57 2006 @@ -2,6 +2,7 @@ * Unit test suite for file functions * * Copyright 2002 Bill Currie + * Copyright 2005 Paul Rupe * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -58,6 +59,8 @@ WCHAR wbuffer[256]; int fd; FILE *file; + fpos_t pos; + int i, c; fd = open ("fdopen.tst", O_WRONLY | O_CREAT | O_BINARY, _S_IREAD |_S_IWRITE); write (fd, outbuffer, sizeof (outbuffer)); @@ -71,10 +74,39 @@ ok(feof(file) !=0,"feof doesn't signal EOF\n"); rewind(file); ok(fgets(buffer,strlen(outbuffer),file) !=0,"fgets failed unexpected\n"); - ok(lstrlenA(buffer) == strlen(outbuffer) -1,"fgets didn't read right size\n"); + ok(lstrlenA(buffer) == lstrlenA(outbuffer) -1,"fgets didn't read right size\n"); ok(fgets(buffer,sizeof(outbuffer),file) !=0,"fgets failed unexpected\n"); ok(strlen(buffer) == 1,"fgets dropped chars\n"); ok(buffer[0] == outbuffer[strlen(outbuffer)-1],"fgets exchanged chars\n"); + + rewind(file); + for (i = 0, c = EOF; i < sizeof(outbuffer); i++) + { + ok((c = fgetc(file)) == outbuffer[i], "fgetc returned wrong data\n"); + } + ok((c = fgetc(file)) == EOF, "getc did not return EOF\n"); + ok(feof(file), "feof did not return EOF\n"); + ok(ungetc(c, file) == EOF, "ungetc(EOF) did not return EOF\n"); + ok(feof(file), "feof after ungetc(EOF) did not return EOF\n"); + ok((c = fgetc(file)) == EOF, "getc did not return EOF\n"); + c = outbuffer[sizeof(outbuffer) - 1]; + ok(ungetc(c, file) == c, "ungetc did not return its input\n"); + ok(!feof(file), "feof after ungetc returned EOF\n"); + ok((c = fgetc(file)) != EOF, "getc after ungetc returned EOF\n"); + ok(c == outbuffer[sizeof(outbuffer) - 1], + "getc did not return ungetc'd data\n"); + ok(!feof(file), "feof after getc returned EOF prematurely\n"); + ok((c = fgetc(file)) == EOF, "getc did not return EOF\n"); + ok(feof(file), "feof after getc did not return EOF\n"); + + rewind(file); + ok(fgetpos(file,&pos) == 0, "fgetpos failed unexpected\n"); + ok(pos == 0, "Unexpected result of fgetpos 0x%Lx\n", pos); + pos = (ULONGLONG)sizeof (outbuffer); + ok(fsetpos(file, &pos) == 0, "fsetpos failed unexpected\n"); + ok(fgetpos(file,&pos) == 0, "fgetpos failed unexpected\n"); + ok(pos == (ULONGLONG)sizeof (outbuffer), "Unexpected result of fgetpos 0x%Lx\n", pos); + fclose (file); fd = open ("fdopen.tst", O_RDONLY | O_TEXT); file = fdopen (fd, "rt"); /* open in TEXT mode */ @@ -83,10 +115,19 @@ ok(feof(file) !=0,"feof doesn't signal EOF\n"); rewind(file); ok(fgetws(wbuffer,strlen(outbuffer),file) !=0,"fgetws failed unexpected\n"); - ok(lstrlenW(wbuffer) == (strlen(outbuffer) -1),"fgetws didn't read right size\n"); + ok(lstrlenW(wbuffer) == (lstrlenA(outbuffer) -1),"fgetws didn't read right size\n"); ok(fgetws(wbuffer,sizeof(outbuffer),file) !=0,"fgets failed unexpected\n"); ok(lstrlenW(wbuffer) == 1,"fgets dropped chars\n"); fclose (file); + + file = fopen("fdopen.tst", "rb"); + ok( file != NULL, "fopen failed\n"); + /* sizeof(buffer) > content of file */ + ok(fread(buffer, sizeof(buffer), 1, file) == 0, "fread test failed\n"); + /* feof should be set now */ + ok(feof(file), "feof after fread failed\n"); + fclose (file); + unlink ("fdopen.tst"); } @@ -187,10 +228,12 @@ static const char mytext[]= "This is test_file_write_read\nsecond line\n"; static const char dostext[]= "This is test_file_write_read\r\nsecond line\r\n"; char btext[LLEN]; + int ret; tempf=_tempnam(".","wne"); - ok((tempfd = _open(tempf,_O_CREAT|_O_TRUNC|_O_TEXT|_O_RDWR, - _S_IREAD | _S_IWRITE)) != -1, + tempfd = _open(tempf,_O_CREAT|_O_TRUNC|_O_TEXT|_O_RDWR, + _S_IREAD | _S_IWRITE); + ok( tempfd != -1, "Can't open '%s': %d\n", tempf, errno); /* open in TEXT mode */ ok(_write(tempfd,mytext,strlen(mytext)) == lstrlenA(mytext), "_write _O_TEXT bad return value\n"); @@ -208,10 +251,34 @@ ok( memcmp(mytext,btext,strlen(mytext)) == 0, "problems with _O_TEXT _write / _read\n"); _close(tempfd); - ok(unlink(tempf) !=-1 ,"Can't unlink '%s': %d\n", tempf, errno); + + memset(btext, 0, LLEN); + tempfd = _open(tempf,_O_APPEND|_O_RDWR); /* open for APPEND in default mode */ + ok(tell(tempfd) == 0, "bad position %lu expecting 0\n", tell(tempfd)); + ok(_read(tempfd,btext,LLEN) == lstrlenA(mytext), "_read _O_APPEND got bad length\n"); + ok( memcmp(mytext,btext,strlen(mytext)) == 0, "problems with _O_APPEND _read\n"); + _close(tempfd); + + /* Test reading only \n or \r */ + tempfd = _open(tempf,_O_RDONLY|_O_TEXT); /* open in TEXT mode */ + _lseek(tempfd, -1, FILE_END); + ret = _read(tempfd,btext,LLEN); + ok(ret == 1, "_read expected 1 got bad length: %d\n", ret); + _lseek(tempfd, -2, FILE_END); + ret = _read(tempfd,btext,LLEN); + ok(ret == 1 && *btext == '\n', "_read expected '\\n' got bad length: %d\n", ret); + _lseek(tempfd, -3, FILE_END); + ret = _read(tempfd,btext,2); + todo_wine ok(ret == 1 && *btext == 'e', "_read expected 'e' got \"%.*s\" bad length: %d\n", ret, btext, ret); + todo_wine ok(tell(tempfd) == 42, "bad position %lu expecting 42\n", tell(tempfd)); + _close(tempfd); + + ret = unlink(tempf); + ok( ret == 0 ,"Can't unlink '%s': %d\n", tempf, errno); tempf=_tempnam(".","wne"); - ok((tempfd = _open(tempf,_O_CREAT|_O_TRUNC|_O_BINARY|_O_RDWR,0)) != -1, + tempfd = _open(tempf,_O_CREAT|_O_TRUNC|_O_BINARY|_O_RDWR,0); + ok( tempfd != -1, "Can't open '%s': %d\n", tempf, errno); /* open in BINARY mode */ ok(_write(tempfd,dostext,strlen(dostext)) == lstrlenA(dostext), "_write _O_BINARY bad return value\n"); @@ -230,17 +297,21 @@ "problems with _O_BINARY _write / _O_TEXT _read\n"); _close(tempfd); - ok(_chmod (tempf, _S_IREAD | _S_IWRITE) == 0, + ret =_chmod (tempf, _S_IREAD | _S_IWRITE); + ok( ret == 0, "Can't chmod '%s' to read-write: %d\n", tempf, errno); - ok(unlink(tempf) !=-1 ,"Can't unlink '%s': %d\n", tempf, errno); + ret = unlink(tempf); + ok( ret == 0 ,"Can't unlink '%s': %d\n", tempf, errno); } static void test_file_inherit_child(const char* fd_s) { int fd = atoi(fd_s); char buffer[32]; - - ok(write(fd, "Success", 8) == 8, "Couldn't write in child process on %d (%s)\n", fd, strerror(errno)); + int ret; + + ret =write(fd, "Success", 8); + ok( ret == 8, "Couldn't write in child process on %d (%s)\n", fd, strerror(errno)); lseek(fd, 0, SEEK_SET); ok(read(fd, buffer, sizeof (buffer)) == 8, "Couldn't read back the data\n"); ok(memcmp(buffer, "Success", 8) == 0, "Couldn't read back the data\n"); @@ -249,8 +320,10 @@ static void test_file_inherit_child_no(const char* fd_s) { int fd = atoi(fd_s); - - ok(write(fd, "Success", 8) == -1 && errno == EBADF, + int ret; + + ret = write(fd, "Success", 8); + ok( ret == -1 && errno == EBADF, "Wrong write result in child process on %d (%s)\n", fd, strerror(errno)); } @@ -261,7 +334,7 @@ char buffer[16]; fd = open ("fdopen.tst", O_CREAT | O_RDWR | O_BINARY, _S_IREAD |_S_IWRITE); - ok(fd != -1, "Couldn't create test file\n "); + ok(fd != -1, "Couldn't create test file\n"); arg_v[0] = selfname; arg_v[1] = "tests/file.c"; arg_v[2] = buffer; sprintf(buffer, "%d", fd); @@ -271,10 +344,10 @@ lseek(fd, 0, SEEK_SET); ok(read(fd, buffer, sizeof (buffer)) == 8 && memcmp(buffer, "Success", 8) == 0, "Couldn't read back the data\n"); close (fd); - ok(unlink("fdopen.tst") != 1, "Couldn't unlink\n"); + ok(unlink("fdopen.tst") == 0, "Couldn't unlink\n"); fd = open ("fdopen.tst", O_CREAT | O_RDWR | O_BINARY | O_NOINHERIT, _S_IREAD |_S_IWRITE); - ok(fd != -1, "Couldn't create test file\n "); + ok(fd != -1, "Couldn't create test file\n"); arg_v[0] = selfname; arg_v[1] = "tests/file.c"; arg_v[2] = buffer; sprintf(buffer, "%d", fd); @@ -284,7 +357,7 @@ ok(tell(fd) == 0, "bad position %lu expecting 0\n", tell(fd)); ok(read(fd, buffer, sizeof (buffer)) == 0, "Found unexpected data (%s)\n", buffer); close (fd); - ok(unlink("fdopen.tst") != 1, "Couldn't unlink\n"); + ok(unlink("fdopen.tst") == 0, "Couldn't unlink\n"); } static void test_tmpnam( void ) @@ -306,7 +379,90 @@ ok(res[strlen(res)-1] != '.', "second call - last character is a dot\n"); } - +static void test_chsize( void ) +{ + int fd; + long cur, pos, count; + char temptext[] = "012345678"; + char *tempfile = _tempnam( ".", "tst" ); + + ok( tempfile != NULL, "Couldn't create test file: %s\n", tempfile ); + + fd = _open( tempfile, _O_CREAT|_O_TRUNC|_O_RDWR, _S_IREAD|_S_IWRITE ); + ok( fd > 0, "Couldn't open test file\n" ); + + count = _write( fd, temptext, sizeof(temptext) ); + ok( count > 0, "Couldn't write to test file\n" ); + + /* get current file pointer */ + cur = _lseek( fd, 0, SEEK_CUR ); + + /* make the file smaller */ + ok( _chsize( fd, sizeof(temptext) / 2 ) == 0, "_chsize() failed\n" ); + + pos = _lseek( fd, 0, SEEK_CUR ); + ok( cur == pos, "File pointer changed from: %ld to: %ld\n", cur, pos ); + ok( _filelength( fd ) == sizeof(temptext) / 2, "Wrong file size\n" ); + + /* enlarge the file */ + ok( _chsize( fd, sizeof(temptext) * 2 ) == 0, "_chsize() failed\n" ); + + pos = _lseek( fd, 0, SEEK_CUR ); + ok( cur == pos, "File pointer changed from: %ld to: %ld\n", cur, pos ); + ok( _filelength( fd ) == sizeof(temptext) * 2, "Wrong file size\n" ); + + _close( fd ); + _unlink( tempfile ); +} + +static void test_fopen_fclose_fcloseall( void ) +{ + char fname1[] = "empty1"; + char fname2[] = "empty2"; + char fname3[] = "empty3"; + FILE *stream1, *stream2, *stream3, *stream4; + int ret, numclosed; + + /* testing fopen() */ + stream1 = fopen(fname1, "w+"); + ok(stream1 != NULL, "The file '%s' was not opened\n", fname1); + stream2 = fopen(fname2, "w "); + ok(stream2 != NULL, "The file '%s' was not opened\n", fname2 ); + _unlink(fname3); + stream3 = fopen(fname3, "r"); + ok(stream3 == NULL, "The file '%s' shouldn't exist before\n", fname3 ); + stream3 = fopen(fname3, "w+"); + ok(stream3 != NULL, "The file '%s' should be opened now\n", fname3 ); + errno = 0xfaceabad; + stream4 = fopen("", "w+"); + ok(stream4 == NULL && errno == ENOENT, + "filename is empty, errno = %d (expected 2)\n", errno); + errno = 0xfaceabad; + stream4 = fopen(NULL, "w+"); + ok(stream4 == NULL && (errno == EINVAL || errno == ENOENT), + "filename is NULL, errno = %d (expected 2 or 22)\n", errno); + + /* testing fclose() */ + ret = fclose(stream2); + ok(ret == 0, "The file '%s' was not closed\n", fname2); + ret = fclose(stream3); + ok(ret == 0, "The file '%s' was not closed\n", fname3); + ret = fclose(stream2); + ok(ret == EOF, "Closing file '%s' returned %d\n", fname2, ret); + ret = fclose(stream3); + ok(ret == EOF, "Closing file '%s' returned %d\n", fname3, ret); + + /* testing fcloseall() */ + numclosed = _fcloseall(); + /* fname1 should be closed here */ + ok(numclosed == 1, "Number of files closed by fcloseall(): %u\n", numclosed); + numclosed = _fcloseall(); + ok(numclosed == 0, "Number of files closed by fcloseall(): %u\n", numclosed); + + ok(_unlink(fname1) == 0, "Couldn't unlink file named '%s'\n", fname1); + ok(_unlink(fname2) == 0, "Couldn't unlink file named '%s'\n", fname2); + ok(_unlink(fname3) == 0, "Couldn't unlink file named '%s'\n", fname3); +} START_TEST(file) { @@ -315,17 +471,22 @@ arg_c = winetest_get_mainargs( &arg_v ); + /* testing low-level I/O */ if (arg_c >= 3) { - if (arg_c == 3) test_file_inherit_child(arg_v[2]); else test_file_inherit_child_no(arg_v[2]); + if (arg_c == 3) test_file_inherit_child(arg_v[2]); + else test_file_inherit_child_no(arg_v[2]); return; } - + test_file_inherit(arg_v[0]); + test_file_write_read(); + test_chsize(); + + /* testing stream I/O */ test_fdopen(); + test_fopen_fclose_fcloseall(); test_fileops(); test_fgetwc(); test_file_put_get(); - test_file_write_read(); - test_file_inherit(arg_v[0]); test_tmpnam(); } Modified: trunk/reactos/regtests/winetests/msvcrt/msvcrt.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/msvcrt/m… ============================================================================== --- trunk/reactos/regtests/winetests/msvcrt/msvcrt.rbuild (original) +++ trunk/reactos/regtests/winetests/msvcrt/msvcrt.rbuild Wed May 24 00:16:57 2006 @@ -3,6 +3,7 @@ <define name="__USE_W32API" /> <library>ntdll</library> <file>cpp.c</file> + <file>dir.c</file> <file>environ.c</file> <file>file.c</file> <file>heap.c</file> Modified: trunk/reactos/regtests/winetests/msvcrt/printf.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/msvcrt/p… ============================================================================== --- trunk/reactos/regtests/winetests/msvcrt/printf.c (original) +++ trunk/reactos/regtests/winetests/msvcrt/printf.c Wed May 24 00:16:57 2006 @@ -3,6 +3,7 @@ * * Copyright 2002 Uwe Bonnes * Copyright 2004 Aneurin Price + * Copyright 2005 Mike McCormack * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,54 +27,439 @@ static void test_sprintf( void ) { char buffer[100]; - const char *I64d = "%I64d"; - const char *O4c = "%04c"; - const char *O4s = "%04s"; - const char *hash012p = "%#012p"; + const char *format; double pnumber=789456123; -/** WCHAR widestring[]={'w','i','d','e','s','t','r','i','n','g',0};**/ - sprintf(buffer,"%+#23.15e",pnumber); - todo_wine - { - ok(strstr(buffer,"e+008") != 0,"Sprintf different \"%s\"\n",buffer); - } - sprintf(buffer,I64d,((ULONGLONG)0xffffffff)*0xffffffff); - todo_wine - { - ok(strlen(buffer) == 11,"Problem with long long \"%s\"\n",buffer); - } - sprintf(buffer,"%lld",((ULONGLONG)0xffffffff)*0xffffffff); - todo_wine - { - ok(strlen(buffer) == 1,"Problem with \"ll\" interpretation \"%s\"\n",buffer); - } -/** This one actually crashes WINE at the moment, when using builtin msvcrt.dll. - sprintf(buffer,"%S",widestring); - todo_wine - { - ok(strlen(buffer) == 10,"Problem with \"%%S\" interpretation \"%s\"\n",buffer); - } - **/ - sprintf(buffer,O4c,'1'); - todo_wine - { - ok(!strcmp(buffer,"0001"),"Character not zero-prefixed \"%s\"\n",buffer); - } - sprintf(buffer,"%p",(void *)57); - todo_wine - { - ok(!strcmp(buffer,"00000039"),"Pointer formatted incorrectly \"%s\"\n",buffer); - } - sprintf(buffer,hash012p,(void *)57); - todo_wine - { - ok(!strcmp(buffer," 0X00000039"),"Pointer formatted incorrectly \"%s\"\n",buffer); - } - sprintf(buffer,O4s,"foo");/**Warning again**/ - todo_wine - { - ok(!strcmp(buffer,"0foo"),"String not zero-prefixed \"%s\"\n",buffer); - } + int x, r; + WCHAR wide[] = { 'w','i','d','e',0}; + + format = "%+#23.15e"; + r = sprintf(buffer,format,pnumber); + todo_wine { + ok(!strcmp(buffer,"+7.894561230000000e+008"),"exponent format incorrect\n"); + } + ok( r==23, "return count wrong\n"); + + format = "%I64d"; + r = sprintf(buffer,format,((ULONGLONG)0xffffffff)*0xffffffff); + ok(!strcmp(buffer,"-8589934591"),"Problem with long long\n"); + ok( r==11, "return count wrong\n"); + + format = "%+8I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer," +100") && r==8,"+8I64d failed: '%s'\n", buffer); + + format = "%+.8I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer,"+00000100") && r==9,"+.8I64d failed: '%s'\n", buffer); + + format = "%+10.8I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer," +00000100") && r==10,"+10.8I64d failed: '%s'\n", buffer); + format = "%_1I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer,"_1I64d") && r==6,"_1I64d failed\n"); + + format = "%-1.5I64d"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer,"-00100") && r==6,"-1.5I64d failed: '%s'\n", buffer); + + format = "%5I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer," 100") && r==5,"5I64d failed: '%s'\n", buffer); + + format = "%5I64d"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer," -100") && r==5,"5I64d failed: '%s'\n", buffer); + + format = "%-5I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer,"100 ") && r==5,"-5I64d failed: '%s'\n", buffer); + + format = "%-5I64d"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer,"-100 ") && r==5,"-5I64d failed: '%s'\n", buffer); + + format = "%-.5I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer,"00100") && r==5,"-.5I64d failed: '%s'\n", buffer); + + format = "%-.5I64d"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer,"-00100") && r==6,"-.5I64d failed: '%s'\n", buffer); + + format = "%-8.5I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer,"00100 ") && r==8,"-8.5I64d failed: '%s'\n", buffer); + + format = "%-8.5I64d"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer,"-00100 ") && r==8,"-8.5I64d failed: '%s'\n", buffer); + + format = "%05I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer,"00100") && r==5,"05I64d failed: '%s'\n", buffer); + + format = "%05I64d"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer,"-0100") && r==5,"05I64d failed: '%s'\n", buffer); + + format = "% I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer," 100") && r==4,"' I64d' failed: '%s'\n", buffer); + + format = "% I64d"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer,"-100") && r==4,"' I64d' failed: '%s'\n", buffer); + + format = "% 5I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer," 100") && r==5,"' 5I64d' failed: '%s'\n", buffer); + + format = "% 5I64d"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer," -100") && r==5,"' 5I64d' failed: '%s'\n", buffer); + + format = "% .5I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer," 00100") && r==6,"' .5I64d' failed: '%s'\n", buffer); + + format = "% .5I64d"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer,"-00100") && r==6,"' .5I64d' failed: '%s'\n", buffer); + + format = "% 8.5I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer," 00100") && r==8,"' 8.5I64d' failed: '%s'\n", buffer); + + format = "% 8.5I64d"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer," -00100") && r==8,"' 8.5I64d' failed: '%s'\n", buffer); + + format = "%.0I64d"; + r = sprintf(buffer,format,(LONGLONG)0); + ok(r==0,".0I64d failed: '%s'\n", buffer); + + format = "%#+21.18I64x"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer," 0x00ffffffffffffff9c") && r==21,"#+21.18I64x failed: '%s'\n", buffer); + + format = "%#.25I64o"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer,"0001777777777777777777634") && r==25,"#.25I64o failed: '%s'\n", buffer); + + format = "%#+24.20I64o"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer," 01777777777777777777634") && r==24,"#+24.20I64o failed: '%s'\n", buffer); + + format = "%#+18.21I64X"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer,"0X00000FFFFFFFFFFFFFF9C") && r==23,"#+18.21I64X failed: '%s '\n", buffer); + + format = "%#+20.24I64o"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer,"001777777777777777777634") && r==24,"#+20.24I64o failed: '%s'\n", buffer); + + format = "%#+25.22I64u"; + r = sprintf(buffer,format,(LONGLONG)-1); + ok(!strcmp(buffer," 0018446744073709551615") && r==25,"#+25.22I64u conversion failed: '%s'\n", buffer); + + format = "%#+25.22I64u"; + r = sprintf(buffer,format,(LONGLONG)-1); + ok(!strcmp(buffer," 0018446744073709551615") && r==25,"#+25.22I64u failed: '%s'\n", buffer); + + format = "%#+30.25I64u"; + r = sprintf(buffer,format,(LONGLONG)-1); + ok(!strcmp(buffer," 0000018446744073709551615") && r==30,"#+30.25I64u failed: '%s'\n", buffer); + + format = "%+#25.22I64d"; + r = sprintf(buffer,format,(LONGLONG)-1); + ok(!strcmp(buffer," -0000000000000000000001") && r==25,"+#25.22I64d failed: '%s'\n", buffer); + + format = "%#-8.5I64o"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer,"00144 ") && r==8,"-8.5I64o failed: '%s'\n", buffer); + + format = "%#-+ 08.5I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer,"+00100 ") && r==8,"'#-+ 08.5I64d failed: '%s'\n", buffer); + + format = "%#-+ 08.5I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer,"+00100 ") && r==8,"#-+ 08.5I64d failed: '%s'\n", buffer); + + format = "%lld"; + r = sprintf(buffer,format,((ULONGLONG)0xffffffff)*0xffffffff); + ok(!strcmp(buffer, "1"), "Problem with \"ll\" interpretation\n"); + ok( r==1, "return count wrong\n"); + + format = "%I"; + r = sprintf(buffer,format,1); + ok(!strcmp(buffer, "I"), "Problem with \"I\" interpretation\n"); + ok( r==1, "return count wrong\n"); + + format = "%I0d"; + r = sprintf(buffer,format,1); + ok(!strcmp(buffer,"I0d"),"I0d failed\n"); + ok( r==3, "return count wrong\n"); + + format = "%I32d"; + r = sprintf(buffer,format,1); + ok(!strcmp(buffer,"1"),"I32d failed\n"); + ok( r==1, "return count wrong\n"); + + format = "%I64D"; + r = sprintf(buffer,format,(LONGLONG)-1); + ok(!strcmp(buffer,"D"),"I64D failed: %s\n",buffer); + ok( r==1, "return count wrong\n"); + + format = "% d"; + r = sprintf(buffer,format,1); + ok(!strcmp(buffer, " 1"),"Problem with sign place-holder: '%s'\n",buffer); + ok( r==2, "return count wrong\n"); + + format = "%+ d"; + r = sprintf(buffer,format,1); + ok(!strcmp(buffer, "+1"),"Problem with sign flags: '%s'\n",buffer); + ok( r==2, "return count wrong\n"); + + format = "%S"; + r = sprintf(buffer,format,wide); + ok(!strcmp(buffer,"wide"),"Problem with wide string format\n"); + ok( r==4, "return count wrong\n"); + + format = "%04c"; + r = sprintf(buffer,format,'1'); + ok(!strcmp(buffer,"0001"),"Character not zero-prefixed \"%s\"\n",buffer); + ok( r==4, "return count wrong\n"); + + format = "%-04c"; + r = sprintf(buffer,format,'1'); + ok(!strcmp(buffer,"1 "),"Character zero-padded and/or not left-adjusted \"%s\"\n",buffer); + ok( r==4, "return count wrong\n"); + + format = "%p"; + r = sprintf(buffer,format,(void *)57); + ok(!strcmp(buffer,"00000039"),"Pointer formatted incorrectly \"%s\"\n",buffer); + ok( r==8, "return count wrong\n"); + + format = "%#012p"; + r = sprintf(buffer,format,(void *)57); + ok(!strcmp(buffer," 0X00000039"),"Pointer formatted incorrectly\n"); + ok( r==12, "return count wrong\n"); + + format = "%Fp"; + r = sprintf(buffer,format,(void *)57); + ok(!strcmp(buffer,"00000039"),"Pointer formatted incorrectly \"%s\"\n",buffer); + ok( r==8, "return count wrong\n"); + + format = "%04s"; + r = sprintf(buffer,format,"foo"); + ok(!strcmp(buffer,"0foo"),"String not zero-prefixed \"%s\"\n",buffer); + ok( r==4, "return count wrong\n"); + + format = "%.1s"; + r = sprintf(buffer,format,"foo"); + ok(!strcmp(buffer,"f"),"Precision ignored \"%s\"\n",buffer); + ok( r==1, "return count wrong\n"); + + format = "%.*s"; + r = sprintf(buffer,format,1,"foo"); + ok(!strcmp(buffer,"f"),"Precision ignored \"%s\"\n",buffer); + ok( r==1, "return count wrong\n"); + + format = "%#-012p"; + r = sprintf(buffer,format,(void *)57); + ok(!strcmp(buffer,"0X00000039 "),"Pointer formatted incorrectly\n"); + ok( r==12, "return count wrong\n"); + + format = "hello"; + r = sprintf(buffer, format); + ok(!strcmp(buffer,"hello"), "failed\n"); + ok( r==5, "return count wrong\n"); + + format = "%ws"; + r = sprintf(buffer, format, wide); + ok(!strcmp(buffer,"wide"), "failed\n"); + ok( r==4, "return count wrong\n"); + + format = "%-10ws"; + r = sprintf(buffer, format, wide ); + ok(!strcmp(buffer,"wide "), "failed\n"); + ok( r==10, "return count wrong\n"); + + format = "%10ws"; + r = sprintf(buffer, format, wide ); + ok(!strcmp(buffer," wide"), "failed\n"); + ok( r==10, "return count wrong\n"); + + format = "%#+ -03whlls"; + r = sprintf(buffer, format, wide ); + ok(!strcmp(buffer,"wide"), "failed\n"); + ok( r==4, "return count wrong\n"); + + format = "%w0s"; + r = sprintf(buffer, format, wide ); + ok(!strcmp(buffer,"0s"), "failed\n"); + ok( r==2, "return count wrong\n"); + + format = "%w-s"; + r = sprintf(buffer, format, wide ); + ok(!strcmp(buffer,"-s"), "failed\n"); + ok( r==2, "return count wrong\n"); + + format = "%ls"; + r = sprintf(buffer, format, wide ); + ok(!strcmp(buffer,"wide"), "failed\n"); + ok( r==4, "return count wrong\n"); + + format = "%Ls"; + r = sprintf(buffer, format, "not wide" ); + ok(!strcmp(buffer,"not wide"), "failed\n"); + ok( r==8, "return count wrong\n"); + + format = "%b"; + r = sprintf(buffer, format); + ok(!strcmp(buffer,"b"), "failed\n"); + ok( r==1, "return count wrong\n"); + + format = "%3c"; + r = sprintf(buffer, format,'a'); + ok(!strcmp(buffer," a"), "failed\n"); + ok( r==3, "return count wrong\n"); + + format = "%3d"; + r = sprintf(buffer, format,1234); + ok(!strcmp(buffer,"1234"), "failed\n"); + ok( r==4, "return count wrong\n"); + + format = "%3h"; + r = sprintf(buffer, format); + ok(!strcmp(buffer,""), "failed\n"); + ok( r==0, "return count wrong\n"); + + format = "%j%k%m%q%r%t%v%y%z"; + r = sprintf(buffer, format); + ok(!strcmp(buffer,"jkmqrtvyz"), "failed\n"); + ok( r==9, "return count wrong\n"); + + format = "asdf%n"; + x = 0; + r = sprintf(buffer, format, &x ); + ok(x == 4, "should write to x\n"); + ok(!strcmp(buffer,"asdf"), "failed\n"); + ok( r==4, "return count wrong\n"); + + format = "%-1d"; + r = sprintf(buffer, format,2); + ok(!strcmp(buffer,"2"), "failed\n"); + ok( r==1, "return count wrong\n"); + + format = "%2.4f"; + r = sprintf(buffer, format,8.6); + ok(!strcmp(buffer,"8.6000"), "failed\n"); + ok( r==6, "return count wrong\n"); + + format = "%0f"; + r = sprintf(buffer, format,0.6); + ok(!strcmp(buffer,"0.600000"), "failed\n"); + ok( r==8, "return count wrong\n"); + + format = "%.0f"; + r = sprintf(buffer, format,0.6); + ok(!strcmp(buffer,"1"), "failed\n"); + ok( r==1, "return count wrong\n"); + + todo_wine { + format = "%2.4e"; + r = sprintf(buffer, format,8.6); + ok(!strcmp(buffer,"8.6000e+000"), "failed\n"); + ok( r==11, "return count wrong\n"); + } + + format = "%2.4g"; + r = sprintf(buffer, format,8.6); + ok(!strcmp(buffer,"8.6"), "failed\n"); + ok( r==3, "return count wrong\n"); + + format = "%-i"; + r = sprintf(buffer, format,-1); + ok(!strcmp(buffer,"-1"), "failed\n"); + ok( r==2, "return count wrong\n"); + + format = "%-i"; + r = sprintf(buffer, format,1); + ok(!strcmp(buffer,"1"), "failed\n"); + ok( r==1, "return count wrong\n"); + + format = "%+i"; + r = sprintf(buffer, format,1); + ok(!strcmp(buffer,"+1"), "failed\n"); + ok( r==2, "return count wrong\n"); + + format = "%o"; + r = sprintf(buffer, format,10); + ok(!strcmp(buffer,"12"), "failed\n"); + ok( r==2, "return count wrong\n"); + + format = "%p"; + r = sprintf(buffer, format,0); + ok(!strcmp(buffer,"00000000"), "failed\n"); + ok( r==8, "return count wrong\n"); + + format = "%s"; + r = sprintf(buffer, format,0); + ok(!strcmp(buffer,"(null)"), "failed\n"); + ok( r==6, "return count wrong\n"); + + format = "%s"; + r = sprintf(buffer, format,"%%%%"); + ok(!strcmp(buffer,"%%%%"), "failed\n"); + ok( r==4, "return count wrong\n"); + + format = "%u"; + r = sprintf(buffer, format,-1); + ok(!strcmp(buffer,"4294967295"), "failed\n"); + ok( r==10, "return count wrong\n"); + + format = "%w"; + r = sprintf(buffer, format,-1); + ok(!strcmp(buffer,""), "failed\n"); + ok( r==0, "return count wrong\n"); + + format = "%h"; + r = sprintf(buffer, format,-1); + ok(!strcmp(buffer,""), "failed\n"); + ok( r==0, "return count wrong\n"); + + format = "%z"; + r = sprintf(buffer, format,-1); + ok(!strcmp(buffer,"z"), "failed\n"); + ok( r==1, "return count wrong\n"); + + format = "%j"; + r = sprintf(buffer, format,-1); + ok(!strcmp(buffer,"j"), "failed\n"); + ok( r==1, "return count wrong\n"); + + format = "%F"; + r = sprintf(buffer, format,-1); + ok(!strcmp(buffer,""), "failed\n"); + ok( r==0, "return count wrong\n"); + + format = "%H"; + r = sprintf(buffer, format,-1); + ok(!strcmp(buffer,"H"), "failed\n"); + ok( r==1, "return count wrong\n"); + + format = "x%cx"; + r = sprintf(buffer, format, 0x100+'X'); + ok(!strcmp(buffer,"xXx"), "failed\n"); + ok( r==3, "return count wrong\n"); + + format = "%%0"; + r = sprintf(buffer, format); + ok(!strcmp(buffer,"%0"), "failed: \"%s\"\n", buffer); + ok( r==2, "return count wrong\n"); } static void test_swprintf( void ) @@ -91,10 +477,7 @@ ok(wcsstr(buffer,e008) != 0,"Sprintf different\n"); } swprintf(buffer,I64d,((ULONGLONG)0xffffffff)*0xffffffff); - todo_wine - { - ok(wcslen(buffer) == 11,"Problem with long long\n"); - } + ok(wcslen(buffer) == 11,"Problem with long long\n"); swprintf(buffer,S,string); ok(wcslen(buffer) == 6,"Problem with \"%%S\" interpretation\n"); } @@ -113,16 +496,12 @@ struct snprintf_test { const char *format; int expected; - struct { - int retval; - int render; - } todo; }; /* Pre-2.1 libc behaviour, not C99 compliant. */ - const struct snprintf_test tests[] = {{"short", 5, {0, 0}}, - {"justfit", 7, {0, 0}}, - {"justfits", 8, {0, 1}}, - {"muchlonger", -1, {1, 1}}}; + const struct snprintf_test tests[] = {{"short", 5}, + {"justfit", 7}, + {"justfits", 8}, + {"muchlonger", -1}}; char buffer[8]; const int bufsiz = sizeof buffer; unsigned int i; @@ -133,13 +512,59 @@ const int n = _snprintf (buffer, bufsiz, fmt); const int valid = n < 0 ? bufsiz : (n == bufsiz ? n : n+1); - todo (tests[i].todo.retval ? "wine" : "none") - ok (n == expect, "\"%s\": expected %d, returned %d\n", - fmt, expect, n); - todo (tests[i].todo.render ? "wine" : "none") - ok (!memcmp (fmt, buffer, valid), - "\"%s\": rendered \"%.*s\"\n", fmt, valid, buffer); + ok (n == expect, "\"%s\": expected %d, returned %d\n", + fmt, expect, n); + ok (!memcmp (fmt, buffer, valid), + "\"%s\": rendered \"%.*s\"\n", fmt, valid, buffer); }; +} + +static void test_fcvt(void) +{ + char *str; + int dec=100, sign=100; + + str = _fcvt(0.0001, 1, &dec, &sign ); + todo_wine { + ok( 0 == strcmp(str,""), "bad return\n"); + ok( -3 == dec, "dec wrong\n"); + } + ok( 0 == sign, "dec wrong\n"); + + str = _fcvt(0.0001, -10, &dec, &sign ); + todo_wine { + ok( 0 == strcmp(str,""), "bad return\n"); + ok( -3 == dec, "dec wrong\n"); + } + ok( 0 == sign, "dec wrong\n"); + + str = _fcvt(0.0001, 10, &dec, &sign ); + todo_wine { + ok( 0 == strcmp(str,"1000000"), "bad return\n"); + ok( -3 == dec, "dec wrong\n"); + } + ok( 0 == sign, "dec wrong\n"); + + str = _fcvt(-111.0001, 5, &dec, &sign ); + todo_wine { + ok( 0 == strcmp(str,"11100010"), "bad return\n"); + ok( 3 == dec, "dec wrong\n"); + } + ok( 1 == sign, "dec wrong\n"); + + str = _fcvt(111.0001, 5, &dec, &sign ); + todo_wine { + ok( 0 == strcmp(str,"11100010"), "bad return\n"); + ok( 3 == dec, "dec wrong\n"); + } + ok( 0 == sign, "dec wrong\n"); + + str = _fcvt(0.0, 5, &dec, &sign ); + todo_wine { + ok( 0 == strcmp(str,"00000"), "bad return\n"); + ok( 0 == dec, "dec wrong\n"); + } + ok( 0 == sign, "dec wrong\n"); } START_TEST(printf) @@ -148,4 +573,5 @@ test_swprintf(); test_fwprintf(); test_snprintf(); + test_fcvt(); } Modified: trunk/reactos/regtests/winetests/msvcrt/scanf.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/msvcrt/s… ============================================================================== --- trunk/reactos/regtests/winetests/msvcrt/scanf.c (original) +++ trunk/reactos/regtests/winetests/msvcrt/scanf.c Wed May 24 00:16:57 2006 @@ -27,6 +27,7 @@ char buffer[100], buffer1[100]; char format[20]; int result, ret; + char c; float res1= -82.6267f, res2= 27.76f, res11, res12; static const char pname[]=" St. Petersburg, Florida\n"; int hour=21,min=59,sec=20; @@ -90,11 +91,40 @@ /* Check %i according to bug 1878 */ strcpy(buffer,"123"); ret = sscanf(buffer, "%i", &result); - ok( ret == 1 , "Wrong number of arguments read\n"); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); ok(result == 123, "Wrong number read\n"); ret = sscanf(buffer, "%d", &result); - ok( ret == 1 , "Wrong number of arguments read\n"); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); ok(result == 123, "Wrong number read\n"); + + /* Check %c */ + strcpy(buffer,"a"); + c = 0x55; + ret = sscanf(buffer, "%c", &c); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ok(c == 'a', "Field incorrect: '%c'\n", c); + + strcpy(buffer," a"); + c = 0x55; + ret = sscanf(buffer, "%c", &c); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ok(c == ' ', "Field incorrect: '%c'\n", c); + + strcpy(buffer,"18:59"); + c = 0x55; + ret = sscanf(buffer, "%d:%d%c", &hour, &min, &c); + ok(ret == 2, "Wrong number of arguments read: %d\n", ret); + ok(hour == 18, "Field 1 incorrect: %d\n", hour); + ok(min == 59, "Field 2 incorrect: %d\n", min); + ok(c == 0x55, "Field 3 incorrect: 0x%02x\n", c); + + /* Check %n (also whitespace in format strings and %s) */ + buffer[0]=0; buffer1[0]=0; + ret = sscanf("abc def", "%s %n%s", buffer, &number_so_far, buffer1); + ok(strcmp(buffer, "abc")==0, "First %%s read incorrectly: %s\n", buffer); + ok(strcmp(buffer1,"def")==0, "Second %%s read incorrectly: %s\n", buffer1); + ok(number_so_far==6, "%%n yielded wrong result: %d\n", number_so_far); + ok(ret == 2, "%%n shouldn't count as a conversion: %d\n", ret); } START_TEST(scanf) Modified: trunk/reactos/regtests/winetests/msvcrt/string.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/msvcrt/s… ============================================================================== --- trunk/reactos/regtests/winetests/msvcrt/string.c (original) +++ trunk/reactos/regtests/winetests/msvcrt/string.c Wed May 24 00:16:57 2006 @@ -21,7 +21,9 @@ #include "wine/test.h" #include "winbase.h" #include <string.h> +#include <mbstring.h> #include <stdlib.h> +#include <mbctype.h> static void* (*pmemcpy)(void *, const void *, size_t n); static int* (*pmemcmp)(void *, const void *, size_t n); @@ -29,6 +31,73 @@ #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) +static void test_swab( void ) { + char original[] = "BADCFEHGJILKNMPORQTSVUXWZY@#"; + char expected1[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ@#"; + char expected2[] = "ABCDEFGHIJKLMNOPQRSTUVWX$"; + char expected3[] = "$"; + + char from[30]; + char to[30]; + + int testsize; + + /* Test 1 - normal even case */ + memset(to,'$', sizeof(to)); + memset(from,'@', sizeof(from)); + testsize = 26; + memcpy(from, original, testsize); + _swab( from, to, testsize ); + ok(memcmp(to,expected1,testsize) == 0, "Testing even size %d returned '%*.*s'\n", testsize, testsize, testsize, to); + + /* Test 2 - uneven case */ + memset(to,'$', sizeof(to)); + memset(from,'@', sizeof(from)); + testsize = 25; + memcpy(from, original, testsize); + _swab( from, to, testsize ); + ok(memcmp(to,expected2,testsize) == 0, "Testing odd size %d returned '%*.*s'\n", testsize, testsize, testsize, to); + + /* Test 3 - from = to */ + memset(to,'$', sizeof(to)); + memset(from,'@', sizeof(from)); + testsize = 26; + memcpy(to, original, testsize); + _swab( to, to, testsize ); + ok(memcmp(to,expected1,testsize) == 0, "Testing overlapped size %d returned '%*.*s'\n", testsize, testsize, testsize, to); + + /* Test 4 - 1 bytes */ + memset(to,'$', sizeof(to)); + memset(from,'@', sizeof(from)); + testsize = 1; + memcpy(from, original, testsize); + _swab( from, to, testsize ); + ok(memcmp(to,expected3,testsize) == 0, "Testing small size %d returned '%*.*s'\n", testsize, testsize, testsize, to); +} + +void test_ismbblead(void) +{ + unsigned int s = '\354'; + + _setmbcp(936); + todo_wine ok(_ismbblead(s), "got result %d\n", _ismbblead(s)); + _setmbcp(1252); +} + +static void test_mbsspn( void) +{ + unsigned char str1[]="cabernet"; + unsigned char str2[]="shiraz"; + unsigned char set[]="abc"; + unsigned char empty[]=""; + int ret; + ret=_mbsspn( str1, set); + ok( ret==3, "_mbsspn returns %d should be 3\n", ret); + ret=_mbsspn( str2, set); + ok( ret==0, "_mbsspn returns %d should be 0\n", ret); + ret=_mbsspn( str1, empty); + ok( ret==0, "_mbsspn returns %d should be 0\n", ret); +} START_TEST(string) { @@ -48,4 +117,12 @@ pmemcpy((char*)mem+5, mem,nLen+1); ok(pmemcmp((char*)mem+5,xilstring, nLen) == 0, "Got result %s\n",(char*)mem+5); + + /* Test _swab function */ + test_swab(); + + /* Test ismbblead*/ + test_ismbblead(); + /* test _mbsspn */ + test_mbsspn(); } Modified: trunk/reactos/regtests/winetests/msvcrt/testlist.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/msvcrt/t… ============================================================================== --- trunk/reactos/regtests/winetests/msvcrt/testlist.c (original) +++ trunk/reactos/regtests/winetests/msvcrt/testlist.c Wed May 24 00:16:57 2006 @@ -8,6 +8,7 @@ #include "winbase.h" extern void func_cpp(void); +extern void func_dir(void); extern void func_environ(void); extern void func_file(void); extern void func_heap(void); @@ -25,6 +26,7 @@ static const struct test winetest_testlist[] = { { "cpp", func_cpp }, + { "dir", func_dir }, { "environ", func_environ }, { "file", func_file }, { "heap", func_heap }, Modified: trunk/reactos/regtests/winetests/msvcrt/time.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/msvcrt/t… ============================================================================== --- trunk/reactos/regtests/winetests/msvcrt/time.c (original) +++ trunk/reactos/regtests/winetests/msvcrt/time.c Wed May 24 00:16:57 2006 @@ -31,7 +31,7 @@ #define MINSPERHOUR 60 #define HOURSPERDAY 24 -static void test_gmtime() +static void test_gmtime(void) { time_t gmt = (time_t)NULL; struct tm* gmt_tm = gmtime(&gmt); @@ -48,7 +48,7 @@ gmt_tm->tm_hour, gmt_tm->tm_min, gmt_tm->tm_sec, gmt_tm->tm_isdst); } -static void test_mktime() +static void test_mktime(void) { TIME_ZONE_INFORMATION tzinfo; DWORD res = GetTimeZoneInformation(&tzinfo); @@ -146,7 +146,7 @@ ok(((DWORD)nulltime == SECSPERDAY),"mktime returned 0x%08lx\n",(DWORD)nulltime); putenv(TZ_env); } -static void test_localtime() +static void test_localtime(void) { TIME_ZONE_INFORMATION tzinfo; DWORD res = GetTimeZoneInformation(&tzinfo); @@ -179,11 +179,64 @@ lt->tm_min, lt->tm_sec, lt->tm_isdst); putenv(TZ_env); } - +static void test_strdate(void) +{ + char date[16], * result; + int month, day, year, count, len; + + result = _strdate(date); + ok(result == date, "Wrong return value\n"); + len = strlen(date); + ok(len == 8, "Wrong length: returned %d, should be 8\n", len); + count = sscanf(date, "%02d/%02d/%02d", &month, &day, &year); + ok(count == 3, "Wrong format: count = %d, should be 3\n", count); +} +static void test_strtime(void) +{ + char time[16], * result; + int hour, minute, second, count, len; + + result = _strtime(time); + ok(result == time, "Wrong return value\n"); + len = strlen(time); + ok(len == 8, "Wrong length: returned %d, should be 8\n", len); + count = sscanf(time, "%02d:%02d:%02d", &hour, &minute, &second); + ok(count == 3, "Wrong format: count = %d, should be 3\n", count); +} +static void test_wstrdate(void) +{ + wchar_t date[16], * result; + int month, day, year, count, len; + wchar_t format[] = { '%','0','2','d','/','%','0','2','d','/','%','0','2','d',0 }; + + result = _wstrdate(date); + ok(result == date, "Wrong return value\n"); + len = wcslen(date); + ok(len == 8, "Wrong length: returned %d, should be 8\n", len); + count = swscanf(date, format, &month, &day, &year); + ok(count == 3, "Wrong format: count = %d, should be 3\n", count); +} +static void test_wstrtime(void) +{ + wchar_t time[16], * result; + int hour, minute, second, count, len; + wchar_t format[] = { '%','0','2','d',':','%','0','2','d',':','%','0','2','d',0 }; + + result = _wstrtime(time); + ok(result == time, "Wrong return value\n"); + len = wcslen(time); + ok(len == 8, "Wrong length: returned %d, should be 8\n", len); + count = swscanf(time, format, &hour, &minute, &second); + ok(count == 3, "Wrong format: count = %d, should be 3\n", count); +} START_TEST(time) { test_gmtime(); test_mktime(); test_localtime(); -} + test_strdate(); + test_strtime(); + test_wstrdate(); + test_wstrtime(); +}

18 years, 5 months

[janderwald] 21993: prevent ncpa from crashing when no component is selected. patch & bug report by ThePhysicist (bug 1519)

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed May 24 00:05:34 2006 New Revision: 21993 URL: http://svn.reactos.ru/svn/reactos?rev=21993&view=rev Log: prevent ncpa from crashing when no component is selected. patch & bug report by ThePhysicist (bug 1519) Modified: branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/ncpa.c Modified: branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/ncpa.c URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/cpl… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/ncpa.c (original) +++ branches/ros-branch-0_3_0/reactos/dll/cpl/ncpa/ncpa.c Wed May 24 00:05:34 2006 @@ -263,11 +263,11 @@ SetDlgItemText(hwndDlg,IDC_NETCARDNAME,tpszDisplayName); EnableWindow(GetDlgItem(hwndDlg,IDC_CONFIGURE),FALSE); - SetWindowLongPtr(hwndDlg,GWL_USERDATA,(DWORD_PTR)lParam); //SetDlgItemTextA(hwndDlg,IDC_NETCARDNAME,Info[pPage->lParam].Description); EnumRegKeys(NICPropertyProtocolCallback,hwndDlg,HKEY_LOCAL_MACHINE,_T("System\\CurrentControlSet\\Control\\Network\\{4D36E975-E325-11CE-BFC1-08002BE10318}")); + SendDlgItemMessage(hwndDlg, IDC_COMPONENTSLIST, LB_SETCURSEL, 0, 0); } break; case WM_COMMAND: @@ -302,14 +302,16 @@ // drop though case IDC_PROPERTIES: { - TCHAR *tpszSubKey; + TCHAR *tpszSubKey = NULL; TCHAR tpszNDIKey[MAX_PATH]; TCHAR tpszClsIDText[MAX_PATH]; TCHAR *tpszTCPIPClsID = _T("{A907657F-6FDF-11D0-8EFB-00C04FD912B2}"); HKEY hNDIKey; DWORD dwType,dwSize; HWND hListBox = GetDlgItem(hwndDlg,IDC_COMPONENTSLIST); - tpszSubKey = (TCHAR*)SendMessage(hListBox,LB_GETITEMDATA,SendMessage(hListBox,LB_GETCURSEL,0,0),0); + int iListBoxIndex = SendMessage(hListBox,LB_GETCURSEL,0,0); + if(iListBoxIndex != LB_ERR) + tpszSubKey = (TCHAR*)SendMessage(hListBox,LB_GETITEMDATA,iListBoxIndex,0); if(!tpszSubKey) break; _stprintf(tpszNDIKey,_T("%s\\Ndi"),tpszSubKey); @@ -598,9 +600,8 @@ EnableWindow(GetDlgItem(hwndDlg,IDC_ADD),FALSE); EnableWindow(GetDlgItem(hwndDlg,IDC_REMOVE),FALSE); + EnumAdapters(hwndDlg); SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_SETCURSEL,0,0); - - EnumAdapters(hwndDlg); } break;

18 years, 5 months

[fireball] 21992: Update ntdll_winetest to Wine-23052006

by fireball＠svn.reactos.org

Author: fireball Date: Wed May 24 00:05:14 2006 New Revision: 21992 URL: http://svn.reactos.ru/svn/reactos?rev=21992&view=rev Log: Update ntdll_winetest to Wine-23052006 Modified: trunk/reactos/regtests/winetests/ntdll/atom.c trunk/reactos/regtests/winetests/ntdll/error.c trunk/reactos/regtests/winetests/ntdll/info.c trunk/reactos/regtests/winetests/ntdll/large_int.c trunk/reactos/regtests/winetests/ntdll/om.c trunk/reactos/regtests/winetests/ntdll/path.c trunk/reactos/regtests/winetests/ntdll/reg.c trunk/reactos/regtests/winetests/ntdll/rtl.c trunk/reactos/regtests/winetests/ntdll/rtlstr.c trunk/reactos/regtests/winetests/ntdll/time.c Modified: trunk/reactos/regtests/winetests/ntdll/atom.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/ntdll/at… ============================================================================== --- trunk/reactos/regtests/winetests/ntdll/atom.c (original) +++ trunk/reactos/regtests/winetests/ntdll/atom.c Wed May 24 00:05:14 2006 @@ -21,16 +21,27 @@ * windows. */ -#define _WIN32_WINNT 0x0501 - #include <stdio.h> #include <stdarg.h> + #include "ntstatus.h" +/* Define WIN32_NO_STATUS so MSVC does not give us duplicate macro + * definition errors when we get to winnt.h + */ #define WIN32_NO_STATUS -#include "windows.h" + +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winnls.h" #include "wine/test.h" #include "wine/unicode.h" #include "winternl.h" + +#ifndef __WINE_WINTERNL_H +typedef unsigned short RTL_ATOM, *PRTL_ATOM; +typedef struct atom_table *RTL_ATOM_TABLE, **PRTL_ATOM_TABLE; +#endif /* Function pointers for ntdll calls */ static HMODULE hntdll = 0; @@ -43,6 +54,9 @@ static NTSTATUS (WINAPI *pRtlPinAtomInAtomTable)(RTL_ATOM_TABLE,RTL_ATOM); static NTSTATUS (WINAPI *pRtlQueryAtomInAtomTable)(RTL_ATOM_TABLE,RTL_ATOM,PULONG,PULONG,PWSTR,PULONG); +static NTSTATUS (WINAPI* pNtAddAtom)(LPCWSTR,ULONG,RTL_ATOM*); +static NTSTATUS (WINAPI* pNtQueryInformationAtom)(RTL_ATOM,DWORD,void*,ULONG,PULONG); + static const WCHAR EmptyAtom[] = {0}; static const WCHAR testAtom1[] = {'H','e','l','l','o',' ','W','o','r','l','d',0}; static const WCHAR testAtom2[] = {'H','e','l','l','o',' ','W','o','r','l','d','2',0}; @@ -70,6 +84,9 @@ pRtlLookupAtomInAtomTable = (void *)GetProcAddress(hntdll, "RtlLookupAtomInAtomTable"); pRtlPinAtomInAtomTable = (void *)GetProcAddress(hntdll, "RtlPinAtomInAtomTable"); pRtlQueryAtomInAtomTable = (void *)GetProcAddress(hntdll, "RtlQueryAtomInAtomTable"); + + pNtAddAtom = (void *)GetProcAddress(hntdll, "NtAddAtom"); + pNtQueryInformationAtom = (void *)GetProcAddress(hntdll, "NtQueryInformationAtom"); } } @@ -181,6 +198,24 @@ ok(!strcmpW(Name, testAtom2), "We found wrong atom\n"); ok((strlenW(testAtom2) * sizeof(WCHAR)) == Len, "Returned wrong length %ld\n", Len); + Len = 8; + Name[0] = Name[1] = Name[2] = Name[3] = Name[4] = 0x55AA; + res = pRtlQueryAtomInAtomTable(AtomTable, Atom2, NULL, NULL, Name, &Len); + ok(!res, "query atom %lx\n", res); + ok(Len == 6, "wrong length %lu\n", Len); + ok(!memcmp(Name, testAtom2, Len), "wrong atom string\n"); + ok(!Name[3], "wrong string termination\n"); + ok(Name[4] == 0x55AA, "buffer overwrite\n"); + + Len = lstrlenW(testAtom2) * sizeof(WCHAR); + memset(Name, '.', sizeof(Name)); + res = pRtlQueryAtomInAtomTable( AtomTable, Atom2, NULL, NULL, Name, &Len ); + ok(!res, "query atom %lx\n", res); + ok(Len == (lstrlenW(testAtom2) - 1) * sizeof(WCHAR), "wrong length %lu\n", Len); + ok(!memcmp(testAtom2, Name, (lstrlenW(testAtom2) - 1) * sizeof(WCHAR)), "wrong atom name\n"); + ok(Name[lstrlenW(testAtom2) - 1] == '\0', "wrong char\n"); + ok(Name[lstrlenW(testAtom2)] == ('.' << 8) + '.', "wrong char\n"); + res = pRtlLookupAtomInAtomTable(AtomTable, testAtom2, &testAtom); ok(!res, "We can't find our pinned atom!! retval: %lx\n", res); ok(testAtom == Atom2, "We found wrong atom!!!\n"); @@ -233,19 +268,6 @@ res = pRtlQueryAtomInAtomTable(AtomTable, Atom1, NULL, NULL, Name, &Len); ok(res == STATUS_BUFFER_TOO_SMALL, "Got wrong retval, retval: %lx\n", res); ok((strlenW(testAtom1) * sizeof(WCHAR)) == Len, "Got wrong length %lx\n", Len); - - res = pRtlQueryAtomInAtomTable(AtomTable, Atom1, NULL, NULL, NULL, &Len); - ok(!res, "Failed to retrieve atom length, retval: %lx\n", res); - ok(Len == strlenW(testAtom1) * sizeof(WCHAR), "Invalid atom length got %lu expected %u\n", - Len, strlenW(testAtom1) * sizeof(WCHAR)); - - Len = strlenW(testAtom1) * sizeof(WCHAR); - Name[strlenW(testAtom1)] = '*'; - res = pRtlQueryAtomInAtomTable(AtomTable, Atom1, NULL, NULL, Name, &Len); - ok(!res, "Failed with exactly long enough buffer, retval: %lx\n", res); - ok(Name[strlenW(testAtom1)] == '*', "Writing outside buffer\n"); - ok(0 == memcmp(Name, testAtom1, (strlenW(testAtom1) - 1) * sizeof(WCHAR)), - "We found wrong atom!!\n"); res = pRtlPinAtomInAtomTable(AtomTable, Atom1); ok(!res, "Unable to pin atom in atom table, retval: %lx\n", res); @@ -404,6 +426,47 @@ } } +static void test_Global(void) +{ + NTSTATUS res; + RTL_ATOM atom; + char ptr[sizeof(ATOM_BASIC_INFORMATION) + 255 * sizeof(WCHAR)]; + ATOM_BASIC_INFORMATION* abi = (ATOM_BASIC_INFORMATION*)ptr; + ULONG ptr_size = sizeof(ATOM_BASIC_INFORMATION) + 255 * sizeof(WCHAR); + + res = pNtAddAtom(testAtom1, lstrlenW(testAtom1) * sizeof(WCHAR), &atom); + ok(!res, "Added atom (%lx)\n", res); + + memset(abi->Name, 0x55, 255 * sizeof(WCHAR)); + res = pNtQueryInformationAtom( atom, AtomBasicInformation, (void*)ptr, ptr_size, NULL ); + ok(!res, "atom lookup\n"); + ok(!lstrcmpW(abi->Name, testAtom1), "ok strings\n"); + ok(abi->NameLength == lstrlenW(testAtom1) * sizeof(WCHAR), "wrong string length\n"); + ok(abi->Name[lstrlenW(testAtom1)] == 0, "wrong string termination %x\n", abi->Name[lstrlenW(testAtom1)]); + ok(abi->Name[lstrlenW(testAtom1) + 1] == 0x5555, "buffer overwrite %x\n", abi->Name[lstrlenW(testAtom1) + 1]); + + ptr_size = sizeof(ATOM_BASIC_INFORMATION); + res = pNtQueryInformationAtom( atom, AtomBasicInformation, (void*)ptr, ptr_size, NULL ); + ok(res == STATUS_BUFFER_TOO_SMALL, "wrong return status (%lx)\n", res); + ok(abi->NameLength == lstrlenW(testAtom1) * sizeof(WCHAR), "ok string length\n"); + + memset(abi->Name, 0x55, lstrlenW(testAtom1) * sizeof(WCHAR)); + ptr_size = sizeof(ATOM_BASIC_INFORMATION) + lstrlenW(testAtom1) * sizeof(WCHAR); + res = pNtQueryInformationAtom( atom, AtomBasicInformation, (void*)ptr, ptr_size, NULL ); + ok(!res, "atom lookup %lx\n", res); + ok(!lstrcmpW(abi->Name, testAtom1), "strings don't match\n"); + ok(abi->NameLength == lstrlenW(testAtom1) * sizeof(WCHAR), "wrong string length\n"); + ok(abi->Name[lstrlenW(testAtom1)] == 0, "buffer overwrite %x\n", abi->Name[lstrlenW(testAtom1)]); + ok(abi->Name[lstrlenW(testAtom1) + 1] == 0x5555, "buffer overwrite %x\n", abi->Name[lstrlenW(testAtom1) + 1]); + + ptr_size = sizeof(ATOM_BASIC_INFORMATION) + 4 * sizeof(WCHAR); + abi->Name[0] = abi->Name[1] = abi->Name[2] = abi->Name[3] = '\0'; + res = pNtQueryInformationAtom( atom, AtomBasicInformation, (void*)ptr, ptr_size, NULL ); + ok(!res, "couldn't find atom\n"); + ok(abi->NameLength == 8, "wrong string length %u\n", abi->NameLength); + ok(!memcmp(abi->Name, testAtom1, 8), "strings don't match\n"); +} + START_TEST(atom) { InitFunctionPtr(); @@ -412,5 +475,6 @@ test_NtAtom(); test_NtIntAtom(); test_NtRefPinAtom(); - } -} + test_Global(); + } +} Modified: trunk/reactos/regtests/winetests/ntdll/error.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/ntdll/er… ============================================================================== --- trunk/reactos/regtests/winetests/ntdll/error.c (original) +++ trunk/reactos/regtests/winetests/ntdll/error.c Wed May 24 00:05:14 2006 @@ -18,8 +18,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define _WIN32_WINNT 0x0501 - #include <stdarg.h> #include <stdio.h> @@ -27,8 +25,6 @@ #define WIN32_NO_STATUS #include "wine/test.h" - -#include "windows.h" #include "windef.h" #include "winbase.h" Modified: trunk/reactos/regtests/winetests/ntdll/info.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/ntdll/in… ============================================================================== --- trunk/reactos/regtests/winetests/ntdll/info.c (original) +++ trunk/reactos/regtests/winetests/ntdll/info.c Wed May 24 00:05:14 2006 @@ -216,7 +216,7 @@ DWORD status; DWORD last_pid; ULONG ReturnLength; - int i = 0, j = 0, k = 0; + int i = 0, k = 0; int is_nt = 0; SYSTEM_BASIC_INFORMATION sbi; @@ -297,6 +297,7 @@ if (!is_nt) { + DWORD j; for ( j = 0; j < spi->dwThreadCount; j++) { k++; @@ -362,8 +363,7 @@ { DWORD status; ULONG ReturnLength; - DWORD ModuleCount; - int i; + ULONG ModuleCount, i; ULONG SystemInformationLength = sizeof(SYSTEM_MODULE_INFORMATION); SYSTEM_MODULE_INFORMATION* smi = HeapAlloc(GetProcessHeap(), 0, SystemInformationLength); @@ -389,7 +389,7 @@ /* Loop through all the modules/drivers, Wine doesn't get here (yet) */ for (i = 0; i < ModuleCount ; i++) { - ok( i == sm->Id, "Id (%d) should have matched %d\n", sm->Id, i); + ok( i == sm->Id, "Id (%d) should have matched %lu\n", sm->Id, i); sm++; } Modified: trunk/reactos/regtests/winetests/ntdll/large_int.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/ntdll/la… ============================================================================== --- trunk/reactos/regtests/winetests/ntdll/large_int.c (original) +++ trunk/reactos/regtests/winetests/ntdll/large_int.c Wed May 24 00:05:14 2006 @@ -391,22 +391,22 @@ result = pRtlLargeIntegerToChar(&value, 20, largeint2str[0].MaximumLength, NULL); ok(result == STATUS_INVALID_PARAMETER, "(test a): RtlLargeIntegerToChar(%llu, %d, %d, NULL) has result %lx, expected: %lx\n", - largeint2str[0].value, 20, largeint2str[0].MaximumLength, result, (DWORD) STATUS_INVALID_PARAMETER); + largeint2str[0].value, 20, largeint2str[0].MaximumLength, result, STATUS_INVALID_PARAMETER); result = pRtlLargeIntegerToChar(&value, 20, 0, NULL); ok(result == STATUS_INVALID_PARAMETER, "(test b): RtlLargeIntegerToChar(%llu, %d, %d, NULL) has result %lx, expected: %lx\n", - largeint2str[0].value, 20, largeint2str[0].MaximumLength, result, (DWORD) STATUS_INVALID_PARAMETER); + largeint2str[0].value, 20, largeint2str[0].MaximumLength, result, STATUS_INVALID_PARAMETER); result = pRtlLargeIntegerToChar(&value, largeint2str[0].base, 0, NULL); ok(result == STATUS_BUFFER_OVERFLOW, "(test c): RtlLargeIntegerToChar(%llu, %d, %d, NULL) has result %lx, expected: %lx\n", - largeint2str[0].value, largeint2str[0].base, 0, result, (DWORD) STATUS_BUFFER_OVERFLOW); + largeint2str[0].value, largeint2str[0].base, 0, result, STATUS_BUFFER_OVERFLOW); result = pRtlLargeIntegerToChar(&value, largeint2str[0].base, largeint2str[0].MaximumLength, NULL); ok(result == STATUS_ACCESS_VIOLATION, "(test d): RtlLargeIntegerToChar(%llu, %d, %d, NULL) has result %lx, expected: %lx\n", - largeint2str[0].value, largeint2str[0].base, largeint2str[0].MaximumLength, result, (DWORD) STATUS_ACCESS_VIOLATION); + largeint2str[0].value, largeint2str[0].base, largeint2str[0].MaximumLength, result, STATUS_ACCESS_VIOLATION); } Modified: trunk/reactos/regtests/winetests/ntdll/om.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/ntdll/om… ============================================================================== --- trunk/reactos/regtests/winetests/ntdll/om.c (original) +++ trunk/reactos/regtests/winetests/ntdll/om.c Wed May 24 00:05:14 2006 @@ -90,7 +90,7 @@ attr.Attributes = 0; status = pNtCreateMutant(&Mutant, GENERIC_ALL, &attr, FALSE); - todo_wine ok(status == STATUS_OBJECT_PATH_NOT_FOUND, + ok(status == STATUS_OBJECT_PATH_NOT_FOUND, "NtCreateMutant should have failed with STATUS_OBJECT_PATH_NOT_FOUND got(%08lx)\n", status); pNtClose(Event); @@ -126,7 +126,7 @@ InitializeObjectAttributes(&attr, &str, 0, 0, NULL); status = pNtCreateNamedPipeFile(&pipe, GENERIC_READ|GENERIC_WRITE, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_CREATE, FILE_PIPE_FULL_DUPLEX, FALSE, FALSE, FALSE, 1, 256, 256, &timeout); - todo_wine ok(status == STATUS_INSTANCE_NOT_AVAILABLE, + ok(status == STATUS_INSTANCE_NOT_AVAILABLE, "NtCreateNamedPipeFile should have failed with STATUS_INSTANCE_NOT_AVAILABLE got(%08lx)\n", status); attr.Attributes = OBJ_CASE_INSENSITIVE; @@ -137,7 +137,7 @@ pRtlInitUnicodeString(&str, buffer3); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN); - todo_wine ok(status == STATUS_OBJECT_PATH_NOT_FOUND || status == STATUS_PIPE_NOT_AVAILABLE, + ok(status == STATUS_OBJECT_PATH_NOT_FOUND || status == STATUS_PIPE_NOT_AVAILABLE, "pNtOpenFile should have failed with STATUS_OBJECT_PATH_NOT_FOUND got(%08lx)\n", status); pRtlInitUnicodeString(&str, buffer4); @@ -185,21 +185,19 @@ InitializeObjectAttributes(&attr, &str, 0, 0, NULL); pRtlCreateUnicodeStringFromAsciiz(&str, "\\"); - h = 0; - todo_wine{ DIR_TEST_CREATE_FAILURE(&h, STATUS_OBJECT_NAME_COLLISION) } - ok(h == 0, "Failed create returned valid handle! (%p)\n", h); + DIR_TEST_CREATE_FAILURE(&h, STATUS_OBJECT_NAME_COLLISION) InitializeObjectAttributes(&attr, &str, OBJ_OPENIF, 0, NULL); - todo_wine{ DIR_TEST_CREATE_FAILURE(&h, STATUS_OBJECT_NAME_EXISTS) } + DIR_TEST_CREATE_FAILURE(&h, STATUS_OBJECT_NAME_EXISTS) pNtClose(h); status = pNtCreateMutant(&h, GENERIC_ALL, &attr, FALSE); - todo_wine ok(status == STATUS_OBJECT_TYPE_MISMATCH, + ok(status == STATUS_OBJECT_TYPE_MISMATCH, "NtCreateMutant should have failed with STATUS_OBJECT_TYPE_MISMATCH got(%08lx)\n", status); pRtlFreeUnicodeString(&str); pRtlCreateUnicodeStringFromAsciiz(&str, "\\??\\PIPE\\om.c-mutant"); status = pNtCreateMutant(&h, GENERIC_ALL, &attr, FALSE); - todo_wine ok(status == STATUS_OBJECT_TYPE_MISMATCH, + ok(status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_OBJECT_PATH_NOT_FOUND, "NtCreateMutant should have failed with STATUS_OBJECT_TYPE_MISMATCH got(%08lx)\n", status); pRtlFreeUnicodeString(&str); @@ -289,22 +287,22 @@ /* No name and/or no attributes */ status = pNtCreateDirectoryObject(NULL, DIRECTORY_QUERY, &attr); - todo_wine ok(status == STATUS_ACCESS_VIOLATION, + ok(status == STATUS_ACCESS_VIOLATION, "NtCreateDirectoryObject should have failed with STATUS_ACCESS_VIOLATION got(%08lx)\n", status); status = pNtOpenDirectoryObject(NULL, DIRECTORY_QUERY, &attr); - todo_wine ok(status == STATUS_ACCESS_VIOLATION, + ok(status == STATUS_ACCESS_VIOLATION, "NtOpenDirectoryObject should have failed with STATUS_ACCESS_VIOLATION got(%08lx)\n", status); status = pNtCreateDirectoryObject(&h, DIRECTORY_QUERY, NULL); ok(status == STATUS_SUCCESS, "Failed to create Directory without attributes(%08lx)\n", status); pNtClose(h); status = pNtOpenDirectoryObject(&h, DIRECTORY_QUERY, NULL); - todo_wine ok(status == STATUS_INVALID_PARAMETER, + ok(status == STATUS_INVALID_PARAMETER, "NtOpenDirectoryObject should have failed with STATUS_INVALID_PARAMETER got(%08lx)\n", status); InitializeObjectAttributes(&attr, NULL, 0, 0, NULL); DIR_TEST_CREATE_SUCCESS(&dir) - todo_wine{ DIR_TEST_OPEN_FAILURE(&h, STATUS_OBJECT_PATH_SYNTAX_BAD) } + DIR_TEST_OPEN_FAILURE(&h, STATUS_OBJECT_PATH_SYNTAX_BAD) /* Bad name */ InitializeObjectAttributes(&attr, &str, 0, 0, NULL); @@ -312,15 +310,15 @@ pRtlCreateUnicodeStringFromAsciiz(&str, ""); DIR_TEST_CREATE_SUCCESS(&h) pNtClose(h); - todo_wine{ DIR_TEST_OPEN_FAILURE(&h, STATUS_OBJECT_PATH_SYNTAX_BAD) } - pRtlFreeUnicodeString(&str); - pNtClose(dir); - - todo_wine{ DIR_TEST_CREATE_OPEN_FAILURE(&h, "BaseNamedObjects", STATUS_OBJECT_PATH_SYNTAX_BAD) } - todo_wine{ DIR_TEST_CREATE_OPEN_FAILURE(&h, "\\BaseNamedObjects\\", STATUS_OBJECT_NAME_INVALID) } - todo_wine{ DIR_TEST_CREATE_OPEN_FAILURE(&h, "\\\\BaseNamedObjects", STATUS_OBJECT_NAME_INVALID) } - todo_wine{ DIR_TEST_CREATE_OPEN_FAILURE(&h, "\\BaseNamedObjects\\\\om.c-test", STATUS_OBJECT_NAME_INVALID) } - todo_wine{ DIR_TEST_CREATE_OPEN_FAILURE(&h, "\\BaseNamedObjects\\om.c-test\\", STATUS_OBJECT_PATH_NOT_FOUND) } + DIR_TEST_OPEN_FAILURE(&h, STATUS_OBJECT_PATH_SYNTAX_BAD) + pRtlFreeUnicodeString(&str); + pNtClose(dir); + + DIR_TEST_CREATE_OPEN_FAILURE(&h, "BaseNamedObjects", STATUS_OBJECT_PATH_SYNTAX_BAD) + DIR_TEST_CREATE_OPEN_FAILURE(&h, "\\BaseNamedObjects\\", STATUS_OBJECT_NAME_INVALID) + DIR_TEST_CREATE_OPEN_FAILURE(&h, "\\\\BaseNamedObjects", STATUS_OBJECT_NAME_INVALID) + DIR_TEST_CREATE_OPEN_FAILURE(&h, "\\BaseNamedObjects\\\\om.c-test", STATUS_OBJECT_NAME_INVALID) + DIR_TEST_CREATE_OPEN_FAILURE(&h, "\\BaseNamedObjects\\om.c-test\\", STATUS_OBJECT_PATH_NOT_FOUND) pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects\\om.c-test"); DIR_TEST_CREATE_SUCCESS(&h) @@ -336,11 +334,11 @@ pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects\\Local"); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); status = pNtOpenSymbolicLinkObject(&dir, SYMBOLIC_LINK_QUERY, &attr);\ - todo_wine ok(status == STATUS_SUCCESS, "Failed to open SymbolicLink(%08lx)\n", status); + ok(status == STATUS_SUCCESS, "Failed to open SymbolicLink(%08lx)\n", status); pRtlFreeUnicodeString(&str); InitializeObjectAttributes(&attr, &str, 0, dir, NULL); pRtlCreateUnicodeStringFromAsciiz(&str, "one more level"); - todo_wine{ DIR_TEST_CREATE_FAILURE(&h, STATUS_OBJECT_TYPE_MISMATCH) } + DIR_TEST_CREATE_FAILURE(&h, STATUS_OBJECT_TYPE_MISMATCH) pRtlFreeUnicodeString(&str); pNtClose(h); pNtClose(dir); @@ -351,14 +349,14 @@ pRtlFreeUnicodeString(&str); InitializeObjectAttributes(&attr, NULL, 0, dir, NULL); - todo_wine{ DIR_TEST_OPEN_FAILURE(&h, STATUS_OBJECT_NAME_INVALID) } + DIR_TEST_OPEN_FAILURE(&h, STATUS_OBJECT_NAME_INVALID) InitializeObjectAttributes(&attr, &str, 0, dir, NULL); DIR_TEST_CREATE_OPEN_SUCCESS(&h, "") - todo_wine{ DIR_TEST_CREATE_OPEN_FAILURE(&h, "\\", STATUS_OBJECT_PATH_SYNTAX_BAD) } - todo_wine{ DIR_TEST_CREATE_OPEN_FAILURE(&h, "\\om.c-test", STATUS_OBJECT_PATH_SYNTAX_BAD) } - todo_wine{ DIR_TEST_CREATE_OPEN_FAILURE(&h, "\\om.c-test\\", STATUS_OBJECT_PATH_SYNTAX_BAD) } - todo_wine{ DIR_TEST_CREATE_OPEN_FAILURE(&h, "om.c-test\\", STATUS_OBJECT_PATH_NOT_FOUND) } + DIR_TEST_CREATE_OPEN_FAILURE(&h, "\\", STATUS_OBJECT_PATH_SYNTAX_BAD) + DIR_TEST_CREATE_OPEN_FAILURE(&h, "\\om.c-test", STATUS_OBJECT_PATH_SYNTAX_BAD) + DIR_TEST_CREATE_OPEN_FAILURE(&h, "\\om.c-test\\", STATUS_OBJECT_PATH_SYNTAX_BAD) + DIR_TEST_CREATE_OPEN_FAILURE(&h, "om.c-test\\", STATUS_OBJECT_PATH_NOT_FOUND) pRtlCreateUnicodeStringFromAsciiz(&str, "om.c-test"); DIR_TEST_CREATE_SUCCESS(&dir1) @@ -374,7 +372,7 @@ InitializeObjectAttributes(&attr, &str, 0, 0, NULL); DIR_TEST_OPEN_SUCCESS(&dir) InitializeObjectAttributes(&attr, &str, 0, dir, NULL); - todo_wine{ DIR_TEST_OPEN_FAILURE(&h, STATUS_OBJECT_PATH_SYNTAX_BAD) } + DIR_TEST_OPEN_FAILURE(&h, STATUS_OBJECT_PATH_SYNTAX_BAD) pRtlFreeUnicodeString(&str); pNtClose(dir); @@ -422,18 +420,18 @@ /* Test inavalid paths */ pRtlCreateUnicodeStringFromAsciiz(&str, "\\om.c-mutant"); status = pNtCreateMutant(&h, GENERIC_ALL, &attr, FALSE); - todo_wine ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, + ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtCreateMutant should have failed with STATUS_OBJECT_PATH_SYNTAX_BAD got(%08lx)\n", status); pRtlFreeUnicodeString(&str); pRtlCreateUnicodeStringFromAsciiz(&str, "\\om.c-mutant\\"); status = pNtCreateMutant(&h, GENERIC_ALL, &attr, FALSE); - todo_wine ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, + ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtCreateMutant should have failed with STATUS_OBJECT_PATH_SYNTAX_BAD got(%08lx)\n", status); pRtlFreeUnicodeString(&str); pRtlCreateUnicodeStringFromAsciiz(&str, "om.c\\-mutant"); status = pNtCreateMutant(&h, GENERIC_ALL, &attr, FALSE); - todo_wine ok(status == STATUS_OBJECT_PATH_NOT_FOUND, + ok(status == STATUS_OBJECT_PATH_NOT_FOUND, "NtCreateMutant should have failed with STATUS_OBJECT_PATH_NOT_FOUND got(%08lx)\n", status); pRtlFreeUnicodeString(&str); @@ -476,18 +474,18 @@ IO_STATUS_BLOCK iosb; /* No name and/or no attributes */ - todo_wine{ SYMLNK_TEST_CREATE_OPEN_FAILURE(NULL, "", "", STATUS_ACCESS_VIOLATION) } + SYMLNK_TEST_CREATE_OPEN_FAILURE(NULL, "", "", STATUS_ACCESS_VIOLATION) status = pNtCreateSymbolicLinkObject(&h, SYMBOLIC_LINK_QUERY, NULL, NULL); - todo_wine ok(status == STATUS_ACCESS_VIOLATION, + ok(status == STATUS_ACCESS_VIOLATION, "NtCreateSymbolicLinkObject should have failed with STATUS_ACCESS_VIOLATION got(%08lx)\n", status); status = pNtOpenSymbolicLinkObject(&h, SYMBOLIC_LINK_QUERY, NULL); - todo_wine ok(status == STATUS_INVALID_PARAMETER, + ok(status == STATUS_INVALID_PARAMETER, "NtOpenSymbolicLinkObject should have failed with STATUS_INVALID_PARAMETER got(%08lx)\n", status); InitializeObjectAttributes(&attr, NULL, 0, 0, NULL); - todo_wine{ SYMLNK_TEST_CREATE_FAILURE(&link, STATUS_INVALID_PARAMETER) } - todo_wine{ SYMLNK_TEST_OPEN_FAILURE(&h, STATUS_OBJECT_PATH_SYNTAX_BAD) } + SYMLNK_TEST_CREATE_FAILURE(&link, STATUS_INVALID_PARAMETER) + SYMLNK_TEST_OPEN_FAILURE(&h, STATUS_OBJECT_PATH_SYNTAX_BAD) /* Bad name */ pRtlCreateUnicodeStringFromAsciiz(&target, "anywhere"); @@ -495,7 +493,7 @@ pRtlCreateUnicodeStringFromAsciiz(&str, ""); SYMLNK_TEST_CREATE_SUCCESS(&link) - todo_wine{ SYMLNK_TEST_OPEN_FAILURE(&h, STATUS_OBJECT_PATH_SYNTAX_BAD) } + SYMLNK_TEST_OPEN_FAILURE(&h, STATUS_OBJECT_PATH_SYNTAX_BAD) pNtClose(link); pRtlFreeUnicodeString(&str); @@ -504,11 +502,11 @@ pRtlFreeUnicodeString(&str); pRtlFreeUnicodeString(&target); - todo_wine{ SYMLNK_TEST_CREATE_OPEN_FAILURE(&h, "BaseNamedObjects", "->Somewhere", STATUS_OBJECT_PATH_SYNTAX_BAD) } - todo_wine{ SYMLNK_TEST_CREATE_OPEN_FAILURE(&h, "\\BaseNamedObjects\\", "->Somewhere", STATUS_OBJECT_NAME_INVALID) } - todo_wine{ SYMLNK_TEST_CREATE_OPEN_FAILURE(&h, "\\\\BaseNamedObjects", "->Somewhere", STATUS_OBJECT_NAME_INVALID) } - todo_wine{ SYMLNK_TEST_CREATE_OPEN_FAILURE(&h, "\\BaseNamedObjects\\\\om.c-test", "->Somewhere", STATUS_OBJECT_NAME_INVALID) } - todo_wine{ SYMLNK_TEST_CREATE_OPEN_FAILURE(&h, "\\BaseNamedObjects\\om.c-test\\", "->Somewhere", STATUS_OBJECT_NAME_INVALID) } + SYMLNK_TEST_CREATE_OPEN_FAILURE(&h, "BaseNamedObjects", "->Somewhere", STATUS_OBJECT_PATH_SYNTAX_BAD) + SYMLNK_TEST_CREATE_OPEN_FAILURE(&h, "\\BaseNamedObjects\\", "->Somewhere", STATUS_OBJECT_NAME_INVALID) + SYMLNK_TEST_CREATE_OPEN_FAILURE(&h, "\\\\BaseNamedObjects", "->Somewhere", STATUS_OBJECT_NAME_INVALID) + SYMLNK_TEST_CREATE_OPEN_FAILURE(&h, "\\BaseNamedObjects\\\\om.c-test", "->Somewhere", STATUS_OBJECT_NAME_INVALID) + SYMLNK_TEST_CREATE_OPEN_FAILURE(&h, "\\BaseNamedObjects\\om.c-test\\", "->Somewhere", STATUS_OBJECT_NAME_INVALID) /* Compaund test */ Modified: trunk/reactos/regtests/winetests/ntdll/path.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/ntdll/pa… ============================================================================== --- trunk/reactos/regtests/winetests/ntdll/path.c (original) +++ trunk/reactos/regtests/winetests/ntdll/path.c Wed May 24 00:05:14 2006 @@ -266,12 +266,12 @@ pRtlMultiByteToUnicodeN(pathbufW , sizeof(pathbufW), NULL, test->path, strlen(test->path)+1 ); ret = pRtlGetFullPathName_U( pathbufW,MAX_PATH, rbufferW, &file_part); ok( ret == len, "Wrong result %ld/%d for \"%s\"\n", ret, len, test->path ); - ok(pRtlUnicodeToMultiByteN(rbufferA,MAX_PATH,&reslen,rbufferW,MAX_PATH) == STATUS_SUCCESS, + ok(pRtlUnicodeToMultiByteN(rbufferA,MAX_PATH,&reslen,rbufferW,(lstrlenW(rbufferW) + 1) * sizeof(WCHAR)) == STATUS_SUCCESS, "RtlUnicodeToMultiByteN failed\n"); ok(lstrcmpiA(rbufferA,test->rname) == 0, "Got \"%s\" expected \"%s\"\n",rbufferA,test->rname); if (file_part) { - ok(pRtlUnicodeToMultiByteN(rfileA,MAX_PATH,&reslen,file_part,MAX_PATH) == STATUS_SUCCESS, + ok(pRtlUnicodeToMultiByteN(rfileA,MAX_PATH,&reslen,file_part,(lstrlenW(file_part) + 1) * sizeof(WCHAR)) == STATUS_SUCCESS, "RtlUnicodeToMultiByteN failed\n"); ok(test->rfile && !lstrcmpiA(rfileA,test->rfile), "Got \"%s\" expected \"%s\"\n",rfileA,test->rfile); } Modified: trunk/reactos/regtests/winetests/ntdll/reg.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/ntdll/re… ============================================================================== --- trunk/reactos/regtests/winetests/ntdll/reg.c (original) +++ trunk/reactos/regtests/winetests/ntdll/reg.c Wed May 24 00:05:14 2006 @@ -24,12 +24,10 @@ #include "ntdll_test.h" #include "winternl.h" -//#include "wine/library.h" #include "stdio.h" #include "winnt.h" #include "winnls.h" #include "stdlib.h" -#include "wine/unicode.h" #ifndef __WINE_WINTERNL_H @@ -68,6 +66,16 @@ PVOID DefaultData; ULONG DefaultLength; } RTL_QUERY_REGISTRY_TABLE, *PRTL_QUERY_REGISTRY_TABLE; + +#define InitializeObjectAttributes(p,n,a,r,s) \ + do { \ + (p)->Length = sizeof(OBJECT_ATTRIBUTES); \ + (p)->RootDirectory = r; \ + (p)->Attributes = a; \ + (p)->ObjectName = n; \ + (p)->SecurityDescriptor = s; \ + (p)->SecurityQualityOfService = NULL; \ + } while (0) #endif @@ -151,7 +159,7 @@ if(ValueName) { - ValueNameLength = strlenW(ValueName); + ValueNameLength = lstrlenW(ValueName); ValName = (LPSTR)pRtlAllocateHeap(GetProcessHeap(), 0, ValueNameLength); @@ -286,7 +294,6 @@ { /*Create WineTest*/ OBJECT_ATTRIBUTES attr; - UNICODE_STRING ValName; HKEY key; ACCESS_MASK am = GENERIC_ALL; NTSTATUS status; @@ -295,7 +302,6 @@ status = pNtCreateKey(&key, am, &attr, 0, 0, 0, 0); ok(status == STATUS_SUCCESS, "NtCreateKey Failed: 0x%08lx\n", status); - pRtlFreeUnicodeString(&ValName); pNtClose(&key); } Modified: trunk/reactos/regtests/winetests/ntdll/rtl.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/ntdll/rt… ============================================================================== --- trunk/reactos/regtests/winetests/ntdll/rtl.c (original) +++ trunk/reactos/regtests/winetests/ntdll/rtl.c Wed May 24 00:05:14 2006 @@ -24,6 +24,26 @@ #include <stdlib.h> #include "ntdll_test.h" + +#ifndef __WINE_WINTERNL_H + +typedef struct _RTL_HANDLE +{ + struct _RTL_HANDLE * Next; +} RTL_HANDLE; + +typedef struct _RTL_HANDLE_TABLE +{ + ULONG MaxHandleCount; + ULONG HandleSize; + ULONG Unused[2]; + PVOID NextFree; + PVOID FirstHandle; + PVOID ReservedMemory; + PVOID MaxHandle; +} RTL_HANDLE_TABLE; + +#endif /* Function ptrs for ntdll calls */ static HMODULE hntdll = 0; @@ -44,6 +64,8 @@ static NTSTATUS (WINAPI * pRtlDestroyHandleTable)(RTL_HANDLE_TABLE *); static RTL_HANDLE * (WINAPI * pRtlAllocateHandle)(RTL_HANDLE_TABLE *, ULONG *); static BOOLEAN (WINAPI * pRtlFreeHandle)(RTL_HANDLE_TABLE *, RTL_HANDLE *); +static NTSTATUS (WINAPI *pRtlAllocateAndInitializeSid)(PSID_IDENTIFIER_AUTHORITY,BYTE,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,PSID*); +static NTSTATUS (WINAPI *pRtlFreeSid)(PSID); #define LEN 16 static const char* src_src = "This is a test!"; /* 16 bytes long, incl NUL */ static ULONG src_aligned_block[4]; @@ -73,6 +95,8 @@ pRtlDestroyHandleTable = (void *)GetProcAddress(hntdll, "RtlDestroyHandleTable"); pRtlAllocateHandle = (void *)GetProcAddress(hntdll, "RtlAllocateHandle"); pRtlFreeHandle = (void *)GetProcAddress(hntdll, "RtlFreeHandle"); + pRtlAllocateAndInitializeSid = (void *)GetProcAddress(hntdll, "RtlAllocateAndInitializeSid"); + pRtlFreeSid = (void *)GetProcAddress(hntdll, "RtlFreeSid"); } strcpy((char*)src_aligned_block, src_src); ok(strlen(src) == 15, "Source must be 16 bytes long!\n"); @@ -820,7 +844,7 @@ if (!pRtlComputeCrc32) return; - crc = pRtlComputeCrc32(crc, src, LEN); + crc = pRtlComputeCrc32(crc, (LPBYTE)src, LEN); ok(crc == 0x40861dc2,"Expected 0x40861dc2, got %8lx\n", crc); } @@ -856,6 +880,25 @@ ok(result, "Couldn't free handle %p\n", MyHandle); status = pRtlDestroyHandleTable(&HandleTable); ok(status == STATUS_SUCCESS, "RtlDestroyHandleTable failed with error 0x%08lx\n", status); +} + +static void test_RtlAllocateAndInitializeSid(void) +{ + NTSTATUS ret; + SID_IDENTIFIER_AUTHORITY sia = {{ 1, 2, 3, 4, 5, 6 }}; + PSID psid; + + ret = pRtlAllocateAndInitializeSid(&sia, 0, 1, 2, 3, 4, 5, 6, 7, 8, &psid); + ok(!ret, "RtlAllocateAndInitializeSid error %08lx\n", ret); + ret = pRtlFreeSid(psid); + ok(!ret, "RtlFreeSid error %08lx\n", ret); + + /* these tests crash on XP + ret = pRtlAllocateAndInitializeSid(NULL, 0, 1, 2, 3, 4, 5, 6, 7, 8, &psid); + ret = pRtlAllocateAndInitializeSid(&sia, 0, 1, 2, 3, 4, 5, 6, 7, 8, NULL);*/ + + ret = pRtlAllocateAndInitializeSid(&sia, 9, 1, 2, 3, 4, 5, 6, 7, 8, &psid); + ok(ret == STATUS_INVALID_SID, "wrong error %08lx\n", ret); } START_TEST(rtl) @@ -888,4 +931,6 @@ test_RtlComputeCrc32(); if (pRtlInitializeHandleTable) test_HandleTables(); -} + if (pRtlAllocateAndInitializeSid) + test_RtlAllocateAndInitializeSid(); +} Modified: trunk/reactos/regtests/winetests/ntdll/rtlstr.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/ntdll/rt… ============================================================================== --- trunk/reactos/regtests/winetests/ntdll/rtlstr.c (original) +++ trunk/reactos/regtests/winetests/ntdll/rtlstr.c Wed May 24 00:05:14 2006 @@ -199,8 +199,8 @@ uni.Buffer = (void *) 0xdeadbeef; result = pRtlInitUnicodeStringEx(&uni, teststring); ok(result == STATUS_SUCCESS, - "pRtlInitUnicodeStringEx(&uni, 0) returns %lx, expected %lx\n", - result, (DWORD) STATUS_SUCCESS); + "pRtlInitUnicodeStringEx(&uni, 0) returns %lx, expected 0\n", + result); ok(uni.Length == 32, "pRtlInitUnicodeStringEx(&uni, 0) sets Length to %u, expected %u\n", uni.Length, 32); @@ -231,7 +231,7 @@ result = pRtlInitUnicodeStringEx(&uni, teststring2); ok(result == STATUS_NAME_TOO_LONG, "pRtlInitUnicodeStringEx(&uni, 0) returns %lx, expected %lx\n", - result, (DWORD) STATUS_NAME_TOO_LONG); + result, STATUS_NAME_TOO_LONG); ok(uni.Length == 12345, "pRtlInitUnicodeStringEx(&uni, 0) sets Length to %u, expected %u\n", uni.Length, 12345); @@ -263,8 +263,8 @@ uni.Buffer = (void *) 0xdeadbeef; result = pRtlInitUnicodeStringEx(&uni, 0); ok(result == STATUS_SUCCESS, - "pRtlInitUnicodeStringEx(&uni, 0) returns %lx, expected %lx\n", - result, (DWORD) STATUS_SUCCESS); + "pRtlInitUnicodeStringEx(&uni, 0) returns %lx, expected 0\n", + result); ok(uni.Length == 0, "pRtlInitUnicodeStringEx(&uni, 0) sets Length to %u, expected %u\n", uni.Length, 0); @@ -1651,22 +1651,22 @@ result = pRtlIntegerToChar(int2str[0].value, 20, int2str[0].MaximumLength, NULL); ok(result == STATUS_INVALID_PARAMETER, "(test a): RtlIntegerToChar(%lu, %d, %d, NULL) has result %lx, expected: %lx\n", - int2str[0].value, 20, int2str[0].MaximumLength, result, (DWORD) STATUS_INVALID_PARAMETER); + int2str[0].value, 20, int2str[0].MaximumLength, result, STATUS_INVALID_PARAMETER); result = pRtlIntegerToChar(int2str[0].value, 20, 0, NULL); ok(result == STATUS_INVALID_PARAMETER, "(test b): RtlIntegerToChar(%lu, %d, %d, NULL) has result %lx, expected: %lx\n", - int2str[0].value, 20, 0, result, (DWORD) STATUS_INVALID_PARAMETER); + int2str[0].value, 20, 0, result, STATUS_INVALID_PARAMETER); result = pRtlIntegerToChar(int2str[0].value, int2str[0].base, 0, NULL); ok(result == STATUS_BUFFER_OVERFLOW, "(test c): RtlIntegerToChar(%lu, %d, %d, NULL) has result %lx, expected: %lx\n", - int2str[0].value, int2str[0].base, 0, result, (DWORD) STATUS_BUFFER_OVERFLOW); + int2str[0].value, int2str[0].base, 0, result, STATUS_BUFFER_OVERFLOW); result = pRtlIntegerToChar(int2str[0].value, int2str[0].base, int2str[0].MaximumLength, NULL); ok(result == STATUS_ACCESS_VIOLATION, "(test d): RtlIntegerToChar(%lu, %d, %d, NULL) has result %lx, expected: %lx\n", - int2str[0].value, int2str[0].base, int2str[0].MaximumLength, result, (DWORD) STATUS_ACCESS_VIOLATION); + int2str[0].value, int2str[0].base, int2str[0].MaximumLength, result, STATUS_ACCESS_VIOLATION); } static const WCHAR szGuid[] = { '{','0','1','0','2','0','3','0','4','-', Modified: trunk/reactos/regtests/winetests/ntdll/time.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/ntdll/ti… ============================================================================== --- trunk/reactos/regtests/winetests/ntdll/time.c (original) +++ trunk/reactos/regtests/winetests/ntdll/time.c Wed May 24 00:05:14 2006 @@ -43,7 +43,7 @@ /* start time of the tests */ TIME_FIELDS tftest = {1889,12,31,23,59,59,0,0}; -static void test_pRtlTimeToTimeFields() +static void test_pRtlTimeToTimeFields(void) { LARGE_INTEGER litime , liresult; TIME_FIELDS tfresult;

18 years, 5 months

[fireball] 21991: - Update user32_winetest to Wine-23052006. Update includes changes in the following subtests: edit, winstation. Evereything else is just compilation

by fireball＠svn.reactos.org

Author: fireball Date: Tue May 23 23:55:45 2006 New Revision: 21991 URL: http://svn.reactos.ru/svn/reactos?rev=21991&view=rev Log: - Update user32_winetest to Wine-23052006. Update includes changes in the following subtests: edit, winstation. Evereything else is just compilation Modified: trunk/reactos/regtests/winetests/user32/edit.c trunk/reactos/regtests/winetests/user32/input.c trunk/reactos/regtests/winetests/user32/win.c trunk/reactos/regtests/winetests/user32/winstation.c Modified: trunk/reactos/regtests/winetests/user32/edit.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/user32/e… ============================================================================== --- trunk/reactos/regtests/winetests/user32/edit.c (original) +++ trunk/reactos/regtests/winetests/user32/edit.c Tue May 23 23:55:45 2006 @@ -20,6 +20,7 @@ #include <assert.h> #include <windows.h> +#include <windowsx.h> #include <commctrl.h> #include "wine/test.h" @@ -277,9 +278,7 @@ static LRESULT CALLBACK ET2_WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) { switch (iMsg) { - case WM_COMMAND: - ET2_OnCommand(hwnd, LOWORD(wParam), (HWND)lParam, HIWORD(wParam)); - break; + HANDLE_MSG(hwnd, WM_COMMAND, ET2_OnCommand); } return DefWindowProc(hwnd, iMsg, wParam, lParam); } @@ -760,106 +759,8 @@ ok(new_rect.right == old_rect.right, "The right border of the rectangle has changed\n"); ok(new_rect.top == old_rect.top, "The top border of the rectangle has changed\n"); ok(new_rect.bottom == old_rect.bottom, "The bottom border of the rectangle has changed\n"); - + DestroyWindow (hwEdit); -} - -static INT CALLBACK find_font_proc(const LOGFONT *elf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) -{ - return 0; -} - -static void test_margins_font_change(void) -{ - HWND hwEdit; - DWORD margins, font_margins; - LOGFONT lf; - HFONT hfont, hfont2; - HDC hdc = GetDC(0); - - if(EnumFontFamiliesA(hdc, "Arial", find_font_proc, 0)) - { - trace("Arial not found - skipping font change margin tests\n"); - ReleaseDC(0, hdc); - return; - } - ReleaseDC(0, hdc); - - hwEdit = create_child_editcontrol(0, 0); - - SetWindowPos(hwEdit, NULL, 10, 10, 1000, 100, SWP_NOZORDER | SWP_NOACTIVATE); - - memset(&lf, 0, sizeof(lf)); - strcpy(lf.lfFaceName, "Arial"); - lf.lfHeight = 16; - lf.lfCharSet = DEFAULT_CHARSET; - hfont = CreateFontIndirectA(&lf); - lf.lfHeight = 30; - hfont2 = CreateFontIndirectA(&lf); - - SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); - font_margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(font_margins) != 0, "got %d\n", LOWORD(font_margins)); - ok(HIWORD(font_margins) != 0, "got %d\n", HIWORD(font_margins)); - - /* With 'small' edit controls, test that the margin doesn't get set */ - SetWindowPos(hwEdit, NULL, 10, 10, 16, 100, SWP_NOZORDER | SWP_NOACTIVATE); - SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(0,0)); - SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); - margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(margins) == 0, "got %d\n", LOWORD(margins)); - ok(HIWORD(margins) == 0, "got %d\n", HIWORD(margins)); - - SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(1,0)); - SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); - margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(margins) == 1, "got %d\n", LOWORD(margins)); - ok(HIWORD(margins) == 0, "got %d\n", HIWORD(margins)); - - SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(1,1)); - SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); - margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(margins) == 1, "got %d\n", LOWORD(margins)); - ok(HIWORD(margins) == 1, "got %d\n", HIWORD(margins)); - - SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO,EC_USEFONTINFO)); - margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(margins) == 1, "got %d\n", LOWORD(margins)); - ok(HIWORD(margins) == 1, "got %d\n", HIWORD(margins)); - SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont2, 0); - margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(margins) == 1, "got %d\n", LOWORD(margins)); - ok(HIWORD(margins) == 1, "got %d\n", HIWORD(margins)); - - /* Above a certain size threshold then the margin is updated */ - SetWindowPos(hwEdit, NULL, 10, 10, 1000, 100, SWP_NOZORDER | SWP_NOACTIVATE); - SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(1,0)); - SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); - margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(margins) == LOWORD(font_margins), "got %d\n", LOWORD(margins)); - ok(HIWORD(margins) == HIWORD(font_margins), "got %d\n", HIWORD(margins)); - - SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(1,1)); - SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); - margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(margins) == LOWORD(font_margins), "got %d\n", LOWORD(margins)); - ok(HIWORD(margins) == HIWORD(font_margins), "got %d\n", HIWORD(margins)); - - SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO,EC_USEFONTINFO)); - margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(margins) == LOWORD(font_margins), "got %d\n", LOWORD(margins)); - ok(HIWORD(margins) == HIWORD(font_margins), "got %d\n", HIWORD(margins)); - SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont2, 0); - margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); - ok(LOWORD(margins) != LOWORD(font_margins), "got %d\n", LOWORD(margins)); - ok(HIWORD(margins) != HIWORD(font_margins), "got %d\n", HIWORD(margins)); - - SendMessageA(hwEdit, WM_SETFONT, 0, 0); - - DeleteObject(hfont2); - DeleteObject(hfont); - destroy_child_editcontrol(hwEdit); - } #define edit_pos_ok(exp, got, txt) \ @@ -1066,8 +967,7 @@ test_edit_control_4(); test_edit_control_5(); test_margins(); - test_margins_font_change(); test_text_position(); - + UnregisterWindowClasses(); } Modified: trunk/reactos/regtests/winetests/user32/input.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/user32/i… ============================================================================== --- trunk/reactos/regtests/winetests/user32/input.c (original) +++ trunk/reactos/regtests/winetests/user32/input.c Tue May 23 23:55:45 2006 @@ -49,7 +49,7 @@ #include <stdarg.h> #include <assert.h> -#include "windows.h" +#include "windef.h" #include "wine/test.h" Modified: trunk/reactos/regtests/winetests/user32/win.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/user32/w… ============================================================================== --- trunk/reactos/regtests/winetests/user32/win.c (original) +++ trunk/reactos/regtests/winetests/user32/win.c Tue May 23 23:55:45 2006 @@ -2316,7 +2316,6 @@ ShowWindow(hwnd, SW_SHOW); UpdateWindow(hwnd); - flush_events(); ok(GetActiveWindow() == hwnd, "wrong active window %p\n", GetActiveWindow()); Modified: trunk/reactos/regtests/winetests/user32/winstation.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/user32/w… ============================================================================== --- trunk/reactos/regtests/winetests/user32/winstation.c (original) +++ trunk/reactos/regtests/winetests/user32/winstation.c Tue May 23 23:55:45 2006 @@ -42,29 +42,12 @@ trace( "obj %p type '%s'\n", obj, buffer ); } -static void register_class(void) -{ - WNDCLASSA cls; - - cls.style = CS_DBLCLKS; - cls.lpfnWndProc = DefWindowProcA; - cls.cbClsExtra = 0; - cls.cbWndExtra = 0; - cls.hInstance = GetModuleHandleA(0); - cls.hIcon = 0; - cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW); - cls.hbrBackground = GetStockObject(WHITE_BRUSH); - cls.lpszMenuName = NULL; - cls.lpszClassName = "WinStationClass"; - RegisterClassA(&cls); -} - static HDESK initial_desktop; static DWORD CALLBACK thread( LPVOID arg ) { HDESK d1, d2; - HWND hwnd = CreateWindowExA(0,"WinStationClass","test",WS_POPUP,0,0,100,100,GetDesktopWindow(),0,0,0); + HWND hwnd = CreateWindowExA(0,"BUTTON","test",WS_POPUP,0,0,100,100,GetDesktopWindow(),0,0,0); ok( hwnd != 0, "CreateWindow failed\n" ); d1 = GetThreadDesktop(GetCurrentThreadId()); trace( "thread %p desktop: %p\n", arg, d1 ); @@ -106,8 +89,6 @@ HDESK d1, d2, d3; HANDLE hthread; DWORD id, flags; - ATOM atom; - char buffer[20]; /* win stations */ @@ -162,28 +143,6 @@ w3 = OpenWindowStation("foobar", TRUE, WINSTA_ALL_ACCESS ); ok( !w3, "open foobar station succeeded\n" ); - - w2 = CreateWindowStation("foobar1", 0, WINSTA_ALL_ACCESS, NULL ); - ok( w2 != 0, "create foobar station failed\n" ); - w3 = CreateWindowStation("foobar2", 0, WINSTA_ALL_ACCESS, NULL ); - ok( w3 != 0, "create foobar station failed\n" ); - ok( GetHandleInformation( w2, &flags ), "GetHandleInformation failed\n" ); - ok( GetHandleInformation( w3, &flags ), "GetHandleInformation failed\n" ); - - SetProcessWindowStation( w2 ); - register_class(); - atom = GlobalAddAtomA("foo"); - ok( GlobalGetAtomNameA( atom, buffer, sizeof(buffer) ) == 3, "GlobalGetAtomName failed\n" ); - ok( !lstrcmpiA( buffer, "foo" ), "bad atom value %s\n", buffer ); - - ok( !CloseWindowStation( w2 ), "CloseWindowStation succeeded\n" ); - ok( GetHandleInformation( w2, &flags ), "GetHandleInformation failed\n" ); - - SetProcessWindowStation( w3 ); - ok( GetHandleInformation( w2, &flags ), "GetHandleInformation failed\n" ); - ok( CloseWindowStation( w2 ), "CloseWindowStation failed\n" ); - ok( GlobalGetAtomNameA( atom, buffer, sizeof(buffer) ) == 3, "GlobalGetAtomName failed\n" ); - ok( !lstrcmpiA( buffer, "foo" ), "bad atom value %s\n", buffer ); /* desktops */ d1 = GetThreadDesktop(GetCurrentThreadId());

18 years, 5 months

[janderwald] 21990: prevent ncpa from crashing when no component is selected. patch & bug report by ThePhysicist (bug 1519)

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue May 23 23:27:27 2006 New Revision: 21990 URL: http://svn.reactos.ru/svn/reactos?rev=21990&view=rev Log: prevent ncpa from crashing when no component is selected. patch & bug report by ThePhysicist (bug 1519) Modified: trunk/reactos/dll/cpl/ncpa/ncpa.c Modified: trunk/reactos/dll/cpl/ncpa/ncpa.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.c?rev=219… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/ncpa.c (original) +++ trunk/reactos/dll/cpl/ncpa/ncpa.c Tue May 23 23:27:27 2006 @@ -263,11 +263,11 @@ SetDlgItemText(hwndDlg,IDC_NETCARDNAME,tpszDisplayName); EnableWindow(GetDlgItem(hwndDlg,IDC_CONFIGURE),FALSE); - SetWindowLongPtr(hwndDlg,GWL_USERDATA,(DWORD_PTR)lParam); //SetDlgItemTextA(hwndDlg,IDC_NETCARDNAME,Info[pPage->lParam].Description); EnumRegKeys(NICPropertyProtocolCallback,hwndDlg,HKEY_LOCAL_MACHINE,_T("System\\CurrentControlSet\\Control\\Network\\{4D36E975-E325-11CE-BFC1-08002BE10318}")); + SendDlgItemMessage(hwndDlg, IDC_COMPONENTSLIST, LB_SETCURSEL, 0, 0); } break; case WM_COMMAND: @@ -302,14 +302,16 @@ // drop though case IDC_PROPERTIES: { - TCHAR *tpszSubKey; + TCHAR *tpszSubKey = NULL; TCHAR tpszNDIKey[MAX_PATH]; TCHAR tpszClsIDText[MAX_PATH]; TCHAR *tpszTCPIPClsID = _T("{A907657F-6FDF-11D0-8EFB-00C04FD912B2}"); HKEY hNDIKey; DWORD dwType,dwSize; HWND hListBox = GetDlgItem(hwndDlg,IDC_COMPONENTSLIST); - tpszSubKey = (TCHAR*)SendMessage(hListBox,LB_GETITEMDATA,SendMessage(hListBox,LB_GETCURSEL,0,0),0); + int iListBoxIndex = SendMessage(hListBox,LB_GETCURSEL,0,0); + if(iListBoxIndex != LB_ERR) + tpszSubKey = (TCHAR*)SendMessage(hListBox,LB_GETITEMDATA,iListBoxIndex,0); if(!tpszSubKey) break; _stprintf(tpszNDIKey,_T("%s\\Ndi"),tpszSubKey); @@ -598,9 +600,8 @@ EnableWindow(GetDlgItem(hwndDlg,IDC_ADD),FALSE); EnableWindow(GetDlgItem(hwndDlg,IDC_REMOVE),FALSE); + EnumAdapters(hwndDlg); SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_SETCURSEL,0,0); - - EnumAdapters(hwndDlg); } break;

18 years, 5 months

[fireball] 21989: - Thomas Weidenmuller: Fix calculating the string offset. - Fixes bug 1475: Taskmanager shows mumbojumbo in the process name column

by fireball＠svn.reactos.org

Author: fireball Date: Tue May 23 20:52:51 2006 New Revision: 21989 URL: http://svn.reactos.ru/svn/reactos?rev=21989&view=rev Log: - Thomas Weidenmuller: Fix calculating the string offset. - Fixes bug 1475: Taskmanager shows mumbojumbo in the process name column Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c Tue May 23 20:52:51 2006 @@ -599,7 +599,7 @@ } // size of the structure for every process - curSize = sizeof(SYSTEM_PROCESS_INFORMATION)-sizeof(SYSTEM_THREAD_INFORMATION)+sizeof(SYSTEM_THREAD_INFORMATION)*nThreads; + curSize = sizeof(SYSTEM_PROCESS_INFORMATION)+sizeof(SYSTEM_THREAD_INFORMATION)*nThreads; ovlSize += curSize+inLen; if (ovlSize > Size)

18 years, 5 months

[hpoussin] 21988: Add serial ports information in registry, to be able to use serial ports (and serial mice) on non-ACPI systems.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue May 23 12:58:31 2006 New Revision: 21988 URL: http://svn.reactos.ru/svn/reactos?rev=21988&view=rev Log: Add serial ports information in registry, to be able to use serial ports (and serial mice) on non-ACPI systems. Modified: branches/ros-branch-0_3_0/reactos/boot/bootdata/hivesys.inf Modified: branches/ros-branch-0_3_0/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/boot/bo… ============================================================================== --- branches/ros-branch-0_3_0/reactos/boot/bootdata/hivesys.inf (original) +++ branches/ros-branch-0_3_0/reactos/boot/bootdata/hivesys.inf Tue May 23 12:58:31 2006 @@ -760,4 +760,26 @@ HKLM,"SYSTEM\Setup","SetupType",0x00010001,0x00000001 HKLM,"SYSTEM\Setup","SystemPartition",0x00000000,"\Device\Harddisk0\Partition1" HKLM,"SYSTEM\Setup","SystemSetupInProgress",0x00010001,0x00000001 + +; Devices which should be installed by plug-and-play, but +; which are currently not detected on non-ACPI systems + +; Serial port COM1 +HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP0501\1","HardwareID",0x00010000,"*PNP0501" +HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP0501\1","DeviceDesc",0x00000000,"Communication port" +HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP0501\1\LogConf","BasicConfigVector",0x000A0001, \ +58,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00, \ +01,00,00,00,01,00,01,00,02,00,00,00, \ +00,01,01,00,11,00,00,00,08,00,00,00,00,00,00,00,f8,03,00,00,00,00,00,00,ff,03,00,00,00,00,00,00, \ +00,02,01,00,11,00,00,00,04,00,00,00,04,00,00,00 + +; Serial port COM2 +HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP0501\2","HardwareID",0x00010000,"*PNP0501" +HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP0501\2","DeviceDesc",0x00000000,"Communication port" +HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP0501\2\LogConf","BasicConfigVector",0x000A0001, \ +58,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00, \ +01,00,00,00,01,00,01,00,02,00,00,00, \ +00,01,01,00,11,00,00,00,08,00,00,00,00,00,00,00,f8,02,00,00,00,00,00,00,ff,02,00,00,00,00,00,00, \ +00,02,01,00,11,00,00,00,03,00,00,00,03,00,00,00 + ; EOF

18 years, 5 months

[greatlrd] 21987: [AUDIT] after looking through code no signs of reverse engineering were found. It look as the Arthur was inspired of DJGPP ansi functions. for it is alot simulare

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Tue May 23 08:53:31 2006 New Revision: 21987 URL: http://svn.reactos.ru/svn/reactos?rev=21987&view=rev Log: [AUDIT] after looking through code no signs of reverse engineering were found. It look as the Arthur was inspired of DJGPP ansi functions. for it is alot simulare Modified: trunk/reactos/lib/crt/stdlib/wfulpath.c (props changed) trunk/reactos/lib/crt/stdlib/wmakpath.c (props changed) trunk/reactos/lib/crt/stdlib/wputenv.c (props changed) trunk/reactos/lib/crt/stdlib/wsenv.c (props changed) trunk/reactos/lib/crt/stdlib/wsplitp.c (props changed) trunk/reactos/lib/crt/stdlib/wtoi.c (props changed) trunk/reactos/lib/crt/stdlib/wtoi64.c (props changed) trunk/reactos/lib/crt/stdlib/wtol.c (props changed) Propchange: trunk/reactos/lib/crt/stdlib/wfulpath.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/stdlib/wmakpath.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/stdlib/wputenv.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/stdlib/wsenv.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/stdlib/wsplitp.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/stdlib/wtoi.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/stdlib/wtoi64.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/stdlib/wtol.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 5 months

← Newer
1
...
12
13
14
15
16
17
18
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2006