Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 48629: [USER32] - Revert r47238 as requested by Giannis: "this commit breaks any program that wants to subclass mdi client windows"
by tkreuzer＠svn.reactos.org 27 Aug '10

27 Aug '10

Author: tkreuzer Date: Fri Aug 27 10:20:25 2010 New Revision: 48629 URL: http://svn.reactos.org/svn/reactos?rev=48629&view=rev Log: [USER32] - Revert r47238 as requested by Giannis: "this commit breaks any program that wants to subclass mdi client windows" Modified: trunk/reactos/dll/win32/user32/windows/window.c Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Fri Aug 27 10:20:25 2010 @@ -342,18 +342,6 @@ POINT mPos[2]; UINT id = 0; HWND top_child; - PWND WndParent; - PCLS pcls; - - if(!(WndParent = ValidateHwnd(hWndParent)) || - !(pcls = DesktopPtrToUser(WndParent->pcls))) - return 0; - - if (pcls->fnid != FNID_MDICLIENT) - { - ERR("WS_EX_MDICHILD, but parent %p is not MDIClient\n", hWndParent); - return 0; - } /* lpParams of WM_[NC]CREATE is different for MDI children. * MDICREATESTRUCT members have the originally passed values. @@ -466,24 +454,6 @@ POINT mPos[2]; UINT id = 0; HWND top_child; - PWND WndParent; - PCLS pcls; - - WndParent = ValidateHwnd(hWndParent); - - if(!WndParent) - return 0; - - pcls = DesktopPtrToUser(WndParent->pcls); - - if(!pcls) - return 0; - - if (pcls->fnid != FNID_MDICLIENT) - { - ERR("WS_EX_MDICHILD, but parent %p is not MDIClient\n", hWndParent); - return 0; - } /* lpParams of WM_[NC]CREATE is different for MDI children. * MDICREATESTRUCT members have the originally passed values.

1 0

[cgutman] 48628: [OSKITTCP] - Only tell the caller how much we sent/received if it completed successfully - Set SO_DONTROUTE on accepted sockets too - Disable the core routing code - Make our MSS c...
by cgutman＠svn.reactos.org 27 Aug '10

27 Aug '10

Author: cgutman Date: Fri Aug 27 04:46:04 2010 New Revision: 48628 URL: http://svn.reactos.org/svn/reactos?rev=48628&view=rev Log: [OSKITTCP] - Only tell the caller how much we sent/received if it completed successfully - Set SO_DONTROUTE on accepted sockets too - Disable the core routing code - Make our MSS calculation much better by sharing the existing code Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c trunk/reactos/lib/drivers/oskittcp/oskittcp/route.c trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] Fri Aug 27 04:46:04 2010 @@ -114,6 +114,12 @@ DbgPrint ( line ); } +void InitializeSocketFlags(struct socket *so) +{ + so->so_state |= SS_NBIO; + so->so_options |= SO_DONTROUTE; +} + /* From uipc_syscalls.c */ int OskitTCPSocket( void *context, @@ -128,8 +134,7 @@ int error = socreate(domain, &so, type, proto); if( !error ) { so->so_connection = context; - so->so_state |= SS_NBIO; - so->so_options |= SO_DONTROUTE; + InitializeSocketFlags(so); *aso = so; } OSKUnlock(); @@ -171,7 +176,7 @@ &tcp_flags ); OSKUnlock(); - *OutLen = Len - uio.uio_resid; + if (error == 0) *OutLen = Len - uio.uio_resid; return error; } @@ -318,7 +323,7 @@ error = sosend( socket, NULL, &uio, NULL, NULL, 0 ); OSKUnlock(); - *OutLen = Len - uio.uio_resid; + if (error == 0) *OutLen = Len - uio.uio_resid; return error; } @@ -400,7 +405,8 @@ if (error) goto out; - so->so_state |= SS_NBIO | SS_ISCONNECTED; + InitializeSocketFlags(so); + so->so_state |= SS_ISCONNECTED; so->so_q = so->so_q0 = NULL; so->so_qlen = so->so_q0len = 0; so->so_head = 0; Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/route.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/route.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/route.c [iso-8859-1] Fri Aug 27 04:46:04 2010 @@ -106,6 +106,7 @@ int report; u_long ignflags; { +#ifndef __REACTOS__ register struct radix_node_head *rnh = rt_tables[dst->sa_family]; register struct rtentry *rt; register struct radix_node *rn; @@ -142,6 +143,9 @@ } splx(s); return (newrt); +#else + return NULL; +#endif } void Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c [iso-8859-1] Fri Aug 27 04:46:04 2010 @@ -1973,31 +1973,26 @@ struct tcpcb *tp; int offer; { +#ifndef __REACTOS__ register struct rtentry *rt; struct ifnet *ifp = NULL; - register int rtt, mss; + struct rmxp_tao *taop; + register int rtt; +#endif + register int mss; u_long bufsize; struct inpcb *inp; struct socket *so; - struct rmxp_tao *taop; int origoffer = offer; inp = tp->t_inpcb; + so = inp->inp_socket; +#ifndef __REACTOS__ if ((rt = tcp_rtlookup(inp)) == NULL) { -#ifndef __REACTOS__ tp->t_maxopd = tp->t_maxseg = tcp_mssdflt; -#else - if (offer < tcp_mssdflt) - tp->t_maxopd = tp->t_maxseg = tcp_mssdflt; - else - tp->t_maxopd = tp->t_maxseg = min(offer, tcp_mssopt(tp)); -#endif return; } -#ifndef __REACTOS__ ifp = rt->rt_ifp; -#endif - so = inp->inp_socket; taop = rmx_taop(rt->rt_rmx); /* @@ -2006,6 +2001,7 @@ */ if (offer == -1) offer = taop->tao_mssopt; +#endif /* * Offer == 0 means that there was no MSS on the SYN segment, * in this case we use tcp_mssdflt. @@ -2020,6 +2016,7 @@ * funny things may happen in tcp_output. */ offer = max(offer, 64); +#ifndef __REACTOS__ taop->tao_mssopt = offer; /* @@ -2060,6 +2057,10 @@ if (!in_localaddr(inp->inp_faddr)) mss = min(mss, tcp_mssdflt); } +#else + mss = tcp_mssopt(tp); + mss = min(mss, tcp_mssdflt); +#endif mss = min(mss, offer); /* * maxopd stores the maximum length of data AND options @@ -2097,7 +2098,7 @@ * number of mss units; if the mss is larger than * the socket buffer, decrease the mss. */ -#ifdef RTV_SPIPE +#if defined(RTV_SPIPE) && !defined(__REACTOS__) if ((bufsize = rt->rt_rmx.rmx_sendpipe) == 0) #endif bufsize = so->so_snd.sb_hiwat; @@ -2111,7 +2112,7 @@ } tp->t_maxseg = mss; -#ifdef RTV_RPIPE +#if defined(RTV_RPIPE) && !defined(__REACTOS__) if ((bufsize = rt->rt_rmx.rmx_recvpipe) == 0) #endif bufsize = so->so_rcv.sb_hiwat; @@ -2121,12 +2122,15 @@ bufsize = sb_max; (void)sbreserve(&so->so_rcv, bufsize); } +#ifndef __REACTOS__ /* * Don't force slow-start on local network. */ if (!in_localaddr(inp->inp_faddr)) +#endif tp->snd_cwnd = mss; +#ifndef __REACTOS__ if (rt->rt_rmx.rmx_ssthresh) { /* * There's some sort of gateway or interface @@ -2137,6 +2141,7 @@ tp->snd_ssthresh = max(2 * mss, rt->rt_rmx.rmx_ssthresh); tcpstat.tcps_usedssthresh++; } +#endif } /*

1 0

[cfinck] 48627: Fix building on newer Linux systems (particularly Fedora 13) Thanks to James, Sylvain and ErVito for testing! See http://reactos.org/pipermail/ros-dev/2010-August/013338.html for mo...
by cfinck＠svn.reactos.org 26 Aug '10

26 Aug '10

Author: cfinck Date: Thu Aug 26 18:33:46 2010 New Revision: 48627 URL: http://svn.reactos.org/svn/reactos?rev=48627&view=rev Log: Fix building on newer Linux systems (particularly Fedora 13) Thanks to James, Sylvain and ErVito for testing! See http://reactos.org/pipermail/ros-dev/2010-August/013338.html for more details Modified: trunk/reactos/tools/cabman/cabinet.cxx Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?r… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.cxx [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/cabinet.cxx [iso-8859-1] Thu Aug 26 18:33:46 2010 @@ -20,10 +20,9 @@ #include <string.h> #if !defined(WIN32) # include <dirent.h> -#endif -#if defined(__FreeBSD__) || defined(__APPLE__) # include <sys/stat.h> -#endif // __FreeBSD__ +# include <sys/types.h> +#endif #include "cabinet.h" #include "raw.h" #include "mszip.h"

1 0

[tkreuzer] 48626: [NTOSKRNL] - Fix to PpSetCustomTargetEvent(), not to make caller wait forever in case it provided an event it waits for - Patch by Pierre Schweitzer
by tkreuzer＠svn.reactos.org 26 Aug '10

26 Aug '10

Author: tkreuzer Date: Thu Aug 26 15:25:33 2010 New Revision: 48626 URL: http://svn.reactos.org/svn/reactos?rev=48626&view=rev Log: [NTOSKRNL] - Fix to PpSetCustomTargetEvent(), not to make caller wait forever in case it provided an event it waits for - Patch by Pierre Schweitzer Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnprepo… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] Thu Aug 26 15:25:33 2010 @@ -132,12 +132,25 @@ ASSERT(NotificationStructure != NULL); ASSERT(DeviceObject != NULL); + if (SyncEvent) + { + ASSERT(SyncStatus); + *SyncStatus = STATUS_PENDING; + } + /* That call is totally wrong but notifications handler must be fixed first */ IopNotifyPlugPlayNotification(DeviceObject, EventCategoryTargetDeviceChange, &GUID_PNP_CUSTOM_NOTIFICATION, NotificationStructure, NULL); + + if (SyncEvent) + { + KeSetEvent(SyncEvent, IO_NO_INCREMENT, FALSE); + *SyncStatus = STATUS_SUCCESS; + } + return STATUS_SUCCESS; }

1 0

[tkreuzer] 48625: Fix build
by tkreuzer＠svn.reactos.org 26 Aug '10

26 Aug '10

Author: tkreuzer Date: Thu Aug 26 02:48:03 2010 New Revision: 48625 URL: http://svn.reactos.org/svn/reactos?rev=48625&view=rev Log: Fix build Modified: trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild Modified: trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/ntdll_apit… ============================================================================== --- trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild [iso-8859-1] Thu Aug 26 02:48:03 2010 @@ -8,7 +8,7 @@ <library>pseh</library> <file>testlist.c</file> - <file>RtlInitializeBitmap.c</file> + <file>RtlInitializeBitMap.c</file> <file>ZwContinue.c</file> <if property="ARCH" value="i386"> <directory name="i386">

1 0

[cgutman] 48624: [OSKITTCP] - Prevent multiple wakeups for the same event which caused nasty problems for the SEL_FIN event because we dereferenced our connection context 3 times which not only cau...
by cgutman＠svn.reactos.org 26 Aug '10

26 Aug '10

Author: cgutman Date: Thu Aug 26 02:29:38 2010 New Revision: 48624 URL: http://svn.reactos.org/svn/reactos?rev=48624&view=rev Log: [OSKITTCP] - Prevent multiple wakeups for the same event which caused nasty problems for the SEL_FIN event because we dereferenced our connection context 3 times which not only caused the connection endpoint to be freed while holding its spin lock but made the reference count negative [TCPIP] - Disassociate the address file from the connection endpoint before dereferencing/closing it to avoid a double dereference of the address file (not as harmful in this case as in the connection endpoint case) [IP] - Dereference the connection endpoint again if it was associated with an address file as the connection endpoint to fix a reference leak Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket2.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Thu Aug 26 02:29:38 2010 @@ -379,9 +379,15 @@ LockObject(AddrFile, &OldIrql); /* We have to close this connection because we started it */ if( AddrFile->Listener ) + { + AddrFile->Listener->AddressFile = NULL; TCPClose( AddrFile->Listener ); + } if( AddrFile->Connection ) + { + AddrFile->Connection->AddressFile = NULL; DereferenceObject( AddrFile->Connection ); + } UnlockObject(AddrFile, OldIrql); DereferenceObject(AddrFile); Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Thu Aug 26 02:29:38 2010 @@ -234,7 +234,10 @@ /* If the socket is dead, remove the reference we added for oskit */ if (Connection->SignalState & SEL_FIN) + { + Connection->SocketContext = NULL; DereferenceObject(Connection); + } } VOID ConnectionFree(PVOID Object) { @@ -663,17 +666,15 @@ KIRQL OldIrql; NTSTATUS Status; PVOID Socket; - - /* We don't rely on SocketContext == NULL for socket - * closure anymore but we still need it to determine - * if we caused the closure - */ + PADDRESS_FILE AddressFile = NULL; + PCONNECTION_ENDPOINT AddressConnection = NULL; + LockObject(Connection, &OldIrql); Socket = Connection->SocketContext; Connection->SocketContext = NULL; /* Don't try to close again if the other side closed us already */ - if (!(Connection->SignalState & SEL_FIN)) + if (Socket) { /* We need to close here otherwise oskit will never indicate * SEL_FIN and we will never fully close the connection */ @@ -693,11 +694,26 @@ } if (Connection->AddressFile) - DereferenceObject(Connection->AddressFile); + { + LockObjectAtDpcLevel(Connection->AddressFile); + if (Connection->AddressFile->Connection == Connection) + { + AddressConnection = Connection->AddressFile->Connection; + Connection->AddressFile->Connection = NULL; + } + UnlockObjectFromDpcLevel(Connection->AddressFile); + + AddressFile = Connection->AddressFile; + Connection->AddressFile = NULL; + } UnlockObject(Connection, OldIrql); DereferenceObject(Connection); + if (AddressConnection) + DereferenceObject(AddressConnection); + if (AddressFile) + DereferenceObject(AddressFile); return Status; } Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket2.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket2.c [iso-8859-1] Thu Aug 26 02:29:38 2010 @@ -118,8 +118,10 @@ wakeup(so, (caddr_t)&head->so_timeo); } else { wakeup(so, (caddr_t)&so->so_timeo); +#ifndef __REACTOS__ sorwakeup(so); sowwakeup(so); +#endif } } @@ -131,8 +133,10 @@ so->so_state &= ~SS_ISCONNECTING; so->so_state |= (SS_ISDISCONNECTING|SS_CANTRCVMORE|SS_CANTSENDMORE); wakeup(so, (caddr_t)&so->so_timeo); +#ifndef __REACTOS__ sowwakeup(so); sorwakeup(so); +#endif } void @@ -144,8 +148,10 @@ so->so_state &= ~(SS_ISCONNECTING|SS_ISCONNECTED|SS_ISDISCONNECTING); so->so_state |= (SS_CANTRCVMORE|SS_CANTSENDMORE); wakeup(so, (caddr_t)&so->so_timeo); +#ifndef __REACTOS__ sowwakeup(so); sorwakeup(so); +#endif } /* @@ -192,7 +198,9 @@ return ((struct socket *)0); } if (connstatus) { +#ifndef __REACTOS__ sorwakeup(head); +#endif wakeup(head, (caddr_t)&head->so_timeo); so->so_state |= connstatus; }

1 0

[tkreuzer] 48623: [NTDLL_APITEST] - Add a test for RtlInitializeBitMap.
by tkreuzer＠svn.reactos.org 26 Aug '10

26 Aug '10

Author: tkreuzer Date: Thu Aug 26 02:29:19 2010 New Revision: 48623 URL: http://svn.reactos.org/svn/reactos?rev=48623&view=rev Log: [NTDLL_APITEST] - Add a test for RtlInitializeBitMap. Added: trunk/rostests/apitests/ntdll/RtlInitializeBitMap.c (with props) Modified: trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild trunk/rostests/apitests/ntdll/testlist.c Added: trunk/rostests/apitests/ntdll/RtlInitializeBitMap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlInitial… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlInitializeBitMap.c (added) +++ trunk/rostests/apitests/ntdll/RtlInitializeBitMap.c [iso-8859-1] Thu Aug 26 02:29:19 2010 @@ -1,0 +1,44 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for RtlInitializeBitmap + * PROGRAMMERS: Timo Kreuzer + */ + +#define WIN32_NO_STATUS +#include <stdio.h> +#include <wine/test.h> +#include <ndk/ntndk.h> + +void Test_RtlInitializeBitmap() +{ + RTL_BITMAP Bitmap; + ULONG Buffer[5]; + + Buffer[0] = 0x12345; + Buffer[1] = 0x23456; + Buffer[2] = 0x34567; + Buffer[3] = 0x45678; + Buffer[4] = 0x56789; + + RtlInitializeBitMap(&Bitmap, Buffer, 19); + ok(Bitmap.Buffer == Buffer, "Buffer=%p\n", Bitmap.Buffer); + ok(Bitmap.SizeOfBitMap == 19, "SizeOfBitMap=%ld\n", Bitmap.SizeOfBitMap); + + ok(Buffer[0] == 0x12345, "Buffer[0] == 0x%lx\n", Buffer[0]); + ok(Buffer[1] == 0x23456, "Buffer[1] == 0x%lx\n", Buffer[1]); + ok(Buffer[2] == 0x34567, "Buffer[2] == 0x%lx\n", Buffer[2]); + ok(Buffer[3] == 0x45678, "Buffer[3] == 0x%lx\n", Buffer[3]); + ok(Buffer[4] == 0x56789, "Buffer[4] == 0x%lx\n", Buffer[4]); + + RtlInitializeBitMap(&Bitmap, 0, -100); + ok(Bitmap.Buffer == 0, "Buffer=%p\n", Bitmap.Buffer); + ok(Bitmap.SizeOfBitMap == -100, "SizeOfBitMap=%ld\n", Bitmap.SizeOfBitMap); + +} + +START_TEST(RtlInitializeBitMap) +{ + Test_RtlInitializeBitmap(); +} + Propchange: trunk/rostests/apitests/ntdll/RtlInitializeBitMap.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/ntdll_apit… ============================================================================== --- trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild [iso-8859-1] Thu Aug 26 02:29:19 2010 @@ -8,6 +8,7 @@ <library>pseh</library> <file>testlist.c</file> + <file>RtlInitializeBitmap.c</file> <file>ZwContinue.c</file> <if property="ARCH" value="i386"> <directory name="i386"> Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Thu Aug 26 02:29:19 2010 @@ -5,10 +5,12 @@ #define STANDALONE #include "wine/test.h" +extern void func_RtlInitializeBitMap(void); extern void func_ZwContinue(void); const struct test winetest_testlist[] = { + { "RtlInitializeBitMap", func_RtlInitializeBitMap }, { "ZwContinue", func_ZwContinue }, { 0, 0 }

1 0

[tkreuzer] 48622: delete old Zwcontinue test
by tkreuzer＠svn.reactos.org 25 Aug '10

25 Aug '10

Author: tkreuzer Date: Wed Aug 25 10:15:34 2010 New Revision: 48622 URL: http://svn.reactos.org/svn/reactos?rev=48622&view=rev Log: delete old Zwcontinue test Removed: trunk/rostests/tests/zwcontinue/ Modified: trunk/rostests/tests/directory.rbuild Modified: trunk/rostests/tests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/directory.rbuild?re… ============================================================================== --- trunk/rostests/tests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/tests/directory.rbuild [iso-8859-1] Wed Aug 25 10:15:34 2010 @@ -268,5 +268,4 @@  - </group>

1 0

[tkreuzer] 48621: [ROSTESTS] - Add wine style ntdll_apitest and move test for ZwContinue there
by tkreuzer＠svn.reactos.org 25 Aug '10

25 Aug '10

Author: tkreuzer Date: Wed Aug 25 10:15:01 2010 New Revision: 48621 URL: http://svn.reactos.org/svn/reactos?rev=48621&view=rev Log: [ROSTESTS] - Add wine style ntdll_apitest and move test for ZwContinue there Added: trunk/rostests/apitests/ntdll/ (with props) trunk/rostests/apitests/ntdll/ZwContinue.c (with props) trunk/rostests/apitests/ntdll/i386/ (with props) trunk/rostests/apitests/ntdll/i386/ZwContinue.asm (with props) trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild (with props) trunk/rostests/apitests/ntdll/testlist.c (with props) Modified: trunk/rostests/ (props changed) trunk/rostests/apitests/directory.rbuild Propchange: trunk/rostests/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Aug 25 10:15:01 2010 @@ -1,1 +1,1 @@ -/branches/ros-amd64-bringup/rostests:44459,44462 +/branches/ros-amd64-bringup/rostests:44459,44462,44537 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] Wed Aug 25 10:15:01 2010 @@ -12,6 +12,10 @@ <directory name="gdi32"> <xi:include href="gdi32/gdi32_apitest.rbuild" /> + </directory> + + <directory name="ntdll"> + <xi:include href="ntdll/ntdll_apitest.rbuild" /> </directory> <directory name="user32"> Propchange: trunk/rostests/apitests/ntdll/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Aug 25 10:15:01 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/rostests/apitests/ntdll/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/rostests/apitests/ntdll/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/rostests/apitests/ntdll/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/rostests/apitests/ntdll/ZwContinue.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/ZwContinue… ============================================================================== --- trunk/rostests/apitests/ntdll/ZwContinue.c (added) +++ trunk/rostests/apitests/ntdll/ZwContinue.c [iso-8859-1] Wed Aug 25 10:15:01 2010 @@ -1,0 +1,173 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for ZwContinue + * PROGRAMMER: + */ + +#include <setjmp.h> +#include <stdio.h> +#include <time.h> +#include <wine/test.h> + +#ifdef _M_IX86 +#define ZWC_SEGMENT_BITS (0xFFFF) +#define ZWC_EFLAGS_BITS (0x3C0CD5) +#endif + +void continuePoint(void); +LONG NTAPI ZwContinue(IN CONTEXT *, IN BOOLEAN); + +static jmp_buf jmpbuf; +static CONTEXT continueContext; +static unsigned int nRandBytes; + +static int initrand(void) +{ + unsigned int nRandMax; + unsigned int nRandMaxBits; + time_t tLoc; + + nRandMax = RAND_MAX; + for(nRandMaxBits = 0; nRandMax != 0; nRandMax >>= 1, ++ nRandMaxBits); + nRandBytes = nRandMaxBits / CHAR_BIT; + //assert(nRandBytes != 0); + srand((unsigned)(time(&tLoc) & UINT_MAX)); + return 1; +} + +static void randbytes(void * p, size_t n) +{ + unsigned char * b; + size_t i; + int r = rand(); + + b = (unsigned char *)p; + for(i = 0; i < n; ++ i) + { + if(i % nRandBytes == 0) + r = rand(); + b[i] = (unsigned char)(r & UCHAR_MAX); + r >>= CHAR_BIT; + } +} + +static ULONG randULONG(void) +{ + ULONG n; + randbytes(&n, sizeof(n)); + return n; +} + +void check(CONTEXT * pContext) +{ +#ifdef _M_IX86 + ok(pContext->ContextFlags == CONTEXT_FULL, + "ContextFlags=0x%lx\n", pContext->ContextFlags); + + /* Random data segments */ + ok((pContext->SegGs & ZWC_SEGMENT_BITS) == + (continueContext.SegGs & ZWC_SEGMENT_BITS), + "SegGs=0x%lx / 0x%lx\n", pContext->SegGs, continueContext.SegGs); + + ok((pContext->SegFs & ZWC_SEGMENT_BITS) == + (continueContext.SegFs & ZWC_SEGMENT_BITS), + "SegFs=0x%lx / 0x%lx\n", pContext->SegFs, continueContext.SegFs); + + ok((pContext->SegEs & ZWC_SEGMENT_BITS) == + (continueContext.SegEs & ZWC_SEGMENT_BITS), + "SegEs=0x%lx / 0x%lx\n", pContext->SegEs, continueContext.SegEs); + + ok((pContext->SegDs & ZWC_SEGMENT_BITS) == + (continueContext.SegDs & ZWC_SEGMENT_BITS), + "SegDs=0x%lx / 0x%lx\n", pContext->SegDs, continueContext.SegDs); + + /* Integer registers */ + ok(pContext->Edi == continueContext.Edi, + "Edi: 0x%lx != 0x%lx\n", pContext->Edi, continueContext.Edi); + ok(pContext->Esi == continueContext.Esi, + "Esi: 0x%lx != 0x%lx\n", pContext->Esi, continueContext.Esi); + ok(pContext->Ebx == continueContext.Ebx, + "Ebx: 0x%lx != 0x%lx\n", pContext->Ebx, continueContext.Ebx); + ok(pContext->Edx == continueContext.Edx, + "Edx: 0x%lx != 0x%lx\n", pContext->Edx, continueContext.Edx); + ok(pContext->Ecx == continueContext.Ecx, + "Ecx: 0x%lx != 0x%lx\n", pContext->Ecx, continueContext.Ecx); + ok(pContext->Eax == continueContext.Eax, + "Eax: 0x%lx != 0x%lx\n", pContext->Eax, continueContext.Eax); + + /* Control registers and segments */ + ok(pContext->Ebp == continueContext.Ebp, + "Ebp: 0x%lx != 0x%lx\n", pContext->Ebp, continueContext.Ebp); + ok(pContext->Eip == continueContext.Eip, + "Eip: 0x%lx != 0x%lx\n", pContext->Eip, continueContext.Eip); + ok(pContext->Esp == continueContext.Esp, + "Esp: 0x%lx != 0x%lx\n", pContext->Esp, continueContext.Esp); + + ok((pContext->SegCs & ZWC_SEGMENT_BITS) == + (continueContext.SegCs & ZWC_SEGMENT_BITS), + "SegCs: 0x%lx != 0x%lx\n", pContext->SegCs, continueContext.SegCs); + + ok((pContext->EFlags & ZWC_EFLAGS_BITS) == + (continueContext.EFlags & ZWC_EFLAGS_BITS), + "EFlags: 0x%lx != 0x%lx\n", pContext->EFlags, continueContext.EFlags); + + ok((pContext->SegSs & ZWC_SEGMENT_BITS) == + (continueContext.SegSs & ZWC_SEGMENT_BITS), + "SegSs: 0x%lx != 0x%lx\n", pContext->SegSs, continueContext.SegSs); +#endif + + /* Return where we came from */ + longjmp(jmpbuf, 1); +} + +void Test_ZwContinue() +{ + initrand(); + + /* First time */ + if(setjmp(jmpbuf) == 0) + { + CONTEXT bogus; + + continueContext.ContextFlags = CONTEXT_FULL; + GetThreadContext(GetCurrentThread(), &continueContext); + +#ifdef _M_IX86 + continueContext.ContextFlags = CONTEXT_FULL; + + /* Fill the integer registers with random values */ + continueContext.Edi = randULONG(); + continueContext.Esi = randULONG(); + continueContext.Ebx = randULONG(); + continueContext.Edx = randULONG(); + continueContext.Ecx = randULONG(); + continueContext.Eax = randULONG(); + continueContext.Ebp = randULONG(); + + /* Randomize all the allowed flags (determined experimentally with WinDbg) */ + continueContext.EFlags = randULONG() & 0x3C0CD5; + + /* Randomize the stack pointer as much as possible */ + continueContext.Esp = (ULONG)(((ULONG_PTR)&bogus) & 0xFFFFFFFF) + + sizeof(bogus) - (randULONG() & 0xF) * 4; + + /* continuePoint() is implemented in assembler */ + continueContext.Eip = (ULONG)((ULONG_PTR)continuePoint & 0xFFFFFFF); + + /* Can't do a lot about segments */ +#endif + + ZwContinue(&continueContext, FALSE); + ok(0, "should never get here\n"); + } + + /* Second time */ + return; +} + +START_TEST(ZwContinue) +{ + Test_ZwContinue(); +} + Propchange: trunk/rostests/apitests/ntdll/ZwContinue.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/apitests/ntdll/i386/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Aug 25 10:15:01 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/rostests/apitests/ntdll/i386/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/rostests/apitests/ntdll/i386/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/rostests/apitests/ntdll/i386/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/rostests/apitests/ntdll/i386/ZwContinue.asm URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/i386/ZwCon… ============================================================================== --- trunk/rostests/apitests/ntdll/i386/ZwContinue.asm (added) +++ trunk/rostests/apitests/ntdll/i386/ZwContinue.asm [iso-8859-1] Wed Aug 25 10:15:01 2010 @@ -1,0 +1,48 @@ +; cpu 486 +segment .text use32 + +extern _check + +global _continuePoint +_continuePoint: + push ss + push dword 0 + pushfd + push cs + push dword _continuePoint + push ebp + + push eax + push ecx + push edx + push ebx + push esi + push edi + + push ds + push es + push fs + push gs + + ; TODO: floating point state + sub esp, 70h + + ; Debug registers + sub esp, 18h + + push dword 00010007h + + ; Fill the Esp field + lea eax, [esp+0CCh] + lea ecx, [esp+0C4h] + mov [ecx], eax + + ; Call the function that will compare the current context with the expected one + cld + push esp + call _check + + ; check() must not return + int 3 + +; EOF Propchange: trunk/rostests/apitests/ntdll/i386/ZwContinue.asm ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/ntdll_apit… ============================================================================== --- trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild (added) +++ trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild [iso-8859-1] Wed Aug 25 10:15:01 2010 @@ -1,0 +1,18 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="ntdll_apitest" type="win32cui" installbase="bin" installname="ntdll_apitest.exe"> + <include base="ntdll_apitest">.</include> + <library>wine</library> + <library>ntdll</library> + <library>pseh</library> + <file>testlist.c</file> + + <file>ZwContinue.c</file> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>ZwContinue.asm</file> + </directory> + </if> +</module> +</group> Propchange: trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c (added) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Wed Aug 25 10:15:01 2010 @@ -1,0 +1,16 @@ +#define WIN32_LEAN_AND_MEAN +#define __ROS_LONG64__ +#include <windows.h> + +#define STANDALONE +#include "wine/test.h" + +extern void func_ZwContinue(void); + +const struct test winetest_testlist[] = +{ + { "ZwContinue", func_ZwContinue }, + + { 0, 0 } +}; + Propchange: trunk/rostests/apitests/ntdll/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 48620: Add missing files
by tkreuzer＠svn.reactos.org 25 Aug '10

25 Aug '10

Author: tkreuzer Date: Wed Aug 25 08:50:10 2010 New Revision: 48620 URL: http://svn.reactos.org/svn/reactos?rev=48620&view=rev Log: Add missing files Added: trunk/rostests/apitests/dciman32/ (with props) trunk/rostests/apitests/dciman32/DCICreatePrimary.c (with props) trunk/rostests/apitests/dciman32/dciman32_apitest.rbuild (with props) trunk/rostests/apitests/dciman32/testlist.c (with props) trunk/rostests/apitests/user32/ (with props) trunk/rostests/apitests/user32/GetSystemMetrics.c (with props) trunk/rostests/apitests/user32/InitializeLpkHooks.c (with props) trunk/rostests/apitests/user32/RealGetWindowClass.c (with props) trunk/rostests/apitests/user32/ScrollDC.c (with props) trunk/rostests/apitests/user32/ScrollWindowEx.c (with props) trunk/rostests/apitests/user32/testlist.c (with props) trunk/rostests/apitests/user32/user32_apitest.rbuild (with props) Propchange: trunk/rostests/apitests/dciman32/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Aug 25 08:50:10 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/rostests/apitests/dciman32/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/rostests/apitests/dciman32/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/rostests/apitests/dciman32/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/rostests/apitests/dciman32/DCICreatePrimary.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dciman32/DCICrea… ============================================================================== --- trunk/rostests/apitests/dciman32/DCICreatePrimary.c (added) +++ trunk/rostests/apitests/dciman32/DCICreatePrimary.c [iso-8859-1] Wed Aug 25 08:50:10 2010 @@ -1,0 +1,21 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for DCICreatePrimary + * PROGRAMMERS: Timo Kreuzer + */ + +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> + +void Test_DCICreatePrimary() +{ + +} + +START_TEST(DCICreatePrimary) +{ + Test_DCICreatePrimary(); +} + Propchange: trunk/rostests/apitests/dciman32/DCICreatePrimary.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/dciman32/dciman32_apitest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dciman32/dciman3… ============================================================================== --- trunk/rostests/apitests/dciman32/dciman32_apitest.rbuild (added) +++ trunk/rostests/apitests/dciman32/dciman32_apitest.rbuild [iso-8859-1] Wed Aug 25 08:50:10 2010 @@ -1,0 +1,15 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="dciman32_apitest" type="win32cui" installbase="bin" installname="dciman32_apitest.exe"> + <include base="dciman32_apitest">.</include> + <library>wine</library> + <library>gdi32</library> + <library>user32</library> + <library>pseh</library> + <file>testlist.c</file> + + <file>DCICreatePrimary.c</file> + +</module> +</group> Propchange: trunk/rostests/apitests/dciman32/dciman32_apitest.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/dciman32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dciman32/testlis… ============================================================================== --- trunk/rostests/apitests/dciman32/testlist.c (added) +++ trunk/rostests/apitests/dciman32/testlist.c [iso-8859-1] Wed Aug 25 08:50:10 2010 @@ -1,0 +1,16 @@ +#define WIN32_LEAN_AND_MEAN +#define __ROS_LONG64__ +#include <windows.h> + +#define STANDALONE +#include "wine/test.h" + +extern void func_DCICreatePrimary(void); + +const struct test winetest_testlist[] = +{ + { "DCICreatePrimary", func_DCICreatePrimary }, + + { 0, 0 } +}; + Propchange: trunk/rostests/apitests/dciman32/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/apitests/user32/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Aug 25 08:50:10 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/rostests/apitests/user32/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/rostests/apitests/user32/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/rostests/apitests/user32/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/rostests/apitests/user32/GetSystemMetrics.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/GetSystem… ============================================================================== --- trunk/rostests/apitests/user32/GetSystemMetrics.c (added) +++ trunk/rostests/apitests/user32/GetSystemMetrics.c [iso-8859-1] Wed Aug 25 08:50:10 2010 @@ -1,0 +1,410 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for GetSystemMetrics + * PROGRAMMERS: Timo Kreuzer + */ + +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> + +void Test_GetSystemMetrics() +{ + INT ret; + HDC hDC; + BOOL BoolVal; + UINT UintVal; + RECT rect; + + SetLastError(0); + hDC = GetDC(0); + + ret = GetSystemMetrics(0); + ok(ret > 0, "ret = %d", ret); + + ret = GetSystemMetrics(64); + ok(ret == 0, "ret = %d", ret); + ret = GetSystemMetrics(65); + ok(ret == 0, "ret = %d", ret); + ret = GetSystemMetrics(66); + ok(ret == 0, "ret = %d", ret); + + + ret = GetSystemMetrics(SM_CXSCREEN); + ok(ret == GetDeviceCaps(hDC, HORZRES), "ret = %d", ret); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYSCREEN); + ok(ret == GetDeviceCaps(hDC, VERTRES), "ret = %d", ret); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXVSCROLL); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYHSCROLL); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYCAPTION); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXBORDER); + SystemParametersInfoW(SPI_GETFOCUSBORDERWIDTH, 0, &UintVal, 0); + ok(ret == UintVal, "ret = %d", ret); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYBORDER); + SystemParametersInfoW(SPI_GETFOCUSBORDERHEIGHT, 0, &UintVal, 0); + ok(ret == UintVal, "ret = %d", ret); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXDLGFRAME); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYDLGFRAME); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYVTHUMB); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXHTHUMB); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXICON); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYICON); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXCURSOR); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYCURSOR); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYMENU); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + SystemParametersInfoW(SPI_GETWORKAREA, 0, &rect, 0); + ret = GetSystemMetrics(SM_CXFULLSCREEN); + ok(ret == rect.right, "ret = %d", ret); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYFULLSCREEN); + ok(ret == rect.bottom - rect.top - GetSystemMetrics(SM_CYCAPTION), "ret = %d", ret); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYKANJIWINDOW); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_MOUSEPRESENT); + ok(ret == 1, "ret = %d", ret); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYVSCROLL); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXHSCROLL); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_DEBUG); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_SWAPBUTTON); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_RESERVED1); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_RESERVED2); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_RESERVED3); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_RESERVED4); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXMIN); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYMIN); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXSIZE); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYSIZE); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXFRAME); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYFRAME); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXMINTRACK); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYMINTRACK); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXDOUBLECLK); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYDOUBLECLK); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXICONSPACING); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYICONSPACING); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_MENUDROPALIGNMENT); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_PENWINDOWS); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_DBCSENABLED); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CMOUSEBUTTONS); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + +#if(WINVER >= 0x0400) + ret = GetSystemMetrics(SM_SECURE); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXEDGE); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYEDGE); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXMINSPACING); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYMINSPACING); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXSMICON); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYSMICON); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYSMCAPTION); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXSMSIZE); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYSMSIZE); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXMENUSIZE); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYMENUSIZE); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_ARRANGE); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXMINIMIZED); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYMINIMIZED); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXMAXTRACK); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYMAXTRACK); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXMAXIMIZED); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYMAXIMIZED); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_NETWORK); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CLEANBOOT); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXDRAG); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYDRAG); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_SHOWSOUNDS); + SystemParametersInfoW(SPI_GETSHOWSOUNDS, 0, &BoolVal, 0); + ok(ret == BoolVal, "ret = %d", ret); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXMENUCHECK); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYMENUCHECK); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_SLOWMACHINE); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_MIDEASTENABLED); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); +#endif + +#if (WINVER >= 0x0500) || (_WIN32_WINNT >= 0x0400) + ret = GetSystemMetrics(SM_MOUSEWHEELPRESENT); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); +#endif + +#if(WINVER >= 0x0500) + ret = GetSystemMetrics(SM_XVIRTUALSCREEN); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_YVIRTUALSCREEN); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXVIRTUALSCREEN); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYVIRTUALSCREEN); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CMONITORS); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_SAMEDISPLAYFORMAT); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); +#endif + +#if(_WIN32_WINNT >= 0x0500) + ret = GetSystemMetrics(SM_IMMENABLED); + ok(ret == 0 || ret == 1, "ret = %d\n", ret); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); +#endif + +#if(_WIN32_WINNT >= 0x0501) + ret = GetSystemMetrics(SM_CXFOCUSBORDER); + SystemParametersInfoW(SPI_GETFOCUSBORDERWIDTH, 0, &UintVal, 0); + ok(ret == UintVal, "ret = %d", ret); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYFOCUSBORDER); + SystemParametersInfoW(SPI_GETFOCUSBORDERHEIGHT, 0, &UintVal, 0); + ok(ret == UintVal, "ret = %d", ret); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_TABLETPC); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_MEDIACENTER); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_STARTER); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_SERVERR2); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); +#endif + +#if(_WIN32_WINNT >= 0x0600) + ret = GetSystemMetrics(SM_MOUSEHORIZONTALWHEELPRESENT); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXPADDEDBORDER); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); +#endif + +} + +START_TEST(GetSystemMetrics) +{ + Test_GetSystemMetrics(); +} + Propchange: trunk/rostests/apitests/user32/GetSystemMetrics.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/user32/InitializeLpkHooks.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/Initializ… ============================================================================== --- trunk/rostests/apitests/user32/InitializeLpkHooks.c (added) +++ trunk/rostests/apitests/user32/InitializeLpkHooks.c [iso-8859-1] Wed Aug 25 08:50:10 2010 @@ -1,0 +1,110 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for InitializeLpkHooks + * PROGRAMMERS: Magnus Olsen + */ + +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> + + +typedef struct _LPK_LPEDITCONTROL_LIST +{ + PVOID EditCreate; + PVOID EditIchToXY; + PVOID EditMouseToIch; + PVOID EditCchInWidth; + PVOID EditGetLineWidth; + PVOID EditDrawText; + PVOID EditHScroll; + PVOID EditMoveSelection; + PVOID EditVerifyText; + PVOID EditNextWord; + PVOID EditSetMenu; + PVOID EditProcessMenu; + PVOID EditCreateCaret; + PVOID EditAdjustCaret; +} LPK_LPEDITCONTROL_LIST, *PLPK_LPEDITCONTROL_LIST; + + +DWORD (APIENTRY *fpLpkTabbedTextOut) (LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID); +DWORD (APIENTRY *fpLpkPSMTextOut) (LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID); +DWORD (APIENTRY *fpLpkDrawTextEx) (LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID); +PLPK_LPEDITCONTROL_LIST (APIENTRY *fpLpkEditControl) (); + +int Count_myLpkTabbedTextOut = 0; +int Count_myLpkPSMTextOut = 0; +int Count_myLpkDrawTextEx = 0; + +DWORD WINAPI myLpkTabbedTextOut (LPVOID x1,LPVOID x2,LPVOID x3, LPVOID x4, LPVOID x5, LPVOID x6, LPVOID x7, LPVOID x8, + LPVOID x9, LPVOID x10, LPVOID x11, LPVOID x12) +{ + Count_myLpkTabbedTextOut++; + return fpLpkTabbedTextOut(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12); +} + +DWORD myLpkPSMTextOut (LPVOID x1,LPVOID x2,LPVOID x3,LPVOID x4,LPVOID x5,LPVOID x6) +{ + Count_myLpkPSMTextOut++; + return fpLpkPSMTextOut ( x1, x2, x3, x4, x5, x6); +} + +DWORD myLpkDrawTextEx(LPVOID x1,LPVOID x2,LPVOID x3,LPVOID x4,LPVOID x5, LPVOID x6, LPVOID x7, LPVOID x8, LPVOID x9,LPVOID x10) +{ + Count_myLpkDrawTextEx++; + return fpLpkDrawTextEx(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10); +} + + +typedef struct _USER32_INTERN_INITALIZEHOOKS +{ + PVOID fpLpkTabbedTextOut; + PVOID fpLpkPSMTextOut; + PVOID fpLpkDrawTextEx; + PLPK_LPEDITCONTROL_LIST fpListLpkEditControl; +} USER32_INTERN_INITALIZEHOOKS, *PUSER32_INTERN_INITALIZEHOOKS; + +VOID WINAPI InitializeLpkHooks (PUSER32_INTERN_INITALIZEHOOKS); + +void Test_InitializeLpkHooks() +{ + USER32_INTERN_INITALIZEHOOKS setup; + HMODULE lib = LoadLibrary("LPK.DLL"); + + ok(lib != NULL, "lib = 0\n"); + if (lib != NULL) + { + fpLpkTabbedTextOut = (DWORD (APIENTRY *) (LPVOID,LPVOID,LPVOID,LPVOID,LPVOID, LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID)) GetProcAddress(lib, "LpkTabbedTextOut"); + fpLpkPSMTextOut = (DWORD (APIENTRY *) (LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID)) GetProcAddress(lib, "fpLpkPSMTextOut"); + fpLpkDrawTextEx = (DWORD (APIENTRY *) (LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID)) GetProcAddress(lib, "LpkDrawTextEx"); + fpLpkEditControl = (PLPK_LPEDITCONTROL_LIST (APIENTRY *) (VOID)) GetProcAddress(lib, "LpkEditControl"); + + setup.fpLpkTabbedTextOut = myLpkTabbedTextOut; + setup.fpLpkPSMTextOut = myLpkPSMTextOut; + setup.fpLpkDrawTextEx = myLpkDrawTextEx; + + /* we have not add any test to this api */ + setup.fpListLpkEditControl = (PLPK_LPEDITCONTROL_LIST)fpLpkEditControl; + + /* use our own api that we just made */ + InitializeLpkHooks(&setup); + + /* FIXME add test now */ + + /* restore */ + setup.fpLpkTabbedTextOut = fpLpkTabbedTextOut; + setup.fpLpkPSMTextOut = fpLpkPSMTextOut; + setup.fpLpkDrawTextEx = fpLpkDrawTextEx; + setup.fpListLpkEditControl = (PLPK_LPEDITCONTROL_LIST)fpLpkEditControl; + InitializeLpkHooks(&setup); + } + +} + +START_TEST(InitializeLpkHooks) +{ + Test_InitializeLpkHooks(); +} + Propchange: trunk/rostests/apitests/user32/InitializeLpkHooks.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/user32/RealGetWindowClass.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/RealGetWi… ============================================================================== --- trunk/rostests/apitests/user32/RealGetWindowClass.c (added) +++ trunk/rostests/apitests/user32/RealGetWindowClass.c [iso-8859-1] Wed Aug 25 08:50:10 2010 @@ -1,0 +1,134 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for RealGetWindowClass + * PROGRAMMERS: Gregor Gullwi + */ + +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> + +#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0])) + +typedef struct _TestData +{ + BOOL OverrideWndProc; /* TRUE if lpfnWndProc should be overridden */ + LPCSTR ClassName; /* Name of the new class to register */ + DWORD WndExtra; /* Remove these WNDCLASS::cbWndExtra flags */ + BOOL ExpectsHwnd; /* TRUE if a HWND should be created to run tests on */ + LPCSTR ExpectedClassNameBefore; /* Expected class name before any dialog function is called */ + LPCSTR ExpectedClassNameAfter; /* Expected class name after any dialog function is called */ +} TestData; + +static TestData RealClassTestData[] = +{ + { + TRUE, + "OverrideWndProc_with_DLGWINDOWEXTRA_TRUE", + 0, + TRUE, + "OverrideWndProc_with_DLGWINDOWEXTRA_TRUE", + "#32770", + }, + { + TRUE, + "OverrideWndProc_without_DLGWINDOWEXTRA_TRUE", + DLGWINDOWEXTRA, + TRUE, + "OverrideWndProc_without_DLGWINDOWEXTRA_TRUE", + "OverrideWndProc_without_DLGWINDOWEXTRA_TRUE", + }, + { + FALSE, + "DefaultWndProc_with_DLGWINDOWEXTRA_FALSE", + 0, + TRUE, + "#32770", + "#32770", + }, + { + FALSE, + "DefaultWndProc_without_DLGWINDOWEXTRA_FALSE", + DLGWINDOWEXTRA, + FALSE, + "N/A", + "N/A", + }, +}; + +void Test_RealGetWindowClass() +{ + int testNo; + UINT Result; + CHAR Buffer[1024]; + + Result = RealGetWindowClass( NULL, Buffer, ARRAY_SIZE(Buffer) ); + ok(Result == 0, "Result = %d\n", Result); + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "GetLastError() = %ld\n", GetLastError()); + + for (testNo = 0; testNo < ARRAY_SIZE(RealClassTestData); testNo++) + { + ATOM atom; + WNDCLASSA cls; + HWND hWnd; + + /* Register classes, "derived" from built-in dialog, with and without the DLGWINDOWEXTRA flag set */ + GetClassInfoA(0, "#32770", &cls); + if (RealClassTestData[testNo].OverrideWndProc) + cls.lpfnWndProc = DefWindowProcA; + cls.lpszClassName = RealClassTestData[testNo].ClassName; + cls.cbWndExtra &= ~RealClassTestData[testNo].WndExtra; + atom = RegisterClassA (&cls); + if (atom == 0) return; + + /* Create a window */ + hWnd = CreateWindowEx( WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR | + WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE | WS_EX_CONTROLPARENT | WS_EX_APPWINDOW, + RealClassTestData[testNo].ClassName, + RealClassTestData[testNo].ClassName, + WS_POPUPWINDOW | WS_CLIPSIBLINGS | WS_DLGFRAME | WS_OVERLAPPED | + WS_MINIMIZEBOX | WS_MAXIMIZEBOX | DS_3DLOOK | DS_SETFONT | DS_MODALFRAME, + CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, + NULL, NULL, 0, 0); + + /* Do we expect a HWND at all? */ + if (RealClassTestData[testNo].ExpectsHwnd) + { + ok(hWnd != NULL, "\n"); + + if (hWnd != NULL) + { + /* Get the "real" class name */ + Result = RealGetWindowClass( hWnd, Buffer, ARRAY_SIZE(Buffer) ); + printf("Buffer: %s\nExpectedClassNameBefore(%d): %s\n", Buffer, testNo, RealClassTestData[testNo].ExpectedClassNameBefore); + ok( Result != 0, "\n" ); + ok( strcmp( Buffer, RealClassTestData[testNo].ExpectedClassNameBefore ) == 0, "\n" ); + + /* Call a function that requires a dialog window */ + DefDlgProcA( hWnd, DM_SETDEFID, IDCANCEL, 0 ); + + /* Get the "real" class name again */ + Result = RealGetWindowClass( hWnd, Buffer, ARRAY_SIZE(Buffer) ); + printf("Buffer: %s\nExpectedClassNameAfter(%d): %s\n", Buffer, testNo, RealClassTestData[testNo].ExpectedClassNameAfter); + ok( Result != 0, "\n" ); + ok( strcmp( Buffer, RealClassTestData[testNo].ExpectedClassNameAfter ) == 0, "\n" ); + } + } + else + { + ok(hWnd == NULL, "\n"); + } + + /* Cleanup */ + DestroyWindow(hWnd); + UnregisterClass(RealClassTestData[testNo].ClassName, 0); + } + +} + +START_TEST(RealGetWindowClass) +{ + Test_RealGetWindowClass(); +} + Propchange: trunk/rostests/apitests/user32/RealGetWindowClass.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/user32/ScrollDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/ScrollDC.… ============================================================================== --- trunk/rostests/apitests/user32/ScrollDC.c (added) +++ trunk/rostests/apitests/user32/ScrollDC.c [iso-8859-1] Wed Aug 25 08:50:10 2010 @@ -1,0 +1,72 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for ScrollDC + * PROGRAMMERS: Timo Kreuzer + */ + +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> + +void Test_ScrollDC() +{ + HWND hWnd, hWnd2; + HDC hDC; + HRGN hrgn; + RECT rcClip; + int iResult; + + /* Create a window */ + hWnd = CreateWindowW(L"BUTTON", L"TestWindow", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 100, 100, + NULL, NULL, 0, 0); + UpdateWindow(hWnd); + hDC = GetDC(hWnd); + + /* Test that no update region is there */ + hrgn = CreateRectRgn(0,0,0,0); + iResult = GetUpdateRgn(hWnd, hrgn, FALSE); + ok (iResult == NULLREGION, "\n"); + + /* Test normal scrolling */ + ok(ScrollDC(hDC, 0, 0, NULL, NULL, hrgn, NULL) == TRUE, "\n"); + + /* Scroll with invalid update region */ + DeleteObject(hrgn); + ok(ScrollDC(hDC, 50, 0, NULL, NULL, hrgn, NULL) == FALSE, "\n"); + hrgn = CreateRectRgn(0,0,0,0); + ok(GetUpdateRgn(hWnd, hrgn, FALSE) == NULLREGION, "\n"); + + /* Scroll with invalid update rect pointer */ + ok(ScrollDC(hDC, 50, 0, NULL, NULL, NULL, (PRECT)1) == 0, "\n"); + ok(GetUpdateRgn(hWnd, hrgn, FALSE) == NULLREGION, "\n"); + + /* Scroll with a clip rect */ + rcClip.left = 50; rcClip.top = 0; rcClip.right = 100; rcClip.bottom = 100; + ok(ScrollDC(hDC, 50, 0, NULL, &rcClip, hrgn, NULL) == TRUE, "\n"); + ok(GetUpdateRgn(hWnd, hrgn, FALSE) == NULLREGION, "\n"); + + /* Scroll with a clip rect */ + rcClip.left = 50; rcClip.top = 0; rcClip.right = 100; rcClip.bottom = 100; + ok(ScrollDC(hDC, 50, 50, NULL, &rcClip, hrgn, NULL) == TRUE, "\n"); + ok(GetUpdateRgn(hWnd, hrgn, FALSE) == NULLREGION, "\n"); + + /* Overlap with another window */ + hWnd2 = CreateWindowW(L"BUTTON", L"TestWindow", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 30, 160, 100, 100, + NULL, NULL, 0, 0); + UpdateWindow(hWnd2); + + /* Cleanup */ + ReleaseDC(hWnd, hDC); + DestroyWindow(hWnd); + DestroyWindow(hWnd2); + +} + +START_TEST(ScrollDC) +{ + Test_ScrollDC(); +} + Propchange: trunk/rostests/apitests/user32/ScrollDC.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/user32/ScrollWindowEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/ScrollWin… ============================================================================== --- trunk/rostests/apitests/user32/ScrollWindowEx.c (added) +++ trunk/rostests/apitests/user32/ScrollWindowEx.c [iso-8859-1] Wed Aug 25 08:50:10 2010 @@ -1,0 +1,63 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for ScrollWindowEx + * PROGRAMMERS: Timo Kreuzer + */ + +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> + +void Test_ScrollWindowEx() +{ + HWND hWnd; + HRGN hrgn; + int Result; + + /* Create a window */ + hWnd = CreateWindowW(L"BUTTON", L"TestWindow", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, + NULL, NULL, 0, 0); + UpdateWindow(hWnd); + + /* Assert that no update region is there */ + hrgn = CreateRectRgn(0,0,0,0); + Result = GetUpdateRgn(hWnd, hrgn, FALSE); + ok(Result == NULLREGION, "Result = %d\n", Result); + + Result = ScrollWindowEx(hWnd, 20, 0, NULL, NULL, NULL, NULL, 0); + ok(Result == SIMPLEREGION, "Result = %d\n", Result); + Result = GetUpdateRgn(hWnd, hrgn, FALSE); + ok(Result == NULLREGION, "Result = %d\n", Result); + + Result = ScrollWindowEx(hWnd, 20, 0, NULL, NULL, NULL, NULL, SW_INVALIDATE); + ok(Result == SIMPLEREGION, "Result = %d\n", Result); + Result = GetUpdateRgn(hWnd, hrgn, FALSE); + ok(Result == SIMPLEREGION, "Result = %d\n", Result); + UpdateWindow(hWnd); + + // test invalid update region + DeleteObject(hrgn); + Result = ScrollWindowEx(hWnd, 20, 0, NULL, NULL, hrgn, NULL, SW_INVALIDATE); + ok(Result == ERROR, "Result = %d\n", Result); + hrgn = CreateRectRgn(0,0,0,0); + UpdateWindow(hWnd); + + // Test invalid updaterect pointer + Result = ScrollWindowEx(hWnd, 20, 0, NULL, NULL, NULL, (LPRECT)1, SW_INVALIDATE); + ok(Result == ERROR, "Result = %d\n", Result); + Result = GetUpdateRgn(hWnd, hrgn, FALSE); + ok(Result == SIMPLEREGION, "Result = %d\n", Result); + +// test for alignment of rects + + DeleteObject(hrgn); + DestroyWindow(hWnd); +} + +START_TEST(ScrollWindowEx) +{ + Test_ScrollWindowEx(); +} + Propchange: trunk/rostests/apitests/user32/ScrollWindowEx.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/testlist.… ============================================================================== --- trunk/rostests/apitests/user32/testlist.c (added) +++ trunk/rostests/apitests/user32/testlist.c [iso-8859-1] Wed Aug 25 08:50:10 2010 @@ -1,0 +1,24 @@ +#define WIN32_LEAN_AND_MEAN +#define __ROS_LONG64__ +#include <windows.h> + +#define STANDALONE +#include "wine/test.h" + +extern void func_InitializeLpkHooks(void); +extern void func_RealGetWindowClass(void); +extern void func_ScrollDC(void); +extern void func_ScrollWindowEx(void); +extern void func_GetSystemMetrics(void); + +const struct test winetest_testlist[] = +{ + { "InitializeLpkHooks", func_InitializeLpkHooks }, + { "RealGetWindowClass", func_RealGetWindowClass }, + { "ScrollDC", func_ScrollDC }, + { "ScrollWindowEx", func_ScrollWindowEx }, + { "GetSystemMetrics", func_GetSystemMetrics }, + + { 0, 0 } +}; + Propchange: trunk/rostests/apitests/user32/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/user32/user32_apitest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/user32_ap… ============================================================================== --- trunk/rostests/apitests/user32/user32_apitest.rbuild (added) +++ trunk/rostests/apitests/user32/user32_apitest.rbuild [iso-8859-1] Wed Aug 25 08:50:10 2010 @@ -1,0 +1,19 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="user32_apitest" type="win32cui" installbase="bin" installname="user32_apitest.exe"> + <include base="user32_apitest">.</include> + <library>wine</library> + <library>gdi32</library> + <library>user32</library> + <library>pseh</library> + <file>testlist.c</file> + + <file>InitializeLpkHooks.c</file> + <file>RealGetWindowClass.c</file> + <file>ScrollDC.c</file> + <file>ScrollWindowEx.c</file> + <file>GetSystemMetrics.c</file> + +</module> +</group> Propchange: trunk/rostests/apitests/user32/user32_apitest.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs