Ros-dev June 2008

ros-dev@reactos.org

28 participants
34 discussions

Re: [ros-dev] [ros-diffs] [gbrunmar] 33689: * Changed to correct signature of NtUserGetClassName() * Implemented correct behaviour in GetRealWindowClass(), but in reality just shifted the todo parts to NtUserGetClassName() instead.

by Alex Ionescu

This change breaks mIRC. By the way: 1) Congratulations on the fact it took two weeks for someone to report this on BZ And 2) Even more congratulations on the fact that it's been another week since then, and nobody has: 2.1) Emailed the ros-dev about this yet 2.2) And/or reverted this change. Let's try to ignore this until 0.3.6, to make sure that we ship with a broken release. On 25-May-08, at 1:36 AM, gbrunmar(a)svn.reactos.org wrote: > Author: gbrunmar > Date: Sun May 25 03:36:30 2008 > New Revision: 33689 > > URL: http://svn.reactos.org/svn/reactos?rev=33689&view=rev > Log: > * Changed to correct signature of NtUserGetClassName() > * Implemented correct behaviour in GetRealWindowClass(), but in > reality just shifted the todo parts to NtUserGetClassName() instead. > > Modified: > trunk/reactos/dll/win32/user32/windows/class.c > trunk/reactos/include/reactos/win32k/ntuser.h > trunk/reactos/subsystems/win32/win32k/ntuser/class.c > > Modified: trunk/reactos/dll/win32/user32/windows/class.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… > = > = > = > = > = > = > = > = > ====================================================================== > --- trunk/reactos/dll/win32/user32/windows/class.c [iso-8859-1] > (original) > +++ trunk/reactos/dll/win32/user32/windows/class.c [iso-8859-1] Sun > May 25 03:36:30 2008 > @@ -421,15 +421,22 @@ > LPSTR lpClassName, > int nMaxCount) > { > - ANSI_STRING ClassName; > - int Result; > - > - ClassName.MaximumLength = nMaxCount; > - ClassName.Buffer = lpClassName; > - > - Result = NtUserGetClassName(hWnd, > - (PUNICODE_STRING)&ClassName, > - TRUE); > + UNICODE_STRING ClassName; > + INT Result; > + > + ClassName.MaximumLength = nMaxCount * sizeof(WCHAR); > + ClassName.Buffer = LocalAlloc(LMEM_FIXED, > ClassName.MaximumLength); > + if (ClassName.Buffer == NULL) > + { > + SetLastError(ERROR_NOT_ENOUGH_MEMORY); > + return 0; > + } > + > + Result = NtUserGetClassName(hWnd, FALSE, &ClassName); > + > + WideCharToMultiByte(CP_ACP, 0, ClassName.Buffer, Result, > lpClassName, nMaxCount - 1, NULL, NULL); > + lpClassName[nMaxCount - 1] = '\0'; > + LocalFree(ClassName.Buffer); > > TRACE("%p class/atom: %s/%04x %x\n", hWnd, > IS_ATOM(lpClassName) ? NULL : lpClassName, > @@ -456,9 +463,7 @@ > ClassName.MaximumLength = nMaxCount * sizeof(WCHAR); > ClassName.Buffer = lpClassName; > > - Result = NtUserGetClassName(hWnd, > - &ClassName, > - FALSE); > + Result = NtUserGetClassName(hWnd, FALSE, &ClassName); > > TRACE("%p class/atom: %S/%04x %x\n", hWnd, > IS_ATOM(lpClassName) ? NULL : lpClassName, > @@ -629,12 +634,24 @@ > UINT > STDCALL > RealGetWindowClassW( > - HWND hwnd, > + HWND hWnd, > LPWSTR pszType, > UINT cchType) > { > - /* FIXME: Implement correct functionality of RealGetWindowClass */ > - return GetClassNameW(hwnd,pszType,cchType); > + UNICODE_STRING ClassName; > + UINT Length; > + > + ClassName.MaximumLength = cchType * sizeof(WCHAR); > + ClassName.Buffer = pszType; > + > + Length = NtUserGetClassName(hWnd, TRUE, &ClassName); > + > + TRACE("%p class/atom: %S/%04x %x\n", hWnd, > + IS_ATOM(pszType) ? NULL : pszType, > + IS_ATOM(pszType) ? pszType : 0, > + cchType); > + > + return Length; > } > > > @@ -644,12 +661,33 @@ > UINT > STDCALL > RealGetWindowClassA( > - HWND hwnd, > + HWND hWnd, > LPSTR pszType, > UINT cchType) > { > - /* FIXME: Implement correct functionality of RealGetWindowClass */ > - return GetClassNameA(hwnd,pszType,cchType); > + UNICODE_STRING ClassName; > + UINT Length; > + > + ClassName.MaximumLength = cchType * sizeof(WCHAR); > + ClassName.Buffer = LocalAlloc(LMEM_FIXED, > ClassName.MaximumLength); > + if (ClassName.Buffer == NULL) > + { > + SetLastError(ERROR_NOT_ENOUGH_MEMORY); > + return 0; > + } > + > + Length = NtUserGetClassName(hWnd, TRUE, &ClassName); > + > + WideCharToMultiByte(CP_ACP, 0, ClassName.Buffer, Length, > pszType, cchType - 1, NULL, NULL); > + pszType[cchType - 1] = '\0'; > + LocalFree(ClassName.Buffer); > + > + TRACE("%p class/atom: %s/%04x %x\n", hWnd, > + IS_ATOM(pszType) ? NULL : pszType, > + IS_ATOM(pszType) ? pszType : 0, > + cchType); > + > + return Length; > } > > /* > > Modified: trunk/reactos/include/reactos/win32k/ntuser.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… > = > = > = > = > = > = > = > = > ====================================================================== > --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] > (original) > +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sun > May 25 03:36:30 2008 > @@ -1160,18 +1160,11 @@ > LPWSTR *ppszMenuName, > BOOL Ansi); > > -INT > +UINT > NTAPI > NtUserGetClassName(HWND hWnd, > - PUNICODE_STRING ClassName, > - BOOL Ansi); > -#if 0 // Real NtUserGetClassName > -INT > -NTAPI > -NtUserGetClassName(HWND hWnd, > - BOOL Unknown, // 0 GetClassNameW, 1 > RealGetWindowClassA/W > + BOOL bGetRealClass, // 0 GetClassNameA/W, 1 > RealGetWindowClassA/W > PUNICODE_STRING ClassName); > -#endif > > HANDLE > NTAPI > > Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… > = > = > = > = > = > = > = > = > ====================================================================== > --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c > [iso-8859-1] (original) > +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c > [iso-8859-1] Sun May 25 03:36:30 2008 > @@ -1255,118 +1255,39 @@ > > INT > UserGetClassName(IN PWINDOWCLASS Class, > - IN OUT PUNICODE_STRING ClassName, > - IN BOOL Ansi) > + IN OUT PUNICODE_STRING ClassName) > { > NTSTATUS Status = STATUS_SUCCESS; > - WCHAR szStaticTemp[32]; > - PWSTR szTemp = NULL; > - ULONG BufLen = sizeof(szStaticTemp); > + ULONG BufLen; > INT Ret = 0; > > /* Note: Accessing the buffer in ClassName may raise an > exception! */ > > _SEH_TRY > { > - if (Ansi) > - { > - PANSI_STRING AnsiClassName = (PANSI_STRING)ClassName; > - UNICODE_STRING UnicodeClassName; > - > - /* limit the size of the static buffer on the stack to > the > - size of the buffer provided by the caller */ > - if (BufLen / sizeof(WCHAR) > AnsiClassName- > >MaximumLength) > - { > - BufLen = AnsiClassName->MaximumLength * > sizeof(WCHAR); > - } > - > - /* find out how big the buffer needs to be */ > - Status = RtlQueryAtomInAtomTable(gAtomTable, > - Class->Atom, > - NULL, > - NULL, > - szStaticTemp, > - &BufLen); > - if (Status == STATUS_BUFFER_TOO_SMALL) > - { > - if (BufLen / sizeof(WCHAR) > AnsiClassName- > >MaximumLength) > - { > - /* the buffer required exceeds the ansi buffer > provided, > - pretend like we're using the ansi buffer and > limit the > - size to the buffer size provided */ > - BufLen = AnsiClassName->MaximumLength * > sizeof(WCHAR); > - } > - > - /* allocate a temporary buffer that can hold the > unicode class name */ > - szTemp = ExAllocatePool(PagedPool, > - BufLen); > - if (szTemp == NULL) > - { > - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); > - _SEH_LEAVE; > - } > - > - /* query the class name */ > - Status = RtlQueryAtomInAtomTable(gAtomTable, > - Class->Atom, > - NULL, > - NULL, > - szTemp, > - &BufLen); > - } > - else > - szTemp = szStaticTemp; > - > - if (NT_SUCCESS(Status)) > - { > - /* convert the atom name to ansi */ > - > - RtlInitUnicodeString(&UnicodeClassName, > - szTemp); > - > - Status = RtlUnicodeStringToAnsiString(AnsiClassName, > - > &UnicodeClassName, > - FALSE); > - if (!NT_SUCCESS(Status)) > - { > - SetLastNtError(Status); > - _SEH_LEAVE; > - } > - } > - > - Ret = BufLen / sizeof(WCHAR); > - } > - else /* !Ansi */ > - { > - BufLen = ClassName->MaximumLength; > - > - /* query the atom name */ > - Status = RtlQueryAtomInAtomTable(gAtomTable, > - Class->Atom, > - NULL, > - NULL, > - ClassName->Buffer, > - &BufLen); > - > - if (!NT_SUCCESS(Status)) > - { > - SetLastNtError(Status); > - _SEH_LEAVE; > - } > - > - Ret = BufLen / sizeof(WCHAR); > - } > + BufLen = ClassName->MaximumLength; > + > + /* query the atom name */ > + Status = RtlQueryAtomInAtomTable(gAtomTable, > + Class->Atom, > + NULL, > + NULL, > + ClassName->Buffer, > + &BufLen); > + > + if (!NT_SUCCESS(Status)) > + { > + SetLastNtError(Status); > + _SEH_LEAVE; > + } > + > + Ret = BufLen / sizeof(WCHAR); > } > _SEH_HANDLE > { > SetLastNtError(_SEH_GetExceptionCode()); > } > _SEH_END; > - > - if (Ansi && szTemp != NULL && szTemp != szStaticTemp) > - { > - ExFreePool(szTemp); > - } > > return Ret; > } > @@ -2265,10 +2186,10 @@ > > > > -INT NTAPI > -NtUserGetClassName (IN HWND hWnd, > - OUT PUNICODE_STRING ClassName, > - IN BOOL Ansi) > +UINT NTAPI > +NtUserGetClassName(IN HWND hWnd, > + IN BOOL bGetRealClass, // 0 GetClassNameA/W, 1 > RealGetWindowClassA/W > + OUT PUNICODE_STRING ClassName) > { > PWINDOW_OBJECT Window; > UNICODE_STRING CapturedClassName; > @@ -2284,10 +2205,11 @@ > ProbeForWriteUnicodeString(ClassName); > CapturedClassName = *ClassName; > > + /* TODO: Get real class name here if bGetRealClass == > TRUE */ > + > /* get the class name */ > Ret = UserGetClassName(Window->Wnd->Class, > - &CapturedClassName, > - Ansi); > + &CapturedClassName); > > if (Ret != 0) > { > Best regards, Alex Ionescu

16 years, 6 months

Re: [ros-dev] [ros-diffs] [tkreuzer] 33912: fix an endless loop bug See issue #2142 for more details.

by Steven Edwards

On Mon, Jun 9, 2008 at 4:57 PM, <tkreuzer(a)svn.reactos.org> wrote: > See issue #2142 for more details. Is there anyway we can add a macro so that when the commit message see's "See issue #### for more details." It will auto magically link to bugzilla? I would look at more bugs as the patches come in but I am too lazy to manually open another tab and copy/paste the bug number. I could set a macro in firefox where I do "bug ####' but that means I still have to manually open a new tab and copy and paste, like I said I am lazy. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

16 years, 6 months

comctl32 treeview

by Timo Kreuzer

Hi, The bug in comctl32 that makes treeviews get messed up on collapsing nodes... ROS: http://www.reactos.org/bugzilla/show_bug.cgi?id=2843 WINE: http://bugs.winehq.org/show_bug.cgi?id=10544 Could someone having wine sources / GIT, please create a patch and send it to the wine-patches mailing list. Thanks, Timo

16 years, 6 months

rethinking over some thing in ReactOS

by Magnus Olsen

HI I am been rethinking over some thing in ReactOS mean while I will not be avail coding on ReactOS at all or do any commit or helping people as I use to. I am still piss over some matter betwin me and Alesky this matter is betwin us two. What happen betwin us is betwin us. That is all I have say for now. about that matter. And I am rethinking over a sugestions I got from a old freind maybe start working for him. I do not known if I do i can not be coding on any opensource project the contract is for long terms contract and will need all skill I have. I got this offer for long time ago and I did say no to it, but it still stand, reason I did say no to it was I did not want coding behine dorrs or come up new ideas that being use behine dorrs and u are not avail to talk about them. I see allot of my life works are being using of all people that own a laptop or cellphone today. But one can backtrace the techlogic to me. what I done. That is how I did want thing be when I was younger. it is some background info what I did before 2003 after I join ReactOS most people I known ask me if I can quit from ReactOS and start working for them. One video card manufactor did contact me when I join ReactOS I can not tell which one. I solv the main issue I and the manufactor did have. it was how to open directx hal for the graphic card. next issue I solv was how to create a surface and access all other part of directx hal. Next issue we got was DirectX DdBlt it did not work direcly it took me and the manufactor around 2 days figout how to use DdBlt so it was avail to blit and see it on the screen. This informations did not exstis at all in MSDN. after I told open how it was done and start implemeted it in reactos MS did update the doc how to optain DirectX HAL. See GdiEntry1-16 This does not mean I am leving ReactOS it mean I need rethink what I want todo the options I got is very good one. I like the offer I got. and I do not known if I will say yes or no I am not a person say direcly no to money but none can buy me for money. I choice what I want todo. even it is bad payment. I have say no to many good deal and work in pass. Steven what I told u before, I stand with my word, and waiting on you mail about the details. To reash me is not via irc any longer it is on icq / skype or my mail address. Bestregards Magnus Olsen

16 years, 6 months

Development process - once again

by Aleksey Bragin

Hi, this question seems to arise periodically, so let's have a constructive discussion again about the issue once again. The issue is being that a lot of people have direct commit access to the repository, and sooner or later some of them commit patches which introduce a regress in functionality. I will use Magnus (GreatLord) again as an example. He was doing a good thing (as usual), but then somehow lost focus, and along with good fixes committed a breakage for FF2.0 installer (and all other apps using PatBlt functions). I had to (as usual!) spend the whole morning reviewing all his diffs, then regress-testing by bisection to find the guilty revision, then work out a better solution with him, and then come to agreement that the guilty commit could be just reverted for now, since it partly works anyway. This takes up significant amount of my time, which could go into something more productive than just testing patches, finding way to unregress, and so on. Especially I'm angry about this happening right when approaching 0.3.5 release. Ideally (as I explained in #reactos today to blight_), I want the trunk itself be directly committable only by a very limited number of persons, and all developers should be committing to "some other place" at first, and then their patches merged by reviewers/testers (yes, manually, sometimes just reviewing may be enough to commit/ reject the patch, sometimes a thorough testing must be involved, maybe additional devs asked for a review). blight_ called this as a "linux development model" with an intermediate branch - yes, maybe, why not?. What I definately don't want to do is to scare developers away and make their life more complicated by need of sending text patches (this is just not convinient, and as seen on the example of Wine makes a lot of possible contributors going away). I remember what Alex proposed (those who don't, may look up ros-dev ML archives with a similar topic). Would there be any new prepositions? Maybe someone discovered a new CIS for SVN, or a decentralized VCS for patch submission and usual SVN for maintaining HEAD? With time, developers number is only going to increase, so this problem will become more and more annoying. With the best regards, Aleksey Bragin.

16 years, 6 months

[ros-diffs] [jimtabor] 33830: Move xform data from W structure into DcLevel within unions.

by James Tabor

Hi, I'm going to explain this ONCE: 1st: The move was to conserve and reduce space and size of the current structure. Writing a floating point package could be hard to do or just copyleft one off the net.... Problem is if we do the later it will most likely not be compatible with M$ SFPP. BTW, M$ did patent their strange and unusual floating point package. Which means I can not write one! Just writing the storage emulation is almost a problem too... But due to US patent law I can just do what I did, to "Talk to the Interface" with the storage emulation. Keeping the current state of ReactOS FP is my first choice. We use the speed of the FPU which is part of the main processor and reduce the size of the source. (Two pluses so far, Speed and Small Size.) The storage emulation for gdi32 is important for compatibility and with ReactOS concept of drop in replacement and play. Thanks, my 1EU References: Fast floating-point truncation to integer form - US Patent 6535898: http://v3.espacenet.com/textdoc?DB=EPODOC&IDX=US6535898&F=0 Use of indices for queries with comparisons based on a function: http://v3.espacenet.com/textdoc?DB=EPODOC&IDX=EP1193619&F=0 System and method for fast and smooth rendering of lit, textured spheres: http://v3.espacenet.com/textdoc?DB=EPODOC&IDX=EP1227443&F=0 John R. Hauser SoftFloat package : http://www.jhauser.us/arithmetic/SoftFloat.html IEEE 754 floating-point test software: http://www.math.utah.edu/~beebe/software/ieee/

16 years, 6 months

Firefox 1.5 installation regressed

by Aleksey Bragin

Hi, I experience a hang of FF 1.5 installation app at "0% Extracting". Sometimes hangs completely (even mouse doesn't move), sometimes I'm able to click "X" and choose yes to cancel. It started happening at least since yesterday. WBR, Aleksey Bragin.

16 years, 6 months

VIA 6103 Rhine II Net Driver Install Crash

by James Tabor

Hi, I like to start testing FF again on hardware but this bug is still open. http://www.reactos.org/bugzilla/show_bug.cgi?id=2987 I've copied most of the netamd.inf from Ros to match with the inf for the driver. But still the same crash. Please let me know, James

16 years, 6 months

[ros-diffs] [tkreuzer] 33856: - fix mem leak when failing to create an extpen with penstyles

by James Tabor

Hi! There was a reason for doing what I commit'ed,,,, since you are looking at it can you please fix this. 8^) James gdi32_winetest pen ExFreePool of already freed address 80e8ba78 KeBugCheck at ntoskrnl/mm/npool.c:1566 *** Fatal System Error: 0x00000000 (0x00000000,0x00000000,0x00000000,0x00000000) Entered debugger on embedded INT3 at 0x0008:0x808ac7d8. kdb:> bt Eip: <NTOSKRNL.EXE:ac7d9 (lib/rtl/i386/debug_asm.S:42 (RtlpBreakWithStatusInstruction))> Frames: <NTOSKRNL.EXE:29a2 (ntoskrnl/ke/bug.c:1100 (KeBugCheckWithTf@24))> <NTOSKRNL.EXE:2aac (ntoskrnl/ke/bug.c:1364 (KeBugCheck@4))> <NTOSKRNL.EXE:5f00c (ntoskrnl/mm/npool.c:1567 (ExFreeNonPagedPool@4))> <NTOSKRNL.EXE:61e64 (ntoskrnl/mm/pool.c:238 (ExFreePool@4))> <win32k.sys:967ff (subsystems/win32/win32k/objects/pen.c:344 (NtGdiExtCreatePen@44))> <NTOSKRNL.EXE:96eda (ntoskrnl/ke/i386/trap.s:244 (KiFastCallEntry))> <ntdll.dll:5dda> <gdi32_winetest.EXE:3b497> <gdi32_winetest.EXE:3d605> <gdi32_winetest.EXE:3d78d> <gdi32_winetest.EXE:3dc3d> <gdi32_winetest.EXE:3dc6a> <kernel32.dll:21610> <00000000>

16 years, 6 months

Re: [ros-dev] [ros-diffs] [cfinck] 33824: - Add a test suite for ws2_32.dll It currently tests the features I needed to adjust/implement when fixing the wininet problem. ReactOS currently passes all tests, but fails one if you launch the test app for the second tim

by gedmurphy

Should this not be in the wine tests framework? The API tests framework is quite a specialized model more suited for subsystem testing. Putting the ws2_32 stuff here just makes it more inconvenient to test. Ged. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of cfinck(a)svn.reactos.org Sent: 01 June 2008 23:09 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [cfinck] 33824: - Add a test suite for ws2_32.dll It currently tests the features I needed to adjust/implement when fixing the wininet problem. ReactOS currently passes all tests, but fails one if you launch the test app for the second time qu Author: cfinck Date: Sun Jun 1 17:08:45 2008 New Revision: 33824 URL: http://svn.reactos.org/svn/reactos?rev=33824&view=rev Log: - Add a test suite for ws2_32.dll It currently tests the features I needed to adjust/implement when fixing the wininet problem. ReactOS currently passes all tests, but fails one if you launch the test app for the second time quickly after the first time (timing problem in the network code?). - Fix the behaviour on an ioctlsocket FIONREAD call: The output buffer is not touched, when we have no socket, but when we have no connection, it is set to 0. - Forward the socket call to WSASocketW instead of WSASocketA, minimal performance improvement Added: trunk/rostests/apitests/ws2_32/ (with props) trunk/rostests/apitests/ws2_32/helpers.c (with props) trunk/rostests/apitests/ws2_32/testlist.c (with props) trunk/rostests/apitests/ws2_32/tests/ trunk/rostests/apitests/ws2_32/tests/ioctlsocket.c (with props) trunk/rostests/apitests/ws2_32/tests/recv.c (with props) trunk/rostests/apitests/ws2_32/ws2_32.c (with props) trunk/rostests/apitests/ws2_32/ws2_32.h (with props) trunk/rostests/apitests/ws2_32/ws2_32.rbuild (with props) Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c trunk/reactos/drivers/network/afd/afd/info.c trunk/rostests/apitests/directory.rbuild Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -166,7 +166,7 @@ IN INT type, IN INT protocol) { - return WSASocketA(af, + return WSASocketW(af, type, protocol, NULL, Modified: trunk/reactos/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -49,9 +49,9 @@ break; case AFD_INFO_RECEIVE_CONTENT_SIZE: - /* Only touch InfoReq if we actually have a valid connection. + /* Only touch InfoReq if a socket has been set up. Behaviour was verified under WinXP SP2. */ - if(FCB->Connection.Handle) + if(FCB->AddressFile.Object) InfoReq->Information.Ulong = FCB->Recv.Content - FCB->Recv.BytesUsed; break; Modified: trunk/rostests/apitests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/directory.rbuild… ============================================================================== --- trunk/rostests/apitests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/apitests/directory.rbuild [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -23,4 +23,8 @@ <directory name="w32knapi"> <xi:include href="w32knapi/w32knapi.rbuild" /> </directory> + + <directory name="ws2_32"> + <xi:include href="ws2_32/ws2_32.rbuild" /> + </directory> </group> Propchange: trunk/rostests/apitests/ws2_32/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Jun 1 17:08:45 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Added: trunk/rostests/apitests/ws2_32/helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/helpers.c… ============================================================================== --- trunk/rostests/apitests/ws2_32/helpers.c (added) +++ trunk/rostests/apitests/ws2_32/helpers.c [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -1,0 +1,65 @@ +/* + * PROJECT: ws2_32.dll API tests + * LICENSE: GPLv2 or any later version + * FILE: apitests/ws2_32/helpers.c + * PURPOSE: Helper functions for the socket tests + * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> + */ + +#include "ws2_32.h" + +int CreateSocket(PTESTINFO pti, SOCKET* psck) +{ + /* Create the socket */ + *psck = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + TEST(*psck != INVALID_SOCKET); + + if(*psck == INVALID_SOCKET) + { + printf("Winsock error code is %u\n", WSAGetLastError()); + WSACleanup(); + return APISTATUS_ASSERTION_FAILED; + } + + return APISTATUS_NORMAL; +} + +int ConnectToReactOSWebsite(PTESTINFO pti, SOCKET sck) +{ + int iResult; + struct hostent* host; + struct sockaddr_in sa; + + /* Connect to "www.reactos.org" */ + host = gethostbyname("www.reactos.org"); + + sa.sin_family = AF_INET; + sa.sin_addr.s_addr = *(u_long*)host->h_addr_list[0]; + sa.sin_port = htons(80); + + SCKTEST(connect(sck, (struct sockaddr *)&sa, sizeof(sa))); + + return APISTATUS_NORMAL; +} + +int GetRequestAndWait(PTESTINFO pti, SOCKET sck) +{ + const char szGetRequest[] = "GET / HTTP/1.0\r\n\r\n"; + int iResult; + struct fd_set readable; + + /* Send the GET request */ + SCKTEST(send(sck, szGetRequest, strlen(szGetRequest), 0)); + TEST(iResult == strlen(szGetRequest)); + + /* Shutdown the SEND connection */ + SCKTEST(shutdown(sck, SD_SEND)); + + /* Wait until we're ready to read */ + FD_ZERO(&readable); + FD_SET(sck, &readable); + + SCKTEST(select(0, &readable, NULL, NULL, NULL)); + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/ws2_32/helpers.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ws2_32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/testlist.… ============================================================================== --- trunk/rostests/apitests/ws2_32/testlist.c (added) +++ trunk/rostests/apitests/ws2_32/testlist.c [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -1,0 +1,33 @@ +/* + * PROJECT: ws2_32.dll API tests + * LICENSE: GPLv2 or any later version + * FILE: apitests/ws2_32/testlist.c + * PURPOSE: Test list file + * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> + */ + +#ifndef _WS2_32_TESTLIST_H +#define _WS2_32_TESTLIST_H + +#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) + +#include "ws2_32.h" + +/* include the tests */ +#include "tests/ioctlsocket.c" +#include "tests/recv.c" + +/* The List of tests */ +TESTENTRY TestList[] = +{ + { L"ioctlsocket", Test_ioctlsocket }, + { L"recv", Test_recv } +}; + +/* The function that gives us the number of tests */ +INT NumTests(void) +{ + return ARRAY_SIZE(TestList); +} + +#endif Propchange: trunk/rostests/apitests/ws2_32/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ws2_32/tests/ioctlsocket.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/tests/ioc… ============================================================================== --- trunk/rostests/apitests/ws2_32/tests/ioctlsocket.c (added) +++ trunk/rostests/apitests/ws2_32/tests/ioctlsocket.c [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -1,0 +1,83 @@ +/* + * PROJECT: ws2_32.dll API tests + * LICENSE: GPLv2 or any later version + * FILE: apitests/ws2_32/tests/ioctlsocket.c + * PURPOSE: Tests for the ioctlsocket function + * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> + */ + +#include "../ws2_32.h" + +/* For valid test results, the ReactOS Website needs to return at least 2 bytes on a "GET / HTTP/1.0" request. */ +INT +Test_ioctlsocket(PTESTINFO pti) +{ + LPSTR pszBuf; + int iResult; + SOCKET sck; + ULONG BytesAvailable; + ULONG BytesToRead; + WSADATA wdata; + + /* Start up Winsock */ + TEST(WSAStartup(MAKEWORD(2, 2), &wdata) == 0); + + /* If we call ioctlsocket without a socket, it should return with an error and do nothing. */ + BytesAvailable = 0xdeadbeef; + TEST(ioctlsocket(0, FIONREAD, &BytesAvailable) == SOCKET_ERROR); + TEST(BytesAvailable == 0xdeadbeef); + + /* Create the socket */ + iResult = CreateSocket(pti, &sck); + if(iResult != APISTATUS_NORMAL) + return iResult; + + /* Now we can pass at least a socket, but we have no connection yet. The function should return 0. */ + BytesAvailable = 0xdeadbeef; + TEST(ioctlsocket(sck, FIONREAD, &BytesAvailable) == 0); + TEST(BytesAvailable == 0); + + /* Connect to "www.reactos.org" */ + iResult = ConnectToReactOSWebsite(pti, sck); + if(iResult != APISTATUS_NORMAL) + return iResult; + + /* Even with a connection, there shouldn't be any bytes available. */ + TEST(ioctlsocket(sck, FIONREAD, &BytesAvailable) == 0); + TEST(BytesAvailable == 0); + + /* Send the GET request */ + iResult = GetRequestAndWait(pti, sck); + if(iResult != APISTATUS_NORMAL) + return iResult; + + /* Try ioctlsocket with FIONREAD. There should be bytes available now. */ + SCKTEST(ioctlsocket(sck, FIONREAD, &BytesAvailable)); + TEST(BytesAvailable != 0); + + /* Get half of the data */ + BytesToRead = BytesAvailable / 2; + pszBuf = (LPSTR) HeapAlloc(g_hHeap, 0, BytesToRead); + SCKTEST(recv(sck, pszBuf, BytesToRead, 0)); + HeapFree(g_hHeap, 0, pszBuf); + + BytesToRead = BytesAvailable - BytesToRead; + + /* Now try ioctlsocket again. BytesAvailable should be at the value saved in BytesToRead now. */ + SCKTEST(ioctlsocket(sck, FIONREAD, &BytesAvailable)); + TEST(BytesAvailable == BytesToRead); + + /* Read those bytes */ + pszBuf = (LPSTR) HeapAlloc(g_hHeap, 0, BytesToRead); + SCKTEST(recv(sck, pszBuf, BytesToRead, 0)); + HeapFree(g_hHeap, 0, pszBuf); + + /* Try it for the last time. BytesAvailable should be at 0 now. */ + SCKTEST(ioctlsocket(sck, FIONREAD, &BytesAvailable)); + TEST(BytesAvailable == 0); + + closesocket(sck); + WSACleanup(); + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/ws2_32/tests/ioctlsocket.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ws2_32/tests/recv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/tests/rec… ============================================================================== --- trunk/rostests/apitests/ws2_32/tests/recv.c (added) +++ trunk/rostests/apitests/ws2_32/tests/recv.c [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -1,0 +1,69 @@ +/* + * PROJECT: ws2_32.dll API tests + * LICENSE: GPLv2 or any later version + * FILE: apitests/ws2_32/tests/recv.c + * PURPOSE: Tests for the recv function + * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> + */ + +#include "../ws2_32.h" + +#define RECV_BUF 4 + +/* For valid test results, the ReactOS Website needs to return at least 8 bytes on a "GET / HTTP/1.0" request. + Also the first 4 bytes and the last 4 bytes need to be different. + Both factors usually apply on standard HTTP responses. */ +INT +Test_recv(PTESTINFO pti) +{ + const char szDummyBytes[RECV_BUF] = {0xFF, 0x00, 0xFF, 0x00}; + + char szBuf1[RECV_BUF]; + char szBuf2[RECV_BUF]; + int iResult; + SOCKET sck; + WSADATA wdata; + + /* Start up Winsock */ + TEST(WSAStartup(MAKEWORD(2, 2), &wdata) == 0); + + /* If we call recv without a socket, it should return with an error and do nothing. */ + memcpy(szBuf1, szDummyBytes, RECV_BUF); + TEST(recv(0, szBuf1, RECV_BUF, 0) == SOCKET_ERROR); + TEST(!memcmp(szBuf1, szDummyBytes, RECV_BUF)); + + /* Create the socket */ + iResult = CreateSocket(pti, &sck); + if(iResult != APISTATUS_NORMAL) + return iResult; + + /* Now we can pass at least a socket, but we have no connection yet. Should return with an error and do nothing. */ + memcpy(szBuf1, szDummyBytes, RECV_BUF); + TEST(recv(sck, szBuf1, RECV_BUF, 0) == SOCKET_ERROR); + TEST(!memcmp(szBuf1, szDummyBytes, RECV_BUF)); + + /* Connect to "www.reactos.org" */ + iResult = ConnectToReactOSWebsite(pti, sck); + if(iResult != APISTATUS_NORMAL) + return iResult; + + /* Send the GET request */ + iResult = GetRequestAndWait(pti, sck); + if(iResult != APISTATUS_NORMAL) + return iResult; + + /* Receive the data. + MSG_PEEK will not change the internal number of bytes read, so that a subsequent request should return the same bytes again. */ + SCKTEST(recv(sck, szBuf1, RECV_BUF, MSG_PEEK)); + SCKTEST(recv(sck, szBuf2, RECV_BUF, 0)); + TEST(!memcmp(szBuf1, szBuf2, RECV_BUF)); + + /* The last recv() call moved the internal file pointer, so that the next request should return different data. */ + SCKTEST(recv(sck, szBuf1, RECV_BUF, 0)); + TEST(memcmp(szBuf1, szBuf2, RECV_BUF)); + + closesocket(sck); + WSACleanup(); + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/ws2_32/tests/recv.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ws2_32/ws2_32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/ws2_32.c?… ============================================================================== --- trunk/rostests/apitests/ws2_32/ws2_32.c (added) +++ trunk/rostests/apitests/ws2_32/ws2_32.c [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -1,0 +1,24 @@ +/* + * PROJECT: ws2_32.dll API tests + * LICENSE: GPLv2 or any later version + * FILE: apitests/ws2_32/ws2_32.c + * PURPOSE: Program entry point + * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> + */ + +#include "ws2_32.h" + +HANDLE g_hHeap; + +BOOL +IsFunctionPresent(LPWSTR lpszFunction) +{ + return TRUE; +} + +int wmain() +{ + g_hHeap = GetProcessHeap(); + + return TestMain(L"ws2_32_apitests", L"ws2_32.dll"); +} Propchange: trunk/rostests/apitests/ws2_32/ws2_32.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ws2_32/ws2_32.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/ws2_32.h?… ============================================================================== --- trunk/rostests/apitests/ws2_32/ws2_32.h (added) +++ trunk/rostests/apitests/ws2_32/ws2_32.h [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -1,0 +1,36 @@ +/* + * PROJECT: ws2_32.dll API tests + * LICENSE: GPLv2 or any later version + * FILE: apitests/ws2_32/ws2_32.h + * PURPOSE: Main header file + * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> + */ + +#ifndef _WS2_32_APITESTS_H +#define _WS2_32_APITESTS_H + +#include <winsock2.h> + +#include "../apitest.h" + +/* Simple macro for executing a socket command and doing cleanup operations in case of a failure */ +#define SCKTEST(_cmd_) \ + iResult = _cmd_; \ + TEST(iResult != SOCKET_ERROR); \ + if(iResult == SOCKET_ERROR) \ + { \ + printf("Winsock error code is %u\n", WSAGetLastError()); \ + closesocket(sck); \ + WSACleanup(); \ + return APISTATUS_ASSERTION_FAILED; \ + } + +/* helpers.c */ +int CreateSocket(PTESTINFO pti, SOCKET* sck); +int ConnectToReactOSWebsite(PTESTINFO pti, SOCKET sck); +int GetRequestAndWait(PTESTINFO pti, SOCKET sck); + +/* ws2_32.c */ +extern HANDLE g_hHeap; + +#endif Propchange: trunk/rostests/apitests/ws2_32/ws2_32.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ws2_32/ws2_32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/ws2_32.rb… ============================================================================== --- trunk/rostests/apitests/ws2_32/ws2_32.rbuild (added) +++ trunk/rostests/apitests/ws2_32/ws2_32.rbuild [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -1,0 +1,11 @@ +<module name="ws2_32_apitests" type="win32cui" unicode="yes"> + <define name="_WIN32_WINNT">0x0501</define> + <library>apitest</library> + <library>kernel32</library> + <library>user32</library> + <library>shell32</library> + <library>ws2_32</library> + <file>helpers.c</file> + <file>testlist.c</file> + <file>ws2_32.c</file> +</module> Propchange: trunk/rostests/apitests/ws2_32/ws2_32.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 6 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev June 2008