Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[ion] 19462: Fix boot regression.

by ion＠svn.reactos.com

Fix boot regression. Modified: trunk/reactos/ntoskrnl/mm/process.c _____ Modified: trunk/reactos/ntoskrnl/mm/process.c --- trunk/reactos/ntoskrnl/mm/process.c 2005-11-22 08:26:06 UTC (rev 19461) +++ trunk/reactos/ntoskrnl/mm/process.c 2005-11-22 09:53:00 UTC (rev 19462) @@ -201,16 +201,12 @@ NTSTATUS Status; KAFFINITY ProcessAffinityMask = 0; SectionOffset.QuadPart = (ULONGLONG)0; - DPRINT("MmCreatePeb\n"); /* Allocate the PEB */ - Peb = MiCreatePebOrTeb(Process, MM_HIGHEST_VAD_ADDRESS); - if (Peb != MM_HIGHEST_VAD_ADDRESS) - { - DPRINT1("MiCreatePebOrTeb() returned %x\n", Peb); - return STATUS_UNSUCCESSFUL; - } + Peb = MiCreatePebOrTeb(Process, + (PVOID)((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1)); + ASSERT(Peb == (PVOID)0x7FFDF000) /* Map NLS Tables */ DPRINT("Mapping NLS\n"); @@ -348,7 +344,8 @@ } /* Allocate the TEB */ - Teb = MiCreatePebOrTeb(Process, MM_HIGHEST_VAD_ADDRESS); + Teb = MiCreatePebOrTeb(Process, + (PVOID)((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1)); /* Initialize the PEB */ RtlZeroMemory(Teb, sizeof(TEB));

18 years, 10 months

[hpoussin] 19461: Fix French translation

by hpoussin＠svn.reactos.com

Fix French translation Modified: trunk/reactos/lib/userenv/Fr.rc _____ Modified: trunk/reactos/lib/userenv/Fr.rc --- trunk/reactos/lib/userenv/Fr.rc 2005-11-22 08:25:35 UTC (rev 19460) +++ trunk/reactos/lib/userenv/Fr.rc 2005-11-22 08:26:06 UTC (rev 19461) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 Eric Kohl + * Copyright (C) 2005 HervÚ Poussineau * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,33 +16,32 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_PROFILEPATH "%SystemDrive%\\Dossiers et Arrangements" - IDS_APPDATA "DonnÚes Applications" + IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" + IDS_APPDATA "Application Data" IDS_DESKTOP "Bureau" - IDS_FAVORITES "Favorits" - IDS_STARTMENU "DÚmarrer" - IDS_PROGRAMS "DÚmarrer\\Programmes" - IDS_ADMINTOOLS "DÚmarrer\\Programmes\\Outils Administrative" - IDS_STARTUP "DÚmarrer\\Programmes\\DÚmarrage" - IDS_MYDOCUMENTS "Mes Documents" - IDS_MYPICTURES "Mes Documents\\Mes Photos" - IDS_MYMUSIC "Mes Documents\\Ma Musique" - IDS_MYVIDEOS "Mes Documents\\Mes VidÚos" - IDS_TEMPLATES "Calibres" - IDS_RECENT "RecÚnements" - IDS_SENDTO "Envoyer?" - IDS_PRINTHOOD "ImprimezHood" - IDS_NETHOOD "NetHood" - IDS_LOCALSETTINGS "Arrangements Local" - IDS_LOCALAPPDATA "Arrangements Local\\DonnÚes Application" - IDS_TEMP "Arrangements Local\\Temporaire" - IDS_CACHE "Arrangements Local\\Dossiers Internet Temporaire" - IDS_HISTORY "Arrangements Local\\Histoire" - IDS_COOKIES "Biscuits" - IDS_PROGRAMFILES "%SystemDrive%\\Programme Dossiers" + IDS_FAVORITES "Favoris" + IDS_STARTMENU "Menu DÚmarrer" + IDS_PROGRAMS "Menu DÚmarrer\\Programmes" + IDS_ADMINTOOLS "Menu DÚmarrer\\Programmes\\Outils d'administration" + IDS_STARTUP "Menu DÚmarrer\\Programmes\\DÚmarrage" + IDS_MYDOCUMENTS "Mes documents" + IDS_MYPICTURES "Mes documents\\Mes photos" + IDS_MYMUSIC "Mes documents\\Ma musique" + IDS_MYVIDEOS "Mes documents\\Mes vidÚos" + IDS_TEMPLATES "ModÞles" + IDS_RECENT "Recent" + IDS_SENDTO "SendTo" + IDS_PRINTHOOD "Voisinage d'impression" + IDS_NETHOOD "Voisinage rÚseau" + IDS_LOCALSETTINGS "Local Settings" + IDS_LOCALAPPDATA "Local Settings\\Application Data" + IDS_TEMP "Local Settings\\Temp" + IDS_CACHE "Local Settings\\Temporary Internet Files" + IDS_HISTORY "Local Settings\\Historique" + IDS_COOKIES "Cookies" + IDS_PROGRAMFILES "%SystemDrive%\\Program Files" END -

18 years, 10 months

[sedwards] 19460: porting fixes

by sedwards＠svn.reactos.com

porting fixes Modified: trunk/reactos/lib/dhcpcapi/dhcpcapi.c _____ Modified: trunk/reactos/lib/dhcpcapi/dhcpcapi.c --- trunk/reactos/lib/dhcpcapi/dhcpcapi.c 2005-11-22 08:21:42 UTC (rev 19459) +++ trunk/reactos/lib/dhcpcapi/dhcpcapi.c 2005-11-22 08:25:35 UTC (rev 19460) @@ -16,17 +16,15 @@ #define DHCP_TIMEOUT 1000 -#define EXPORT __declspec(dllexport) WINAPI - -DWORD EXPORT DhcpCApiInitialize(LPDWORD Version) { +DWORD APIENTRY DhcpCApiInitialize(LPDWORD Version) { *Version = 2; return 0; } -VOID EXPORT DhcpCApiCleanup() { +VOID APIENTRY DhcpCApiCleanup() { } -DWORD EXPORT DhcpQueryHWInfo( DWORD AdapterIndex, +DWORD APIENTRY DhcpQueryHWInfo( DWORD AdapterIndex, PDWORD MediaType, PDWORD Mtu, PDWORD Speed ) { @@ -51,7 +49,7 @@ } } -DWORD EXPORT DhcpLeaseIpAddress( DWORD AdapterIndex ) { +DWORD APIENTRY DhcpLeaseIpAddress( DWORD AdapterIndex ) { COMM_DHCP_REQ Req; COMM_DHCP_REPLY Reply; DWORD BytesRead; @@ -67,7 +65,7 @@ return Reply.Reply; } -DWORD EXPORT DhcpReleaseIpAddressLease( DWORD AdapterIndex ) { +DWORD APIENTRY DhcpReleaseIpAddressLease( DWORD AdapterIndex ) { COMM_DHCP_REQ Req; COMM_DHCP_REPLY Reply; DWORD BytesRead; @@ -83,7 +81,7 @@ return Reply.Reply; } -DWORD EXPORT DhcpRenewIpAddressLease( DWORD AdapterIndex ) { +DWORD APIENTRY DhcpRenewIpAddressLease( DWORD AdapterIndex ) { COMM_DHCP_REQ Req; COMM_DHCP_REPLY Reply; DWORD BytesRead; @@ -99,7 +97,7 @@ return Reply.Reply; } -DWORD EXPORT DhcpStaticRefreshParams( DWORD AdapterIndex, +DWORD APIENTRY DhcpStaticRefreshParams( DWORD AdapterIndex, DWORD Address, DWORD Netmask ) { COMM_DHCP_REQ Req;

18 years, 10 months

[ion] 19459: - I wish svn delete would..delete the file -before- committing to that testing before a commit would actually be useful. Fix wdmguid.c build

by ion＠svn.reactos.com

- I wish svn delete would..delete the file -before- committing to that testing before a commit would actually be useful. Fix wdmguid.c build - Update NDK text files. Modified: trunk/reactos/include/ndk/fixmes.txt Modified: trunk/reactos/include/ndk/readme.txt Modified: trunk/reactos/lib/wdmguid/wdmguid.c _____ Modified: trunk/reactos/include/ndk/fixmes.txt --- trunk/reactos/include/ndk/fixmes.txt 2005-11-22 08:20:55 UTC (rev 19458) +++ trunk/reactos/include/ndk/fixmes.txt 2005-11-22 08:21:42 UTC (rev 19459) @@ -1,8 +1,135 @@ Complete list of NDK Fixmes before 1.0 Release (Nov 25th 2005) -------------------------------------------------------------- +_______________________________________________________________________ _______________ +[CRITICAL] - Breaking compatibility with official structures. +|pstypes.h - EPROCESS has ReactOS only fields. Includes ReactOS Internal header. +|pstypes.h - W32_CALLOUT_DATA has ReactOS only fields. +|obtypes.h - Object callbacks are ReactOS only definitions. +|obtypes.h - Object Header includes ReactOS only type. +|mmtypes.h - _MADDRESS_SPACE is ReactOS only field. +|ketypes.h - _KPROFILE needs to be updated with new definitions. +|ketypes.h - _KINTERRUPT needs to be verified with new definitions. +|haltypes.h - Loader Parameter Block is ReactOS Version, not NT. +| +[MAJOR] - Using incorrect, missing, or invalid names or definitions. +|i386/ketypes.h - _KTRAP_FRAME definition is broken. +|i386/ketypes.h - _KTSSNOIOPM is not an official type. +|rtltypes.h - PPF_ Defines don't seem to be the real names (try to find them). +|rtltypes.h - _RTL_PROCESS_BACKTRACE_INFORMATION isn't done. +|haltypes.h - Multi-Boot flags are ReactOS Only. +|extypes.h - SystemPowerInformation in SYSTEM_INFORMATION_CLASS causes conflict. +|extypes.h - _RUNDOWN_DESCRIPTOR is possibly incorrect/unofficial. +|asm.h - Selector names are not official. +|extypes.h - Class 42 (SYSTEM_POWER_INFORMATION causes conflict). +|extypes.h - Classes 13, 20, 30, 31, 49, 51, 52, 54+ are undefined. +| +[MINOR] - Related to location of functions, comments, etc. +|arch/ketypes.h - _KDPC_DATA, PP_LOOKASIDE_LIST shouldn't be there. +|zwfuncs.h - APIs are not organized. +|pstypes.h - Check if _PAGEFAULT_HISTORY shouldn't go in mmtypes.h instead. +|lpctypes.h - Consider moving _HARDERROR_MSG to extypes.h? +|lpctypes.h - Consider moving _CLIENT_DIED_MSG to pstypes.h? +|ketypes.h - Consider moving KNODE to mmtypes.h? +|ketypes.h - Consider moving NtBuildNumber to extypes.h? +|extypes.h - consider moving PORT_ALL_ACCESS to lpctypes.h +|GENERIC - Make sure that all files can be included in standalone! +|______________________________________________________________________ _______________ List of ReactOS Applications compiling with the NDK +(verify, fix, and optimize their usage) -------------------------------------------------------------- - +apps\utils\ps\ps.c: #include <ndk/ntndk.h> +drivers\dd\blue\blue.c: #include <ndk/halfuncs.h> +drivers\dd\bootvid\bootvid.c: #include <ndk/ldrfuncs.h> +drivers\storage\diskdump\diskdump.c: #include <ndk/extypes.h> +drivers\storage\diskdump\diskdump.c: #include <ndk/rtlfuncs.h> +hal\hal\hal.c: #include <ndk/halfuncs.h> +hal\hal\hal.c: #include <ndk/kdfuncs.h> +lib\crt\except\unwind.c: #include <ndk/umtypes.h> +lib\crt\except\unwind.c: #include <ndk/extypes.h> +lib\crt\except\unwind.c: #include <ndk/rtlfuncs.h> +lib\dnsapi\dnsapi\stubs.c: #include <ndk/ntndk.h> +lib\epsapi\enum\drivers.c: #include <ndk/ntndk.h> +lib\epsapi\enum\modules.c: #include <ndk/ntndk.h> +lib\epsapi\enum\processes.c: #include <ndk/ntndk.h> +lib\lsasrv\lsaport.c: #include <ndk/ntndk.h> +lib\lsasrv\lsasrv.c: #include <ndk/ntndk.h> +lib\nt\entry_point.c: #include <ndk/ntndk.h> +lib\samlib\samlib.c: #include <ndk/ntndk.h> +lib\samsrv\samsrv.c: #include <ndk/ntndk.h> +lib\smdll\query.c: #include <ndk/ntndk.h> +lib\string\mbstowcs.c: #include <ndk/umtypes.h> +lib\string\mbstowcs.c: #include <ndk/rtlfuncs.h> +lib\string\sscanf.c: #include <ndk/umtypes.h> +lib\string\sscanf.c: #include <ndk/rtlfuncs.h> +lib\string\wcstombs.c: #include <ndk/umtypes.h> +lib\string\wcstombs.c: #include <ndk/rtlfuncs.h> +lib\syssetup\install.c: #include <ndk/ntndk.h> +lib\syssetup\logfile.c: #include <ndk/ntndk.h> +lib\wdmguid\wdmguid.c: #include <ndk/sysguid.h> +regtests\shared\regtests.c: #include <ndk/ntndk.h> +services\umpnpmgr\umpnpmgr.c: #include <ndk/ntndk.h> +subsys\csr\main.c: #include <ndk/ntndk.h> +subsys\ntvdm\ntvdm.c: #include <ndk/ntndk.h> +subsys\system\autochk\autochk.c: #include <ndk/ntndk.h> +subsys\system\lsass\lsass.c: #include <ndk/ntndk.h> +subsys\system\setup\setup.c: #include <ndk/ntndk.h> +subsys\system\sm\sm.c: #include <ndk/ntndk.h> +boot\freeldr\freeldr\include\freeldr.h: #include <ndk/ntndk.h> +drivers\fs\ms\msfs.h: #include <ndk/ntndk.h> +drivers\fs\np\npfs.h: #include <ndk/iotypes.h> +drivers\fs\vfat\vfat.h: #include <ndk/ntndk.h> +drivers\net\ndis\include\ndissys.h: #include <ndk/ntndk.h> +drivers\net\tcpip\include\precomp.h: #include <ndk/ntndk.h> +drivers\video\miniport\xboxvmp\xboxvmp.h: #include <ndk/ntndk.h> +drivers\video\videoprt\videoprt.h: #include <ndk/ntndk.h> +hal\halx86\include\hal.h: #include <ndk/ntndk.h> +include\drivers\diskdump\diskdump.h: #include <ndk/ntndk.h> +lib\advapi32\advapi32.h: #include <ndk/ntndk.h> +lib\crt\precomp.h: #include <ndk/ntndk.h> +lib\dbghelp\stackframe.h: #include <ndk/umtypes.h> +lib\dbghelp\stackframe.h: #include <ndk/extypes.h> +lib\dbghelp\stackframe.h: #include <ndk/rtlfuncs.h> +lib\dnsapi\dnsapi\precomp.h: #include <ndk/ntndk.h> +lib\fmifs\precomp.h: #include <ndk/ntndk.h> +lib\fslib\vfatlib\vfatlib.h: #include <ndk/ntndk.h> +lib\fslib\vfatxlib\vfatxlib.h: #include <ndk/ntndk.h> +lib\gdi32\include\precomp.h: #include <ndk/ntndk.h> +lib\imagehlp\precomp.h: #include <ndk/umtypes.h> +lib\imagehlp\precomp.h: #include <ndk/rtlfuncs.h> +lib\iphlpapi\iphlpapi_private.h: #include <ndk/ntndk.h> +lib\kernel32\k32.h: #include <ndk/ntndk.h> +lib\msafd\msafd.h: #include <ndk/ntndk.h> +lib\ntdll\inc\ntdll.h: #include <ndk/ntndk.h> +lib\opengl32\teb.h: #include <ndk/ntndk.h> +lib\psapi\precomp.h: #include <ndk/ntndk.h> +lib\rtl\rtl.h: #include <ndk/ntndk.h> +lib\secur32\precomp.h: #include <ndk/ntndk.h> +lib\setupapi\setupapi_private.h: #include <ndk/ntndk.h> +lib\smlib\precomp.h: #include <ndk/ntndk.h> +lib\user32\include\user32.h: #include <ndk/ntndk.h> +lib\userenv\precomp.h: #include <ndk/ntndk.h> +lib\ws2help\ws2help.h: #include <ndk/ntndk.h> +lib\ws2_32\include\ws2_32.h: #include <ndk/ntndk.h> +lib\wshirda\wshirda.h: #include <ndk/ntndk.h> +ntoskrnl\include\ntoskrnl.h: #include <ndk/ntndk.h> +ntoskrnl\include\internal\napi.h: #include <ndk/asm.h> +services\dhcp\include\rosdhcp.h: #include <ndk/ntndk.h> +services\eventlog\eventlog.h: #include <ndk/ntndk.h> +services\rpcss\rpcss.h: #include <ndk/ntndk.h> +subsys\csr\csrsrv\srv.h: #include <ndk/ntndk.h> +subsys\csrss\csrss.h: #include <ndk/ntndk.h> +subsys\csrss\include\api.h: #include <ndk/ntndk.h> +subsys\csrss\win32csr\w32csr.h: #include <ndk/ntndk.h> +subsys\smss\smss.h: #include <ndk/ntndk.h> +subsys\system\cmd\precomp.h: #include <ndk/ntndk.h> +subsys\system\services\services.h: #include <ndk/ntndk.h> +subsys\system\taskmgr\precomp.h: #include <ndk/ntndk.h> +subsys\system\usetup\usetup.h: #include <ndk/ntndk.h> +subsys\system\winlogon\winlogon.h: #include <ndk/ntndk.h> +subsys\win\basesrv\basesrv.h: #include <ndk/ntndk.h> +subsys\win\winsrv\winsrv.h: #include <ndk/ntndk.h> +subsys\win32k\w32k.h: #include <ndk/ntndk.h> +subsys\win32k\include\napi.h: #include <ndk/asm.h> \ No newline at end of file _____ Modified: trunk/reactos/include/ndk/readme.txt --- trunk/reactos/include/ndk/readme.txt 2005-11-22 08:20:55 UTC (rev 19458) +++ trunk/reactos/include/ndk/readme.txt 2005-11-22 08:21:42 UTC (rev 19459) @@ -2,6 +2,20 @@ NDK 1.00 ----------------------------- +0. PREABMLE + +0.1 COPYRIGHT + +The NDK is Copyright ® 2005 Alex Ionescu. + +0.2 CONTACT INFORMATION + +The author, Alex Ionescu, may be reached through the following means: + +Email: alex.ionescu(a)reactos.com +Mail: 2246, Duvernay. H3J 2Y3. Montreal, QC. CANADA. +Phone: (514)581-7156 + 1. LICENSE 1.1 OPEN SOURCE USAGE @@ -45,8 +59,63 @@ If you are unsure of have any questions about the NDK License, please contact the author for further clarification. -2. USAGE +2. ORIGINS OF NDK MATERIAL, AND ADDING YOUR OWN -2.1 TODO (COPY FROM WIKI) +2.1 CONTRIBUTIONS AND SOURCES +The NDK could not exist without the various contributions made by a variety of people +and sources. The following public sources of information were lawfully used: + +- GNU NTIFS.H, Revision 43 +- W32API, Version 2.5 +- Microsoft Driver Development Kit 2003 SP1 +- Microsoft Driver Development Kit 2000 +- Microsoft Driver Development Kit NT 4 +- Microsoft Driver Development Kit WinME +- Microsoft Installable File Systems Kit 2003 SP1 +- Microsoft Windows Debugger (WinDBG) 6.5.0003.7 +- Microsoft Public Symbolic Data +- Microsoft Public Windows Binaries (strings) +- OSR Technical Articles +- Undocumented windows 2000 Secrets, a Programmer's Cookbook +- Windows NT/2000 Native API Reference +- Windows NT File System Internals +- Windows Internals I - II +- Windows Internals 4th Edition + +If the information contained in these sources was copyrighted, the information was not +copied, but simply used as a basis for developing a compatible and identical definition. +No information protected by a patent or NDA was used. All information was publically +located through the Internet or purchased or licensed for lawful use. + +Additionally, the following people contributed to the NDK: + +- Eric Kohl +- Filip Navara +- Steven Edwards + +2.2 BECOMING A CONTRIBUTOR + +To contribute information to the NDK, simply contact the author with your new structure, +definition, enumeration, or prototype. Please make sure that your addition is: + +1) Actually correct! +2) Present in Windows NT 5, 5.1, 5.2 and/or 6.0 +3) Not already accessible through another public header in the DDK, IFS, WDK and/or PSDK. +4) From a publically verifiable source. The author needs to be able to search for your + addition in a public information location (book, Internet, etc) and locate this definition. +5) Not Reversed. Reversing a type is STRONGLY discouraged and a reversed type will more then likely + not be accepted, due to the fact that functionality and naming will be entirely guessed, and things + like unions are almost impossible to determine. It can also bring up possible legal ramifications + depending on your location. However, using a tool to dump the strings inside an executable + for the purpose of locating the actual name or definition of a structure (sometimes possible due + to ASSERTs or debugging strings) is considered 'fair use' and will be a likely candidate. + +If your addition satsfies these points, then please submit it, and also include whether or not +you would like to be credited for it. + +3. USAGE + +3.1 TODO (COPY FROM WIKI) + ... TODO ... (COPY FROM WIKI) _____ Modified: trunk/reactos/lib/wdmguid/wdmguid.c --- trunk/reactos/lib/wdmguid/wdmguid.c 2005-11-22 08:20:55 UTC (rev 19458) +++ trunk/reactos/lib/wdmguid/wdmguid.c 2005-11-22 08:21:42 UTC (rev 19459) @@ -5,6 +5,6 @@ #include "initguid.h" #include <ddk/wdmguid.h> -#include <ndk/sysguid.h> +#include <umpnpmgr/sysguid.h> /* EOF */

18 years, 10 months

[sedwards] 19458: add __i386__

by sedwards＠svn.reactos.com

add __i386__ Modified: trunk/reactos/ReactOS.xml _____ Modified: trunk/reactos/ReactOS.xml --- trunk/reactos/ReactOS.xml 2005-11-22 08:18:03 UTC (rev 19457) +++ trunk/reactos/ReactOS.xml 2005-11-22 08:20:55 UTC (rev 19458) @@ -11,6 +11,7 @@ <define name="_M_IX86" /> <define name="_X86_" /> + <define name="__i386__" /> <if property="MP" value="1"> <define name="CONFIG_SMP" value="1" /> </if>

18 years, 10 months

[chorns] 19457: Parse <compilationunit>

by chorns＠svn.reactos.com

Parse <compilationunit> Added: trunk/reactos/tools/rbuild/compilationunit.cpp Modified: trunk/reactos/tools/rbuild/doc/rbuild.txt Added: trunk/reactos/tools/rbuild/global.cpp Modified: trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/project.cpp Modified: trunk/reactos/tools/rbuild/rbuild.cpp Modified: trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/rbuild.mak Modified: trunk/reactos/tools/rbuild/test.h Modified: trunk/reactos/tools/rbuild/tests/alltests.cpp Added: trunk/reactos/tools/rbuild/tests/compilationunittest.cpp Added: trunk/reactos/tools/rbuild/tests/data/compilationunit.xml Modified: trunk/reactos/tools/tools.mak _____ Copied: trunk/reactos/tools/rbuild/compilationunit.cpp (from rev 19411, trunk/reactos/tools/rbuild/compilationunit.cpp) _____ Modified: trunk/reactos/tools/rbuild/doc/rbuild.txt --- trunk/reactos/tools/rbuild/doc/rbuild.txt 2005-11-22 08:15:04 UTC (rev 19456) +++ trunk/reactos/tools/rbuild/doc/rbuild.txt 2005-11-22 08:18:03 UTC (rev 19457) @@ -129,7 +129,7 @@ None. Elements: - bootstrap, component, define, dependency, directory, file, if, importlibrary, include, invoke, library, linkerscript, property. + bootstrap, component, compilationunit, define, dependency, directory, file, if, importlibrary, include, invoke, library, linkerscript, property. Module types @@ -190,6 +190,25 @@ None. +CompilationUnit element +----------------------- +A compilationunit element specifies that one or more source code files are to be compiled as a single compilation unit. + +Syntax: + <compilationunit> + ... + </compilationunit> + +Attributes: + None. + +Value: + None. + +Elements: + directory, file, if. + + Component element ----------------- A component element specifies that imports from a library are to be stubbed so tests can be run without actually calling the functions in the library. This element can only be used for modules of type test. @@ -313,7 +332,7 @@ None. Elements: - compilerflag, define, directory, file, if, include, property. + compilationunit, compilerflag, define, directory, file, if, include, property. Importlibrary element _____ Copied: trunk/reactos/tools/rbuild/global.cpp (from rev 19411, trunk/reactos/tools/rbuild/global.cpp) --- trunk/reactos/tools/rbuild/global.cpp 2005-11-21 18:02:28 UTC (rev 19411) +++ trunk/reactos/tools/rbuild/global.cpp 2005-11-22 08:18:03 UTC (rev 19457) @@ -0,0 +1,70 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +#include "rbuild.h" + +using std::string; +using std::vector; + +string ExePrefix; +string ExePostfix; +string sSep; +string sBadSep; +char cSep; +char cBadSep; + + +void +InitializeEnvironment () +{ + char *SepValue, *ExePostfixValue, *ExePrefixValue;; + + SepValue = getenv ( "SEP" ); + if ( SepValue && ( 0 == strcmp ( SepValue, DEF_SSEP ) || 0 == strcmp ( SepValue, DEF_SBAD_SEP ) ) ) + { + cSep = SepValue[0]; + sSep = SepValue; + } + else + { + cSep = DEF_CSEP; + sSep = DEF_SSEP; + } + if ( cSep == DEF_CSEP ) + { + cBadSep = DEF_CBAD_SEP; + sBadSep = DEF_SBAD_SEP; + } + else + { + cBadSep = DEF_CSEP; + sBadSep = DEF_SSEP; + } + ExePostfixValue = getenv ( "EXEPOSTFIX" ); + ExePrefixValue = getenv ( "EXEPREFIX" ); + if ( ( ExePostfixValue == NULL || 0 == strlen ( ExePostfixValue ) ) && + ( ExePrefixValue == NULL || 0 == strlen ( ExePrefixValue ) ) ) + { + ExePostfix = DEF_EXEPOSTFIX; + ExePrefix = DEF_EXEPREFIX; + } + else + { + ExePostfix = ExePostfixValue ? ExePostfixValue : ""; + ExePrefix = ExePrefixValue ? ExePrefixValue : ""; + } +} _____ Modified: trunk/reactos/tools/rbuild/module.cpp --- trunk/reactos/tools/rbuild/module.cpp 2005-11-22 08:15:04 UTC (rev 19456) +++ trunk/reactos/tools/rbuild/module.cpp 2005-11-22 08:18:03 UTC (rev 19457) @@ -182,20 +182,22 @@ IfableData::~IfableData() { size_t i; - for ( i = 0; i < files.size(); i++ ) + for ( i = 0; i < files.size (); i++ ) delete files[i]; - for ( i = 0; i < includes.size(); i++ ) + for ( i = 0; i < includes.size (); i++ ) delete includes[i]; - for ( i = 0; i < defines.size(); i++ ) + for ( i = 0; i < defines.size (); i++ ) delete defines[i]; - for ( i = 0; i < libraries.size(); i++ ) + for ( i = 0; i < libraries.size (); i++ ) delete libraries[i]; - for ( i = 0; i < properties.size(); i++ ) + for ( i = 0; i < properties.size (); i++ ) delete properties[i]; - for ( i = 0; i < compilerFlags.size(); i++ ) + for ( i = 0; i < compilerFlags.size (); i++ ) delete compilerFlags[i]; - for ( i = 0; i < ifs.size(); i++ ) + for ( i = 0; i < ifs.size (); i++ ) delete ifs[i]; + for ( i = 0; i < compilationUnits.size (); i++ ) + delete compilationUnits[i]; } void IfableData::ProcessXML () @@ -215,6 +217,8 @@ compilerFlags[i]->ProcessXML (); for ( i = 0; i < ifs.size (); i++ ) ifs[i]->ProcessXML (); + for ( i = 0; i < compilationUnits.size (); i++ ) + compilationUnits[i]->ProcessXML (); } Module::Module ( const Project& project, @@ -413,7 +417,10 @@ size_t i; for ( i = 0; i < node.subElements.size(); i++ ) - ProcessXMLSubElement ( *node.subElements[i], path ); + { + ParseContext parseContext; + ProcessXMLSubElement ( *node.subElements[i], path, parseContext ); + } for ( i = 0; i < invocations.size(); i++ ) invocations[i]->ProcessXML (); for ( i = 0; i < dependencies.size(); i++ ) @@ -434,8 +441,9 @@ void Module::ProcessXMLSubElement ( const XMLElement& e, const string& path, - If* pIf /*= NULL*/ ) + ParseContext& parseContext ) { + If* pOldIf = parseContext.ifData; bool subs_invalid = false; string subpath ( path ); if ( e.name == "file" && e.value.size () > 0 ) @@ -470,17 +478,19 @@ first, switches, false ); - if ( pIf ) - pIf->data.files.push_back ( pFile ); + if ( parseContext.ifData ) + parseContext.ifData->data.files.push_back ( pFile ); else non_if_data.files.push_back ( pFile ); + if ( parseContext.compilationUnit ) + parseContext.compilationUnit->files.push_back ( pFile ); subs_invalid = true; } else if ( e.name == "library" && e.value.size () ) { Library* pLibrary = new Library ( e, *this, e.value ); - if ( pIf ) - pIf->data.libraries.push_back ( pLibrary ); + if ( parseContext.ifData ) + parseContext.ifData->data.libraries.push_back ( pLibrary ); else non_if_data.libraries.push_back ( pLibrary ); subs_invalid = true; @@ -494,8 +504,8 @@ else if ( e.name == "include" ) { Include* include = new Include ( project, this, &e ); - if ( pIf ) - pIf->data.includes.push_back ( include ); + if ( parseContext.ifData ) + parseContext.ifData->data.includes.push_back ( include ); else non_if_data.includes.push_back ( include ); subs_invalid = true; @@ -503,15 +513,15 @@ else if ( e.name == "define" ) { Define* pDefine = new Define ( project, this, e ); - if ( pIf ) - pIf->data.defines.push_back ( pDefine ); + if ( parseContext.ifData ) + parseContext.ifData->data.defines.push_back ( pDefine ); else non_if_data.defines.push_back ( pDefine ); subs_invalid = true; } else if ( e.name == "invoke" ) { - if ( pIf ) + if ( parseContext.ifData ) throw InvalidBuildFileException ( e.location, "<invoke> is not a valid sub-element of <if>" ); @@ -520,7 +530,7 @@ } else if ( e.name == "dependency" ) { - if ( pIf ) + if ( parseContext.ifData ) throw InvalidBuildFileException ( e.location, "<dependency> is not a valid sub-element of <if>" ); @@ -529,7 +539,7 @@ } else if ( e.name == "importlibrary" ) { - if ( pIf ) + if ( parseContext.ifData ) throw InvalidBuildFileException ( e.location, "<importlibrary> is not a valid sub-element of <if>" ); @@ -542,29 +552,27 @@ } else if ( e.name == "if" ) { - If* pOldIf = pIf; - pIf = new If ( e, project, this ); + parseContext.ifData = new If ( e, project, this ); if ( pOldIf ) - pOldIf->data.ifs.push_back ( pIf ); + pOldIf->data.ifs.push_back ( parseContext.ifData ); else - non_if_data.ifs.push_back ( pIf ); + non_if_data.ifs.push_back ( parseContext.ifData ); subs_invalid = false; } else if ( e.name == "ifnot" ) { - If* pOldIf = pIf; - pIf = new If ( e, project, this, true ); + parseContext.ifData = new If ( e, project, this, true ); if ( pOldIf ) - pOldIf->data.ifs.push_back ( pIf ); + pOldIf->data.ifs.push_back ( parseContext.ifData ); else - non_if_data.ifs.push_back ( pIf ); + non_if_data.ifs.push_back ( parseContext.ifData ); subs_invalid = false; } else if ( e.name == "compilerflag" ) { CompilerFlag* pCompilerFlag = new CompilerFlag ( project, this, e ); - if ( pIf ) - pIf->data.compilerFlags.push_back ( pCompilerFlag ); + if ( parseContext.ifData ) + parseContext.ifData->data.compilerFlags.push_back ( pCompilerFlag ); else non_if_data.compilerFlags.push_back ( pCompilerFlag ); subs_invalid = true; @@ -601,7 +609,7 @@ } else if ( e.name == "pch" ) { - if ( pIf ) + if ( parseContext.ifData ) throw InvalidBuildFileException ( e.location, "<pch> is not a valid sub-element of <if>" ); @@ -613,13 +621,24 @@ e, *this, File ( FixSeparator ( path + cSep + e.value ), false, "", true ) ); subs_invalid = true; } + else if ( e.name == "compilationunit" ) + { + CompilationUnit* pCompilationUnit = new CompilationUnit ( project, this, e ); + if ( parseContext.ifData ) + parseContext.ifData->data.compilationUnits.push_back ( pCompilationUnit ); + else + non_if_data.compilationUnits.push_back ( pCompilationUnit ); + parseContext.compilationUnit = pCompilationUnit; + subs_invalid = false; + } if ( subs_invalid && e.subElements.size() > 0 ) throw InvalidBuildFileException ( e.location, "<%s> cannot have sub-elements", e.name.c_str() ); for ( size_t i = 0; i < e.subElements.size (); i++ ) - ProcessXMLSubElement ( *e.subElements[i], subpath, pIf ); + ProcessXMLSubElement ( *e.subElements[i], subpath, parseContext ); + parseContext.ifData = pOldIf; } ModuleType _____ Modified: trunk/reactos/tools/rbuild/project.cpp --- trunk/reactos/tools/rbuild/project.cpp 2005-11-22 08:15:04 UTC (rev 19456) +++ trunk/reactos/tools/rbuild/project.cpp 2005-11-22 08:18:03 UTC (rev 19457) @@ -66,6 +66,11 @@ "reactos" ); } +ParseContext::ParseContext () + : ifData (NULL), + compilationUnit (NULL) +{ +} Project::Project ( const string& filename ) : xmlfile (filename), @@ -254,7 +259,10 @@ size_t i; for ( i = 0; i < node->subElements.size (); i++ ) - ProcessXMLSubElement ( *node->subElements[i], path ); + { + ParseContext parseContext; + ProcessXMLSubElement ( *node->subElements[i], path, parseContext ); + } for ( i = 0; i < modules.size (); i++ ) modules[i]->ProcessXML (); for ( i = 0; i < linkerFlags.size (); i++ ) @@ -269,13 +277,13 @@ void Project::ProcessXMLSubElement ( const XMLElement& e, const string& path, - If* pIf ) + ParseContext& parseContext ) { bool subs_invalid = false; string subpath(path); if ( e.name == "module" ) { - if ( pIf ) + if ( parseContext.ifData ) throw InvalidBuildFileException ( e.location, "<module> is not a valid sub-element of <if>" ); @@ -310,8 +318,8 @@ else if ( e.name == "include" ) { Include* include = new Include ( *this, &e ); - if ( pIf ) - pIf->data.includes.push_back ( include ); + if ( parseContext.ifData ) + parseContext.ifData->data.includes.push_back ( include ); else non_if_data.includes.push_back ( include ); subs_invalid = true; @@ -319,8 +327,8 @@ else if ( e.name == "define" ) { Define* define = new Define ( *this, e ); - if ( pIf ) - pIf->data.defines.push_back ( define ); + if ( parseContext.ifData ) + parseContext.ifData->data.defines.push_back ( define ); else non_if_data.defines.push_back ( define ); subs_invalid = true; @@ -328,8 +336,8 @@ else if ( e.name == "compilerflag" ) { CompilerFlag* pCompilerFlag = new CompilerFlag ( *this, e ); - if ( pIf ) - pIf->data.compilerFlags.push_back ( pCompilerFlag ); + if ( parseContext.ifData ) + parseContext.ifData->data.compilerFlags.push_back ( pCompilerFlag ); else non_if_data.compilerFlags.push_back ( pCompilerFlag ); subs_invalid = true; @@ -341,29 +349,29 @@ } else if ( e.name == "if" ) { - If* pOldIf = pIf; - pIf = new If ( e, *this, NULL ); + If* pOldIf = parseContext.ifData; + parseContext.ifData = new If ( e, *this, NULL ); if ( pOldIf ) - pOldIf->data.ifs.push_back ( pIf ); + pOldIf->data.ifs.push_back ( parseContext.ifData ); else - non_if_data.ifs.push_back ( pIf ); + non_if_data.ifs.push_back ( parseContext.ifData ); subs_invalid = false; } else if ( e.name == "ifnot" ) { - If* pOldIf = pIf; - pIf = new If ( e, *this, NULL, true ); + If* pOldIf = parseContext.ifData; + parseContext.ifData = new If ( e, *this, NULL, true ); if ( pOldIf ) - pOldIf->data.ifs.push_back ( pIf ); + pOldIf->data.ifs.push_back ( parseContext.ifData ); else - non_if_data.ifs.push_back ( pIf ); + non_if_data.ifs.push_back ( parseContext.ifData ); subs_invalid = false; } else if ( e.name == "property" ) { Property* property = new Property ( e, *this, NULL ); - if ( pIf ) - pIf->data.properties.push_back ( property ); + if ( parseContext.ifData ) + parseContext.ifData->data.properties.push_back ( property ); else non_if_data.properties.push_back ( property ); } @@ -373,7 +381,7 @@ "<%s> cannot have sub-elements", e.name.c_str() ); for ( size_t i = 0; i < e.subElements.size (); i++ ) - ProcessXMLSubElement ( *e.subElements[i], subpath, pIf ); + ProcessXMLSubElement ( *e.subElements[i], subpath, parseContext ); } Module* @@ -405,5 +413,3 @@ { return xmlfile; } - - _____ Modified: trunk/reactos/tools/rbuild/rbuild.cpp --- trunk/reactos/tools/rbuild/rbuild.cpp 2005-11-22 08:15:04 UTC (rev 19456) +++ trunk/reactos/tools/rbuild/rbuild.cpp 2005-11-22 08:18:03 UTC (rev 19457) @@ -35,13 +35,6 @@ static string RootXmlFile = "ReactOS.xml"; static Configuration configuration; -string ExePrefix; -string ExePostfix; -string sSep; -string sBadSep; -char cSep; -char cBadSep; - bool ParseAutomaticDependencySwitch ( char switchChar2, char* switchStart ) @@ -193,43 +186,8 @@ int main ( int argc, char** argv ) { - char *SepValue, *ExePostfixValue, *ExePrefixValue;; + InitializeEnvironment (); - SepValue = getenv("SEP"); - if (SepValue && (0 == strcmp(SepValue, DEF_SSEP) || 0 == strcmp(SepValue, DEF_SBAD_SEP))) - { - cSep = SepValue[0]; - sSep = SepValue; - } - else - { - cSep = DEF_CSEP; - sSep = DEF_SSEP; - } - if (cSep == DEF_CSEP) - { - cBadSep = DEF_CBAD_SEP; - sBadSep = DEF_SBAD_SEP; - } - else - { - cBadSep = DEF_CSEP; - sBadSep = DEF_SSEP; - } - ExePostfixValue = getenv("EXEPOSTFIX"); - ExePrefixValue = getenv("EXEPREFIX"); - if ((ExePostfixValue == NULL || 0 == strlen(ExePostfixValue)) && - (ExePrefixValue == NULL || 0 == strlen(ExePrefixValue))) - { - ExePostfix = DEF_EXEPOSTFIX; - ExePrefix = DEF_EXEPREFIX; - } - else - { - ExePostfix = ExePostfixValue ? ExePostfixValue : ""; - ExePrefix = ExePrefixValue ? ExePrefixValue : ""; - } - if ( !ParseArguments ( argc, argv ) ) { printf ( "Generates project files for buildsystems\n\n" ); _____ Modified: trunk/reactos/tools/rbuild/rbuild.h --- trunk/reactos/tools/rbuild/rbuild.h 2005-11-22 08:15:04 UTC (rev 19456) +++ trunk/reactos/tools/rbuild/rbuild.h 2005-11-22 08:18:03 UTC (rev 19457) @@ -91,6 +91,7 @@ class PchFile; class StubbedComponent; class StubbedSymbol; +class CompilationUnit; class SourceFileTest; @@ -121,6 +122,7 @@ const std::string& defaultValue ); }; + class FileSupportCode { public: @@ -128,9 +130,20 @@ std::string filename ); }; + +class ParseContext +{ +public: + If* ifData; + CompilationUnit* compilationUnit; + ParseContext (); +}; + + class IfableData { public: + std::vector<CompilationUnit*> compilationUnits; std::vector<File*> files; std::vector<Include*> includes; std::vector<Define*> defines; @@ -177,7 +190,7 @@ void ReadXml (); void ProcessXMLSubElement ( const XMLElement& e, const std::string& path, - If* pIf = NULL ); + ParseContext& parseContext ); // disable copy semantics Project ( const Project& ); @@ -277,7 +290,7 @@ std::string GetDefaultModuleBaseaddress () const; void ProcessXMLSubElement ( const XMLElement& e, const std::string& path, - If* pIf = NULL ); + ParseContext& parseContext ); }; @@ -771,6 +784,26 @@ std::string StripSymbol ( std::string symbol ); }; + +class CompilationUnit +{ +public: + const Project& project; + const Module* module; + const XMLElement& node; + std::vector<File*> files; + + CompilationUnit ( const Project& project, + const Module* module, + const XMLElement& node ); + ~CompilationUnit (); + void ProcessXML(); +}; + + +extern void +InitializeEnvironment (); + extern std::string Right ( const std::string& s, size_t n ); _____ Modified: trunk/reactos/tools/rbuild/rbuild.mak --- trunk/reactos/tools/rbuild/rbuild.mak 2005-11-22 08:15:04 UTC (rev 19456) +++ trunk/reactos/tools/rbuild/rbuild.mak 2005-11-22 08:18:03 UTC (rev 19457) @@ -152,9 +152,11 @@ RBUILD_COMMON_SOURCES = \ $(RBUILD_BACKEND_SOURCES) \ $(addprefix $(RBUILD_BASE_), \ + global.cpp \ automaticdependency.cpp \ bootstrap.cpp \ cdfile.cpp \ + compilationunit.cpp \ compilerflag.cpp \ configuration.cpp \ define.cpp \ @@ -219,6 +221,7 @@ RBUILD_TESTS = \ tests$(SEP)cdfiletest.cpp \ + tests$(SEP)compilationunittest.cpp \ tests$(SEP)definetest.cpp \ tests$(SEP)functiontest.cpp \ tests$(SEP)iftest.cpp \ @@ -256,6 +259,10 @@ $(ECHO_LD) ${host_gpp} $(RBUILD_OBJECTS) $(RBUILD_HOST_LFLAGS) -o $@ +$(RBUILD_INT_)global.o: $(RBUILD_BASE_)global.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + $(RBUILD_INT_)automaticdependency.o: $(RBUILD_BASE_)automaticdependency.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ @@ -268,6 +275,10 @@ $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ +$(RBUILD_INT_)compilationunit.o: $(RBUILD_BASE_)compilationunit.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + $(RBUILD_INT_)compilerflag.o: $(RBUILD_BASE_)compilerflag.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ @@ -380,6 +391,10 @@ $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ +$(RBUILD_TESTS_INT_)compilationunittest.o: $(RBUILD_TESTS_BASE_)compilationunittest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + $(RBUILD_TESTS_INT_)definetest.o: $(RBUILD_TESTS_BASE_)definetest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ _____ Modified: trunk/reactos/tools/rbuild/test.h --- trunk/reactos/tools/rbuild/test.h 2005-11-22 08:15:04 UTC (rev 19456) +++ trunk/reactos/tools/rbuild/test.h 2005-11-22 08:18:03 UTC (rev 19457) @@ -21,6 +21,8 @@ #include "rbuild.h" #include "backend/mingw/mingw.h" +#define SSEP DEF_SSEP + #define RBUILD_BASE "tools" SSEP "rbuild" SSEP class BaseTest @@ -153,4 +155,10 @@ void Run (); }; +class CompilationUnitTest : public BaseTest +{ +public: + void Run (); +}; + #endif /* __TEST_H */ _____ Modified: trunk/reactos/tools/rbuild/tests/alltests.cpp --- trunk/reactos/tools/rbuild/tests/alltests.cpp 2005-11-22 08:15:04 UTC (rev 19456) +++ trunk/reactos/tools/rbuild/tests/alltests.cpp 2005-11-22 08:18:03 UTC (rev 19457) @@ -196,6 +196,7 @@ tests.push_back(new SourceFileTest()); tests.push_back(new CDFileTest()); tests.push_back(new SymbolTest()); + tests.push_back(new CompilationUnitTest()); } }; @@ -203,6 +204,7 @@ int main(int argc, char** argv) { + InitializeEnvironment (); TestDispatcher testDispatcher; testDispatcher.Run(); return 0; _____ Copied: trunk/reactos/tools/rbuild/tests/compilationunittest.cpp (from rev 19411, trunk/reactos/tools/rbuild/tests/compilationunittest.cpp) _____ Copied: trunk/reactos/tools/rbuild/tests/data/compilationunit.xml (from rev 19411, trunk/reactos/tools/rbuild/tests/data/compilationunit.xml) _____ Modified: trunk/reactos/tools/tools.mak --- trunk/reactos/tools/tools.mak 2005-11-22 08:15:04 UTC (rev 19456) +++ trunk/reactos/tools/tools.mak 2005-11-22 08:18:03 UTC (rev 19457) @@ -5,9 +5,9 @@ TOOLS_OUT = $(OUTPUT_)$(TOOLS_BASE) TOOLS_OUT_ = $(TOOLS_OUT)$(SEP) -TOOLS_CFLAGS = -Wall -Wpointer-arith -Wno-strict-aliasing -TOOLS_CPPFLAGS = -Wall -Wpointer-arith -TOOLS_LFLAGS = +TOOLS_CFLAGS = $(CFLAGS) -Wall -Wpointer-arith -Wno-strict-aliasing +TOOLS_CPPFLAGS = $(CPPFLAGS) -Wall -Wpointer-arith +TOOLS_LFLAGS = $(LFLAGS) $(TOOLS_INT): | $(INTERMEDIATE) $(ECHO_MKDIR)

18 years, 10 months

[sedwards] 19456: msvc warnings fixes

by sedwards＠svn.reactos.com

msvc warnings fixes Modified: trunk/reactos/lib/cards/cards.c _____ Modified: trunk/reactos/lib/cards/cards.c --- trunk/reactos/lib/cards/cards.c 2005-11-22 08:12:42 UTC (rev 19455) +++ trunk/reactos/lib/cards/cards.c 2005-11-22 08:15:04 UTC (rev 19456) @@ -20,10 +20,7 @@ #include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#include "windows.h" #include "cards.h" HBITMAP g_CardBitmaps[MAX_CARD_BITMAPS]; @@ -79,7 +76,7 @@ /* * internal */ -inline VOID BltCard(HDC hdc, INT x, INT y, INT dx, INT dy, HDC hdcCard, DWORD dwRasterOp, BOOL bStretch) +static __inline VOID BltCard(HDC hdc, INT x, INT y, INT dx, INT dy, HDC hdcCard, DWORD dwRasterOp, BOOL bStretch) { if (bStretch) {

18 years, 10 months

[sedwards] 19455: remove some warnings

by sedwards＠svn.reactos.com

remove some warnings Modified: trunk/reactos/apps/utils/rosperf/rosperf.c _____ Modified: trunk/reactos/apps/utils/rosperf/rosperf.c --- trunk/reactos/apps/utils/rosperf/rosperf.c 2005-11-22 07:18:44 UTC (rev 19454) +++ trunk/reactos/apps/utils/rosperf/rosperf.c 2005-11-22 08:12:42 UTC (rev 19455) @@ -319,7 +319,7 @@ RosVersion = VersionInfo.szCSDVersion + wcslen(VersionInfo.szCSDVersion) + 1; RosVersionLen = sizeof(VersionInfo.szCSDVersion) / sizeof(VersionInfo.szCSDVersion[0]) - (RosVersion - VersionInfo.szCSDVersion); - if (7 <= RosVersionLen && 0 == wcsnicmp(RosVersion, L"ReactOS", 7)) + if (7 <= RosVersionLen && 0 == _wcsnicmp(RosVersion, L"ReactOS", 7)) { wprintf(L"Running on %s\n", RosVersion); return; @@ -744,7 +744,7 @@ { if (L'/' == ArgV[Arg][0] || L'-' == ArgV[Arg][0]) { - if (0 == wcsicmp(ArgV[Arg] + 1, L"repeat")) + if (0 == _wcsicmp(ArgV[Arg] + 1, L"repeat")) { if (ArgC <= Arg + 1) { @@ -763,7 +763,7 @@ return FALSE; } } - else if (0 == wcsicmp(ArgV[Arg] + 1, L"seconds")) + else if (0 == _wcsicmp(ArgV[Arg] + 1, L"seconds")) { if (ArgC <= Arg + 1) { @@ -802,7 +802,7 @@ } for (i = 0; i < AllTestCount; i++) { - if (0 == wcsicmp(ArgV[Arg], AllTests[i].Option)) + if (0 == _wcsicmp(ArgV[Arg], AllTests[i].Option)) { DoTest[i] = TRUE; break;

18 years, 10 months

[sedwards] 19454: add recent winehq object manager tests

by sedwards＠svn.reactos.com

add recent winehq object manager tests Modified: trunk/reactos/regtests/winetests/ntdll/ntdll.xml Added: trunk/reactos/regtests/winetests/ntdll/om.c Modified: trunk/reactos/regtests/winetests/ntdll/testlist.c _____ Modified: trunk/reactos/regtests/winetests/ntdll/ntdll.xml --- trunk/reactos/regtests/winetests/ntdll/ntdll.xml 2005-11-22 06:57:36 UTC (rev 19453) +++ trunk/reactos/regtests/winetests/ntdll/ntdll.xml 2005-11-22 07:18:44 UTC (rev 19454) @@ -7,6 +7,7 @@ <file>error.c</file> <file>info.c</file> <file>large_int.c</file> + <file>om.c</file> <file>path.c</file> <file>reg.c</file> <file>rtlbitmap.c</file> _____ Added: trunk/reactos/regtests/winetests/ntdll/om.c --- trunk/reactos/regtests/winetests/ntdll/om.c 2005-11-22 06:57:36 UTC (rev 19453) +++ trunk/reactos/regtests/winetests/ntdll/om.c 2005-11-22 07:18:44 UTC (rev 19454) @@ -0,0 +1,564 @@ +/* + * Unit test suite for object manager functions + * + * Copyright 2005 Robert Shearman + * Copyright 2005 Vitaliy Margolen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "ntdll_test.h" +#include "winternl.h" +#include "stdio.h" +#include "winnt.h" +#include "stdlib.h" + +static NTSTATUS (WINAPI *pRtlCreateUnicodeStringFromAsciiz)(PUNICODE_STRING, LPCSTR); +static VOID (WINAPI *pRtlInitUnicodeString)( PUNICODE_STRING, LPCWSTR ); +static VOID (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); +static NTSTATUS (WINAPI *pNtCreateEvent) ( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES, BOOLEAN, BOOLEAN); +static NTSTATUS (WINAPI *pNtCreateMutant)( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES, BOOLEAN ); +static NTSTATUS (WINAPI *pNtOpenMutant) ( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES ); +static NTSTATUS (WINAPI *pNtCreateSemaphore)( PHANDLE, ACCESS_MASK,const POBJECT_ATTRIBUTES,LONG,LONG ); +static NTSTATUS (WINAPI *pNtCreateTimer) ( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES, TIMER_TYPE ); +static NTSTATUS (WINAPI *pNtCreateSection)( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES, const PLARGE_INTEGER, + ULONG, ULONG, HANDLE ); +static NTSTATUS (WINAPI *pNtOpenFile) ( PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, PIO_STATUS_BLOCK, ULONG, ULONG ); +static NTSTATUS (WINAPI *pNtClose) ( HANDLE ); +static NTSTATUS (WINAPI *pNtCreateNamedPipeFile)( PHANDLE, ULONG, POBJECT_ATTRIBUTES, PIO_STATUS_BLOCK, + ULONG, ULONG, ULONG, ULONG, ULONG, ULONG, ULONG, ULONG, ULONG, PLARGE_INTEGER ); +static NTSTATUS (WINAPI *pNtOpenDirectoryObject)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES); +static NTSTATUS (WINAPI *pNtCreateDirectoryObject)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES); +static NTSTATUS (WINAPI *pNtOpenSymbolicLinkObject)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES); +static NTSTATUS (WINAPI *pNtCreateSymbolicLinkObject)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, PUNICODE_STRING); + + +void test_case_sensitive (void) +{ + static const WCHAR buffer1[] = {'\\','B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s','\ \','t','e','s','t',0}; + static const WCHAR buffer2[] = {'\\','B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s','\ \','T','e','s','t',0}; + static const WCHAR buffer3[] = {'\\','B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s','\ \','T','E','s','t',0}; + static const WCHAR buffer4[] = {'\\','B','A','S','E','N','a','m','e','d','O','b','j','e','c','t','s','\ \','t','e','s','t',0}; + NTSTATUS status; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING str; + HANDLE Event, Mutant, h; + + pRtlInitUnicodeString(&str, buffer1); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + status = pNtCreateMutant(&Mutant, GENERIC_ALL, &attr, FALSE); + ok(status == STATUS_SUCCESS, "Failed to create Mutant(%08lx)\n", status); + + status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, FALSE, FALSE); + ok(status == STATUS_OBJECT_NAME_COLLISION, + "NtCreateEvent should have failed with STATUS_OBJECT_NAME_COLLISION got(%08lx)\n", status); + + pRtlInitUnicodeString(&str, buffer2); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, FALSE, FALSE); + ok(status == STATUS_SUCCESS, "Failed to create Event(%08lx)\n", status); + + pRtlInitUnicodeString(&str, buffer3); + InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL); + status = pNtOpenMutant(&h, GENERIC_ALL, &attr); + ok(status == STATUS_OBJECT_TYPE_MISMATCH, + "NtOpenMutant should have failed with STATUS_OBJECT_TYPE_MISMATCH got(%08lx)\n", status); + + pNtClose(Mutant); + + pRtlInitUnicodeString(&str, buffer4); + InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL); + status = pNtCreateMutant(&Mutant, GENERIC_ALL, &attr, FALSE); + ok(status == STATUS_OBJECT_NAME_COLLISION, + "NtCreateMutant should have failed with STATUS_OBJECT_NAME_COLLISION got(%08lx)\n", status); + + status = pNtCreateEvent(&h, GENERIC_ALL, &attr, FALSE, FALSE); + ok(status == STATUS_OBJECT_NAME_COLLISION, + "NtCreateEvent should have failed with STATUS_OBJECT_NAME_COLLISION got(%08lx)\n", status); + + attr.Attributes = 0; + status = pNtCreateMutant(&Mutant, GENERIC_ALL, &attr, FALSE); + todo_wine ok(status == STATUS_OBJECT_PATH_NOT_FOUND, + "NtCreateMutant should have failed with STATUS_OBJECT_PATH_NOT_FOUND got(%08lx)\n", status); + + pNtClose(Event); +} + +void test_namespace_pipe(void) +{ + static const WCHAR buffer1[] = {'\\','?','?','\\','P','I','P','E','\\','t','e','s','t','\\','p','i','p' ,'e',0}; + static const WCHAR buffer2[] = {'\\','?','?','\\','P','I','P','E','\\','T','E','S','T','\\','P','I','P' ,'E',0}; + static const WCHAR buffer3[] = {'\\','?','?','\\','p','i','p','e','\\','t','e','s','t','\\','p','i','p' ,'e',0}; + static const WCHAR buffer4[] = {'\\','?','?','\\','p','i','p','e','\\','t','e','s','t',0}; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING str; + IO_STATUS_BLOCK iosb; + NTSTATUS status; + LARGE_INTEGER timeout; + HANDLE pipe, h; + + timeout.QuadPart = -10000; + + pRtlInitUnicodeString(&str, buffer1); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + status = pNtCreateNamedPipeFile(&pipe, GENERIC_READ|GENERIC_WRITE, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_CREATE, FILE_PIPE_FULL_DUPLEX, FALSE, FALSE, FALSE, 1, 256, 256, &timeout); + ok(status == STATUS_SUCCESS, "Failed to create NamedPipe(%08lx)\n", status); + + status = pNtCreateNamedPipeFile(&pipe, GENERIC_READ|GENERIC_WRITE, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_CREATE, FILE_PIPE_FULL_DUPLEX, FALSE, FALSE, FALSE, 1, 256, 256, &timeout); + ok(status == STATUS_INSTANCE_NOT_AVAILABLE, + "NtCreateNamedPipeFile should have failed with STATUS_INSTANCE_NOT_AVAILABLE got(%08lx)\n", status); + + pRtlInitUnicodeString(&str, buffer2); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + status = pNtCreateNamedPipeFile(&pipe, GENERIC_READ|GENERIC_WRITE, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_CREATE, FILE_PIPE_FULL_DUPLEX, FALSE, FALSE, FALSE, 1, 256, 256, &timeout); + todo_wine ok(status == STATUS_INSTANCE_NOT_AVAILABLE, + "NtCreateNamedPipeFile should have failed with STATUS_INSTANCE_NOT_AVAILABLE got(%08lx)\n", status); + + attr.Attributes = OBJ_CASE_INSENSITIVE; + status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN); + ok(status == STATUS_SUCCESS, "Failed to open NamedPipe(%08lx)\n", status); + pNtClose(h); + + pRtlInitUnicodeString(&str, buffer3); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN); + todo_wine ok(status == STATUS_OBJECT_PATH_NOT_FOUND || status == STATUS_PIPE_NOT_AVAILABLE, + "pNtOpenFile should have failed with STATUS_OBJECT_PATH_NOT_FOUND got(%08lx)\n", status); + + pRtlInitUnicodeString(&str, buffer4); + InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL); + status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, + "pNtOpenFile should have failed with STATUS_OBJECT_NAME_NOT_FOUND got(%08lx)\n", status); + + pNtClose(pipe); +} + +#define DIRECTORY_QUERY (0x0001) +#define SYMBOLIC_LINK_QUERY 0x0001 + +#define DIR_TEST_CREATE_FAILURE(h,e) \ + status = pNtCreateDirectoryObject(h, DIRECTORY_QUERY, &attr);\ + ok(status == e,"NtCreateDirectoryObject should have failed with %s got(%08lx)\n", #e, status); +#define DIR_TEST_OPEN_FAILURE(h,e) \ + status = pNtOpenDirectoryObject(h, DIRECTORY_QUERY, &attr);\ + ok(status == e,"NtOpenDirectoryObject should have failed with %s got(%08lx)\n", #e, status); +#define DIR_TEST_CREATE_OPEN_FAILURE(h,n,e) \ + pRtlCreateUnicodeStringFromAsciiz(&str, n);\ + DIR_TEST_CREATE_FAILURE(h,e) DIR_TEST_OPEN_FAILURE(h,e)\ + pRtlFreeUnicodeString(&str); + +#define DIR_TEST_CREATE_SUCCESS(h) \ + status = pNtCreateDirectoryObject(h, DIRECTORY_QUERY, &attr); \ + ok(status == STATUS_SUCCESS, "Failed to create Directory(%08lx)\n", status); +#define DIR_TEST_OPEN_SUCCESS(h) \ + status = pNtOpenDirectoryObject(h, DIRECTORY_QUERY, &attr); \ + ok(status == STATUS_SUCCESS, "Failed to open Directory(%08lx)\n", status); +#define DIR_TEST_CREATE_OPEN_SUCCESS(h,n) \ + pRtlCreateUnicodeStringFromAsciiz(&str, n);\ + DIR_TEST_CREATE_SUCCESS(h) pNtClose(h); DIR_TEST_OPEN_SUCCESS(h) pNtClose(h); \ + pRtlFreeUnicodeString(&str); + +static void test_name_collisions(void) +{ + NTSTATUS status; + UNICODE_STRING str; + OBJECT_ATTRIBUTES attr; + HANDLE dir, h, h1, h2; + DWORD winerr; + LARGE_INTEGER size; + + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + pRtlCreateUnicodeStringFromAsciiz(&str, "\\"); + h = 0; + todo_wine{ DIR_TEST_CREATE_FAILURE(&h, STATUS_OBJECT_NAME_COLLISION) } + ok(h == 0, "Failed create returned valid handle! (%p)\n", h); + InitializeObjectAttributes(&attr, &str, OBJ_OPENIF, 0, NULL); + + todo_wine{ DIR_TEST_CREATE_FAILURE(&h, STATUS_OBJECT_NAME_EXISTS) } + pNtClose(h); + status = pNtCreateMutant(&h, GENERIC_ALL, &attr, FALSE); + todo_wine ok(status == STATUS_OBJECT_TYPE_MISMATCH, + "NtCreateMutant should have failed with STATUS_OBJECT_TYPE_MISMATCH got(%08lx)\n", status); + pRtlFreeUnicodeString(&str); + + pRtlCreateUnicodeStringFromAsciiz(&str, "\\??\\PIPE\\om.c-mutant"); + status = pNtCreateMutant(&h, GENERIC_ALL, &attr, FALSE); + todo_wine ok(status == STATUS_OBJECT_TYPE_MISMATCH, + "NtCreateMutant should have failed with STATUS_OBJECT_TYPE_MISMATCH got(%08lx)\n", status); + pRtlFreeUnicodeString(&str); + + + pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects"); + DIR_TEST_OPEN_SUCCESS(&dir) + pRtlCreateUnicodeStringFromAsciiz(&str, "om.c-test"); + InitializeObjectAttributes(&attr, &str, OBJ_OPENIF, dir, NULL); + + h = CreateMutexA(NULL, FALSE, "om.c-test"); + ok(h != 0, "CreateMutexA failed got ret=%p (%ld)\n", h, GetLastError()); + status = pNtCreateMutant(&h1, GENERIC_ALL, &attr, FALSE); + ok(status == STATUS_OBJECT_NAME_EXISTS && h1 != NULL, + "NtCreateMutant should have succeeded with STATUS_OBJECT_NAME_EXISTS got(%08lx)\n", status); + h2 = CreateMutexA(NULL, FALSE, "om.c-test"); + winerr = GetLastError(); + ok(h2 != 0 && winerr == ERROR_ALREADY_EXISTS, + "CreateMutexA should have succeeded with ERROR_ALREADY_EXISTS got ret=%p (%ld)\n", h2, winerr); + pNtClose(h); + pNtClose(h1); + pNtClose(h2); + + h = CreateEventA(NULL, FALSE, FALSE, "om.c-test"); + ok(h != 0, "CreateEventA failed got ret=%p (%ld)\n", h, GetLastError()); + status = pNtCreateEvent(&h1, GENERIC_ALL, &attr, FALSE, FALSE); + ok(status == STATUS_OBJECT_NAME_EXISTS && h1 != NULL, + "NtCreateEvent should have succeeded with STATUS_OBJECT_NAME_EXISTS got(%08lx)\n", status); + h2 = CreateEventA(NULL, FALSE, FALSE, "om.c-test"); + winerr = GetLastError(); + ok(h2 != 0 && winerr == ERROR_ALREADY_EXISTS, + "CreateEventA should have succeeded with ERROR_ALREADY_EXISTS got ret=%p (%ld)\n", h2, winerr); + pNtClose(h); + pNtClose(h1); + pNtClose(h2); + + h = CreateSemaphoreA(NULL, 1, 2, "om.c-test"); + ok(h != 0, "CreateSemaphoreA failed got ret=%p (%ld)\n", h, GetLastError()); + status = pNtCreateSemaphore(&h1, GENERIC_ALL, &attr, 1, 2); + ok(status == STATUS_OBJECT_NAME_EXISTS && h1 != NULL, + "NtCreateSemaphore should have succeeded with STATUS_OBJECT_NAME_EXISTS got(%08lx)\n", status); + h2 = CreateSemaphoreA(NULL, 1, 2, "om.c-test"); + winerr = GetLastError(); + ok(h2 != 0 && winerr == ERROR_ALREADY_EXISTS, + "CreateSemaphoreA should have succeeded with ERROR_ALREADY_EXISTS got ret=%p (%ld)\n", h2, winerr); + pNtClose(h); + pNtClose(h1); + pNtClose(h2); + + h = CreateWaitableTimerA(NULL, TRUE, "om.c-test"); + ok(h != 0, "CreateWaitableTimerA failed got ret=%p (%ld)\n", h, GetLastError()); + status = pNtCreateTimer(&h1, GENERIC_ALL, &attr, NotificationTimer); + ok(status == STATUS_OBJECT_NAME_EXISTS && h1 != NULL, + "NtCreateTimer should have succeeded with STATUS_OBJECT_NAME_EXISTS got(%08lx)\n", status); + h2 = CreateWaitableTimerA(NULL, TRUE, "om.c-test"); + winerr = GetLastError(); + ok(h2 != 0 && winerr == ERROR_ALREADY_EXISTS, + "CreateWaitableTimerA should have succeeded with ERROR_ALREADY_EXISTS got ret=%p (%ld)\n", h2, winerr); + pNtClose(h); + pNtClose(h1); + pNtClose(h2); + + h = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 256, "om.c-test"); + ok(h != 0, "CreateFileMappingA failed got ret=%p (%ld)\n", h, GetLastError()); + size.u.LowPart = 256; + size.u.HighPart = 0; + status = pNtCreateSection(&h1, SECTION_MAP_WRITE, &attr, &size, PAGE_READWRITE, SEC_COMMIT, 0); + ok(status == STATUS_OBJECT_NAME_EXISTS && h1 != NULL, + "NtCreateSection should have succeeded with STATUS_OBJECT_NAME_EXISTS got(%08lx)\n", status); + h2 = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 256, "om.c-test"); + winerr = GetLastError(); + ok(h2 != 0 && winerr == ERROR_ALREADY_EXISTS, + "CreateFileMappingA should have succeeded with ERROR_ALREADY_EXISTS got ret=%p (%ld)\n", h2, winerr); + pNtClose(h); + pNtClose(h1); + pNtClose(h2); + + pRtlFreeUnicodeString(&str); + pNtClose(dir); +} + +void test_directory(void) +{ + NTSTATUS status; + UNICODE_STRING str; + OBJECT_ATTRIBUTES attr; + HANDLE dir, dir1, h; + + /* No name and/or no attributes */ + status = pNtCreateDirectoryObject(NULL, DIRECTORY_QUERY, &attr); + todo_wine ok(status == STATUS_ACCESS_VIOLATION, + "NtCreateDirectoryObject should have failed with STATUS_ACCESS_VIOLATION got(%08lx)\n", status); + status = pNtOpenDirectoryObject(NULL, DIRECTORY_QUERY, &attr); + todo_wine ok(status == STATUS_ACCESS_VIOLATION, + "NtOpenDirectoryObject should have failed with STATUS_ACCESS_VIOLATION got(%08lx)\n", status); + + status = pNtCreateDirectoryObject(&h, DIRECTORY_QUERY, NULL); + ok(status == STATUS_SUCCESS, "Failed to create Directory without attributes(%08lx)\n", status); + pNtClose(h); + status = pNtOpenDirectoryObject(&h, DIRECTORY_QUERY, NULL); + todo_wine ok(status == STATUS_INVALID_PARAMETER, + "NtOpenDirectoryObject should have failed with STATUS_INVALID_PARAMETER got(%08lx)\n", status); + + InitializeObjectAttributes(&attr, NULL, 0, 0, NULL); + DIR_TEST_CREATE_SUCCESS(&dir) + todo_wine{ DIR_TEST_OPEN_FAILURE(&h, STATUS_OBJECT_PATH_SYNTAX_BAD) } + + /* Bad name */ + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + + pRtlCreateUnicodeStringFromAsciiz(&str, ""); + DIR_TEST_CREATE_SUCCESS(&h) + pNtClose(h); + todo_wine{ DIR_TEST_OPEN_FAILURE(&h, STATUS_OBJECT_PATH_SYNTAX_BAD) } + pRtlFreeUnicodeString(&str); + pNtClose(dir); + + todo_wine{ DIR_TEST_CREATE_OPEN_FAILURE(&h, "BaseNamedObjects", STATUS_OBJECT_PATH_SYNTAX_BAD) } + todo_wine{ DIR_TEST_CREATE_OPEN_FAILURE(&h, "\\BaseNamedObjects\\", STATUS_OBJECT_NAME_INVALID) } + todo_wine{ DIR_TEST_CREATE_OPEN_FAILURE(&h, "\\\\BaseNamedObjects", STATUS_OBJECT_NAME_INVALID) } + todo_wine{ DIR_TEST_CREATE_OPEN_FAILURE(&h, "\\BaseNamedObjects\\\\om.c-test", STATUS_OBJECT_NAME_INVALID) } + todo_wine{ DIR_TEST_CREATE_OPEN_FAILURE(&h, "\\BaseNamedObjects\\om.c-test\\", STATUS_OBJECT_PATH_NOT_FOUND) } + + pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects\\om.c-test"); + DIR_TEST_CREATE_SUCCESS(&h) + DIR_TEST_OPEN_SUCCESS(&dir1) + pRtlFreeUnicodeString(&str); + pNtClose(h); + pNtClose(dir1); + + + /* Use of root directory */ + + /* Can't use symlinks as a directory */ + pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects\\Local"); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + status = pNtOpenSymbolicLinkObject(&dir, SYMBOLIC_LINK_QUERY, &attr);\ + todo_wine ok(status == STATUS_SUCCESS, "Failed to open SymbolicLink(%08lx)\n", status); + pRtlFreeUnicodeString(&str); + InitializeObjectAttributes(&attr, &str, 0, dir, NULL); + pRtlCreateUnicodeStringFromAsciiz(&str, "one more level"); + todo_wine{ DIR_TEST_CREATE_FAILURE(&h, STATUS_OBJECT_TYPE_MISMATCH) } + pRtlFreeUnicodeString(&str); + pNtClose(h); + pNtClose(dir); + + pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects"); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + DIR_TEST_OPEN_SUCCESS(&dir) + pRtlFreeUnicodeString(&str); + + InitializeObjectAttributes(&attr, NULL, 0, dir, NULL); + todo_wine{ DIR_TEST_OPEN_FAILURE(&h, STATUS_OBJECT_NAME_INVALID) } + + InitializeObjectAttributes(&attr, &str, 0, dir, NULL); + DIR_TEST_CREATE_OPEN_SUCCESS(&h, "") + todo_wine{ DIR_TEST_CREATE_OPEN_FAILURE(&h, "\\", STATUS_OBJECT_PATH_SYNTAX_BAD) } + todo_wine{ DIR_TEST_CREATE_OPEN_FAILURE(&h, "\\om.c-test", STATUS_OBJECT_PATH_SYNTAX_BAD) } + todo_wine{ DIR_TEST_CREATE_OPEN_FAILURE(&h, "\\om.c-test\\", STATUS_OBJECT_PATH_SYNTAX_BAD) } + todo_wine{ DIR_TEST_CREATE_OPEN_FAILURE(&h, "om.c-test\\", STATUS_OBJECT_PATH_NOT_FOUND) } + + pRtlCreateUnicodeStringFromAsciiz(&str, "om.c-test"); + DIR_TEST_CREATE_SUCCESS(&dir1) + DIR_TEST_OPEN_SUCCESS(&h) + pRtlFreeUnicodeString(&str); + + pNtClose(h); + pNtClose(dir1); + pNtClose(dir); + + /* Nested directories */ + pRtlCreateUnicodeStringFromAsciiz(&str, "\\"); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + DIR_TEST_OPEN_SUCCESS(&dir) + InitializeObjectAttributes(&attr, &str, 0, dir, NULL); + todo_wine{ DIR_TEST_OPEN_FAILURE(&h, STATUS_OBJECT_PATH_SYNTAX_BAD) } + pRtlFreeUnicodeString(&str); + pNtClose(dir); + + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects\\om.c-test"); + DIR_TEST_CREATE_SUCCESS(&dir) + pRtlFreeUnicodeString(&str); + pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects\\om.c-test\\one more level"); + DIR_TEST_CREATE_SUCCESS(&h) + pRtlFreeUnicodeString(&str); + pNtClose(h); + InitializeObjectAttributes(&attr, &str, 0, dir, NULL); + pRtlCreateUnicodeStringFromAsciiz(&str, "one more level"); + DIR_TEST_CREATE_SUCCESS(&h) + pRtlFreeUnicodeString(&str); + pNtClose(h); + + pNtClose(dir); + + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects\\Global\\om.c-test"); + DIR_TEST_CREATE_SUCCESS(&dir) + pRtlFreeUnicodeString(&str); + pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects\\Local\\om.c-test\\one more level"); + DIR_TEST_CREATE_SUCCESS(&h) + pRtlFreeUnicodeString(&str); + pNtClose(h); + InitializeObjectAttributes(&attr, &str, 0, dir, NULL); + pRtlCreateUnicodeStringFromAsciiz(&str, "one more level"); + DIR_TEST_CREATE_SUCCESS(&dir) + pRtlFreeUnicodeString(&str); + pNtClose(h); + + pNtClose(dir); + + + /* Create other objects using RootDirectory */ + + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects"); + DIR_TEST_OPEN_SUCCESS(&dir) + pRtlFreeUnicodeString(&str); + InitializeObjectAttributes(&attr, &str, 0, dir, NULL); + + /* Test inavalid paths */ + pRtlCreateUnicodeStringFromAsciiz(&str, "\\om.c-mutant"); + status = pNtCreateMutant(&h, GENERIC_ALL, &attr, FALSE); + todo_wine ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, + "NtCreateMutant should have failed with STATUS_OBJECT_PATH_SYNTAX_BAD got(%08lx)\n", status); + pRtlFreeUnicodeString(&str); + pRtlCreateUnicodeStringFromAsciiz(&str, "\\om.c-mutant\\"); + status = pNtCreateMutant(&h, GENERIC_ALL, &attr, FALSE); + todo_wine ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, + "NtCreateMutant should have failed with STATUS_OBJECT_PATH_SYNTAX_BAD got(%08lx)\n", status); + pRtlFreeUnicodeString(&str); + + pRtlCreateUnicodeStringFromAsciiz(&str, "om.c\\-mutant"); + status = pNtCreateMutant(&h, GENERIC_ALL, &attr, FALSE); + todo_wine ok(status == STATUS_OBJECT_PATH_NOT_FOUND, + "NtCreateMutant should have failed with STATUS_OBJECT_PATH_NOT_FOUND got(%08lx)\n", status); + pRtlFreeUnicodeString(&str); + + pRtlCreateUnicodeStringFromAsciiz(&str, "om.c-mutant"); + status = pNtCreateMutant(&h, GENERIC_ALL, &attr, FALSE); + ok(status == STATUS_SUCCESS, "Failed to create Mutant(%08lx)\n", status); + pRtlFreeUnicodeString(&str); + pNtClose(h); + + pNtClose(dir); +} + +#define SYMLNK_TEST_CREATE_FAILURE(h,e) \ + status = pNtCreateSymbolicLinkObject(h, SYMBOLIC_LINK_QUERY, &attr, &target);\ + ok(status == e,"NtCreateSymbolicLinkObject should have failed with %s got(%08lx)\n", #e, status); +#define SYMLNK_TEST_OPEN_FAILURE(h,e) \ + status = pNtOpenSymbolicLinkObject(h, SYMBOLIC_LINK_QUERY, &attr);\ + ok(status == e,"NtOpenSymbolicLinkObject should have failed with %s got(%08lx)\n", #e, status); +#define SYMLNK_TEST_CREATE_OPEN_FAILURE(h,n,t,e) \ + pRtlCreateUnicodeStringFromAsciiz(&str, n);\ + pRtlCreateUnicodeStringFromAsciiz(&target, t);\ + SYMLNK_TEST_CREATE_FAILURE(h,e)\ + SYMLNK_TEST_OPEN_FAILURE(h,e)\ + pRtlFreeUnicodeString(&target);\ + pRtlFreeUnicodeString(&str); + +#define SYMLNK_TEST_CREATE_SUCCESS(h) \ + status = pNtCreateSymbolicLinkObject(h, SYMBOLIC_LINK_QUERY, &attr, &target); \ + ok(status == STATUS_SUCCESS, "Failed to create SymbolicLink(%08lx)\n", status); +#define SYMLNK_TEST_OPEN_SUCCESS(h) \ + status = pNtOpenSymbolicLinkObject(h, SYMBOLIC_LINK_QUERY, &attr); \ + ok(status == STATUS_SUCCESS, "Failed to open SymbolicLink(%08lx)\n", status); + +void test_symboliclink(void) +{ + NTSTATUS status; + UNICODE_STRING str, target; + OBJECT_ATTRIBUTES attr; + HANDLE dir, link, h; + IO_STATUS_BLOCK iosb; + + /* No name and/or no attributes */ + todo_wine{ SYMLNK_TEST_CREATE_OPEN_FAILURE(NULL, "", "", STATUS_ACCESS_VIOLATION) } + + status = pNtCreateSymbolicLinkObject(&h, SYMBOLIC_LINK_QUERY, NULL, NULL); + todo_wine ok(status == STATUS_ACCESS_VIOLATION, + "NtCreateSymbolicLinkObject should have failed with STATUS_ACCESS_VIOLATION got(%08lx)\n", status); + status = pNtOpenSymbolicLinkObject(&h, SYMBOLIC_LINK_QUERY, NULL); + todo_wine ok(status == STATUS_INVALID_PARAMETER, + "NtOpenSymbolicLinkObject should have failed with STATUS_INVALID_PARAMETER got(%08lx)\n", status); + + InitializeObjectAttributes(&attr, NULL, 0, 0, NULL); + todo_wine{ SYMLNK_TEST_CREATE_FAILURE(&link, STATUS_INVALID_PARAMETER) } + todo_wine{ SYMLNK_TEST_OPEN_FAILURE(&h, STATUS_OBJECT_PATH_SYNTAX_BAD) } + + /* Bad name */ + pRtlCreateUnicodeStringFromAsciiz(&target, "anywhere"); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + + pRtlCreateUnicodeStringFromAsciiz(&str, ""); + SYMLNK_TEST_CREATE_SUCCESS(&link) + todo_wine{ SYMLNK_TEST_OPEN_FAILURE(&h, STATUS_OBJECT_PATH_SYNTAX_BAD) } + pNtClose(link); + pRtlFreeUnicodeString(&str); + + pRtlCreateUnicodeStringFromAsciiz(&str, "\\"); + todo_wine {SYMLNK_TEST_CREATE_FAILURE(&h, STATUS_OBJECT_TYPE_MISMATCH)} + pRtlFreeUnicodeString(&str); + pRtlFreeUnicodeString(&target); + + todo_wine{ SYMLNK_TEST_CREATE_OPEN_FAILURE(&h, "BaseNamedObjects", "->Somewhere", STATUS_OBJECT_PATH_SYNTAX_BAD) } + todo_wine{ SYMLNK_TEST_CREATE_OPEN_FAILURE(&h, "\\BaseNamedObjects\\", "->Somewhere", STATUS_OBJECT_NAME_INVALID) } + todo_wine{ SYMLNK_TEST_CREATE_OPEN_FAILURE(&h, "\\\\BaseNamedObjects", "->Somewhere", STATUS_OBJECT_NAME_INVALID) } + todo_wine{ SYMLNK_TEST_CREATE_OPEN_FAILURE(&h, "\\BaseNamedObjects\\\\om.c-test", "->Somewhere", STATUS_OBJECT_NAME_INVALID) } + todo_wine{ SYMLNK_TEST_CREATE_OPEN_FAILURE(&h, "\\BaseNamedObjects\\om.c-test\\", "->Somewhere", STATUS_OBJECT_NAME_INVALID) } + + + /* Compaund test */ + pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects"); + DIR_TEST_OPEN_SUCCESS(&dir) + pRtlFreeUnicodeString(&str); + + InitializeObjectAttributes(&attr, &str, 0, dir, NULL); + pRtlCreateUnicodeStringFromAsciiz(&str, "Local\\test-link"); + pRtlCreateUnicodeStringFromAsciiz(&target, "\\DosDevices"); + SYMLNK_TEST_CREATE_SUCCESS(&link) + pRtlFreeUnicodeString(&str); + pRtlFreeUnicodeString(&target); + + pRtlCreateUnicodeStringFromAsciiz(&str, "Local\\test-link\\PIPE"); + status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN); + todo_wine ok(status == STATUS_SUCCESS, "Failed to open NamedPipe(%08lx)\n", status); + pRtlFreeUnicodeString(&str); + + pNtClose(h); + pNtClose(link); + pNtClose(dir); +} + +START_TEST(om) +{ + HMODULE hntdll = GetModuleHandleA("ntdll.dll"); + if (hntdll) + { + pRtlCreateUnicodeStringFromAsciiz = (void *)GetProcAddress(hntdll, "RtlCreateUnicodeStringFromAsciiz"); + pRtlFreeUnicodeString = (void *)GetProcAddress(hntdll, "RtlFreeUnicodeString"); + pNtCreateEvent = (void *)GetProcAddress(hntdll, "NtCreateEvent"); + pNtCreateMutant = (void *)GetProcAddress(hntdll, "NtCreateMutant"); + pNtOpenMutant = (void *)GetProcAddress(hntdll, "NtOpenMutant"); + pNtOpenFile = (void *)GetProcAddress(hntdll, "NtOpenFile"); + pNtClose = (void *)GetProcAddress(hntdll, "NtClose"); + pRtlInitUnicodeString = (void *)GetProcAddress(hntdll, "RtlInitUnicodeString"); + pNtCreateNamedPipeFile = (void *)GetProcAddress(hntdll, "NtCreateNamedPipeFile"); + pNtOpenDirectoryObject = (void *)GetProcAddress(hntdll, "NtOpenDirectoryObject"); + pNtCreateDirectoryObject= (void *)GetProcAddress(hntdll, "NtCreateDirectoryObject"); + pNtOpenSymbolicLinkObject = (void *)GetProcAddress(hntdll, "NtOpenSymbolicLinkObject"); + pNtCreateSymbolicLinkObject = (void *)GetProcAddress(hntdll, "NtCreateSymbolicLinkObject"); + pNtCreateSemaphore = (void *)GetProcAddress(hntdll, "NtCreateSemaphore"); + pNtCreateTimer = (void *)GetProcAddress(hntdll, "NtCreateTimer"); + pNtCreateSection = (void *)GetProcAddress(hntdll, "NtCreateSection"); + + test_case_sensitive(); + test_namespace_pipe(); + test_name_collisions(); + test_directory(); + test_symboliclink(); + } +} _____ Modified: trunk/reactos/regtests/winetests/ntdll/testlist.c --- trunk/reactos/regtests/winetests/ntdll/testlist.c 2005-11-22 06:57:36 UTC (rev 19453) +++ trunk/reactos/regtests/winetests/ntdll/testlist.c 2005-11-22 07:18:44 UTC (rev 19454) @@ -12,6 +12,7 @@ extern void func_error(void); extern void func_info(void); extern void func_large_int(void); +extern void func_om(void); extern void func_path(void); extern void func_reg(void); extern void func_rtl(void); @@ -34,6 +35,7 @@ { "error", func_error }, { "info", func_info }, { "large_int", func_large_int }, + { "om", func_om }, { "path", func_path }, { "reg", func_reg }, { "rtl", func_rtl },

18 years, 10 months

[ion] 19453: - Fix typo accidentally added after testing the build (due to alt-f Q)

by ion＠svn.reactos.com

- Fix typo accidentally added after testing the build (due to alt-f Q) Modified: trunk/reactos/include/ndk/rtlfuncs.h _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-11-22 06:22:21 UTC (rev 19452) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-11-22 06:57:36 UTC (rev 19453) @@ -2230,7 +2230,7 @@ static __inline LARGE_INTEGER NTAPI_INLINE -RtlConvertLongToLargeIntegerf( +RtlConvertLongToLargeInteger( LONG SignedInteger ) {

18 years, 10 months

← Newer
1
...
31
32
33
34
35
36
37
...
88
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005