Ros-diffs January 2005

ros-diffs@reactos.org

28 participants
703 discussions

by arty＠svn.reactos.com

Fixed DNS lookup in ping. Fixed output format. Patch by Andrew Munger (WaxDragon) Modified: trunk/reactos/apps/utils/net/ping/ping.c _____ Modified: trunk/reactos/apps/utils/net/ping/ping.c --- trunk/reactos/apps/utils/net/ping/ping.c 2005-01-23 09:51:03 UTC (rev 13223) +++ trunk/reactos/apps/utils/net/ping/ping.c 2005-01-23 11:01:51 UTC (rev 13224) @@ -331,7 +331,7 @@ } if (phe != NULL) { - CopyMemory(&Target.sin_addr, phe->h_addr_list, phe->h_length); + CopyMemory(&Target.sin_addr, phe->h_addr, phe->h_length); } else { Target.sin_addr.s_addr = Addr; } @@ -391,19 +391,9 @@ LARGE_INTEGER LargeTime; LargeTime.QuadPart = Time.QuadPart / TicksPerMs.QuadPart; + _i64toa(LargeTime.QuadPart, Convstr, 10); strcpy(String, Convstr); - strcat(String, ","); - - LargeTime.QuadPart = (Time.QuadPart % TicksPerMs.QuadPart) / TicksPerUs.QuadPart; - _i64toa(LargeTime.QuadPart, Convstr, 10); - Length = strlen(Convstr); - if (Length < 4) { - for (i = 0; i < 4 - Length; i++) - strcat(String, "0"); - } - - strcat(String, Convstr); strcat(String, "ms"); } @@ -417,6 +407,7 @@ CHAR Time[100]; LARGE_INTEGER RelativeTime; LARGE_INTEGER LargeTime; + CHAR Sign[1]; IpHeader = (PIPv4_HEADER)buffer; @@ -449,10 +440,17 @@ RelativeTime.QuadPart = (LargeTime.QuadPart - Icmp->Timestamp.QuadPart); - TimeToMsString(Time, RelativeTime); + if ((RelativeTime.QuadPart / TicksPerMs.QuadPart) < 1) { + strcpy(Sign, "<"); + strcpy(Time, "1ms"); + } else { + strcpy(Sign, "="); + TimeToMsString(Time, RelativeTime); + } - printf("Reply from %s: bytes=%d time=%s TTL=%d\n", inet_ntoa(from->sin_addr), - size - IphLength - sizeof(ICMP_ECHO_PACKET), Time, IpHeader->TTL); + + printf("Reply from %s: bytes=%d time%s%s TTL=%d\n", inet_ntoa(from->sin_addr), + size - IphLength - sizeof(ICMP_ECHO_PACKET), Sign, Time, IpHeader->TTL); if (RelativeTime.QuadPart < MinRTT.QuadPart) { MinRTT.QuadPart = RelativeTime.QuadPart; MinRTTSet = TRUE;

19 years, 11 months

[arty] 13223: Fixed broadcast UDP.

by arty＠svn.reactos.com

Fixed broadcast UDP. lan: Added calculation of broadcast address. fileobjs: Check for broadcast receive. neighbor: Check for broadcast send. interface: Use cached broadcast address. udp: Fix port allocation. Modified: trunk/reactos/drivers/lib/ip/network/interface.c Modified: trunk/reactos/drivers/lib/ip/network/neighbor.c Modified: trunk/reactos/drivers/lib/ip/transport/udp/udp.c Modified: trunk/reactos/drivers/net/tcpip/datalink/lan.c Modified: trunk/reactos/drivers/net/tcpip/tcpip/fileobjs.c _____ Modified: trunk/reactos/drivers/lib/ip/network/interface.c --- trunk/reactos/drivers/lib/ip/network/interface.c 2005-01-23 01:33:35 UTC (rev 13222) +++ trunk/reactos/drivers/lib/ip/network/interface.c 2005-01-23 09:51:03 UTC (rev 13223) @@ -24,9 +24,7 @@ break; case ADE_BROADCAST: - *Address = - Interface->Unicast.Address.IPv4Address | - ~Interface->Netmask.Address.IPv4Address; + *Address = Interface->Broadcast.Address.IPv4Address; break; case ADE_POINTOPOINT: _____ Modified: trunk/reactos/drivers/lib/ip/network/neighbor.c --- trunk/reactos/drivers/lib/ip/network/neighbor.c 2005-01-23 01:33:35 UTC (rev 13222) +++ trunk/reactos/drivers/lib/ip/network/neighbor.c 2005-01-23 09:51:03 UTC (rev 13223) @@ -407,10 +407,19 @@ NCE = NBLocateNeighbor(Address); if (NCE == NULL) { - NCE = NBAddNeighbor(Interface, Address, NULL, - Interface->AddressLength, NUD_INCOMPLETE); - NCE->EventTimer = 1; - NCE->EventCount = 0; + TI_DbgPrint(MID_TRACE,("BCAST: %s\n", A2S(&Interface->Broadcast))); + if( AddrIsEqual(Address, &Interface->Broadcast) ) { + TI_DbgPrint(MID_TRACE,("Packet targeted at broadcast addr\n")); + NCE = NBAddNeighbor(Interface, Address, NULL, + Interface->AddressLength, NUD_CONNECTED); + NCE->EventTimer = 0; + NCE->EventCount = 0; + } else { + NCE = NBAddNeighbor(Interface, Address, NULL, + Interface->AddressLength, NUD_INCOMPLETE); + NCE->EventTimer = 1; + NCE->EventCount = 0; + } } return NCE; _____ Modified: trunk/reactos/drivers/lib/ip/transport/udp/udp.c --- trunk/reactos/drivers/lib/ip/transport/udp/udp.c 2005-01-23 01:33:35 UTC (rev 13222) +++ trunk/reactos/drivers/lib/ip/transport/udp/udp.c 2005-01-23 09:51:03 UTC (rev 13223) @@ -14,7 +14,6 @@ BOOLEAN UDPInitialized = FALSE; PORT_SET UDPPorts; - NTSTATUS AddUDPHeaderIPv4( PIP_ADDRESS RemoteAddress, USHORT RemotePort, @@ -408,7 +407,7 @@ RtlZeroMemory(&UDPStats, sizeof(UDP_STATISTICS)); #endif - PortsStartup( &UDPPorts, UDP_STARTING_PORT, UDP_DYNAMIC_PORTS ); + PortsStartup( &UDPPorts, 1, 0xfffe ); /* Register this protocol with IP layer */ IPRegisterProtocol(IPPROTO_UDP, UDPReceive); @@ -440,9 +439,11 @@ UINT UDPAllocatePort( UINT HintPort ) { if( HintPort ) { - if( AllocatePort( &UDPPorts, HintPort ) ) return HintPort; - else return (UINT)-1; - } else return AllocateAnyPort( &UDPPorts ); + if( AllocatePort( &UDPPorts, HintPort ) ) return HintPort; + else return (UINT)-1; + } else return AllocatePortFromRange + ( &UDPPorts, UDP_STARTING_PORT, + UDP_STARTING_PORT + UDP_DYNAMIC_PORTS ); } VOID UDPFreePort( UINT Port ) { _____ Modified: trunk/reactos/drivers/net/tcpip/datalink/lan.c --- trunk/reactos/drivers/net/tcpip/datalink/lan.c 2005-01-23 01:33:35 UTC (rev 13222) +++ trunk/reactos/drivers/net/tcpip/datalink/lan.c 2005-01-23 09:51:03 UTC (rev 13223) @@ -907,6 +907,14 @@ if(NT_SUCCESS(Status)) Status = ReadIPAddressFromRegistry( RegHandle, L"SubnetMask", &IF->Netmask ); + + IF->Broadcast.Type = IP_ADDRESS_V4; + IF->Broadcast.Address.IPv4Address = + IF->Unicast.Address.IPv4Address | + ~IF->Netmask.Address.IPv4Address; + + TI_DbgPrint(MID_TRACE,("BCAST(IF) %s\n", A2S(&IF->Broadcast))); + if(NT_SUCCESS(Status)) { Status = ReadStringFromRegistry( RegHandle, L"DeviceDesc", &IF->Name ); _____ Modified: trunk/reactos/drivers/net/tcpip/tcpip/fileobjs.c --- trunk/reactos/drivers/net/tcpip/tcpip/fileobjs.c 2005-01-23 01:33:35 UTC (rev 13222) +++ trunk/reactos/drivers/net/tcpip/tcpip/fileobjs.c 2005-01-23 09:51:03 UTC (rev 13223) @@ -43,6 +43,20 @@ return AddrSearchNext(SearchContext); } +BOOLEAN AddrIsBroadcast( + PIP_ADDRESS PossibleMatch, + PIP_ADDRESS TargetAddress ) { + IF_LIST_ITER(IF); + + ForEachInterface(IF) { + if( AddrIsEqual( &IF->Unicast, PossibleMatch ) && + AddrIsEqual( &IF->Broadcast, TargetAddress ) ) + return TRUE; + } EndFor(IF); + + return FALSE; +} + /* * FUNCTION: Searches through address file entries to find next match * ARGUMENTS: @@ -80,10 +94,11 @@ A2S(SearchContext->Address))); /* See if this address matches the search criteria */ - if (((Current->Port == SearchContext->Port) && + if ((Current->Port == SearchContext->Port) && (Current->Protocol == SearchContext->Protocol) && - (AddrIsEqual(IPAddress, SearchContext->Address))) || - (AddrIsUnspecified(IPAddress))) { + (AddrIsEqual(IPAddress, SearchContext->Address) || + AddrIsBroadcast(IPAddress, SearchContext->Address) || + AddrIsUnspecified(IPAddress))) { /* We've found a match */ Found = TRUE; break; @@ -277,7 +292,9 @@ TI_DbgPrint(MID_TRACE,("Allocating udp port\n")); AddrFile->Port = UDPAllocatePort(Address->Address[0].Address[0].sin_port); - TI_DbgPrint(MID_TRACE,("Setting port %d\n", AddrFile->Port)); + TI_DbgPrint(MID_TRACE,("Setting port %d (wanted %d)\n", + AddrFile->Port, + Address->Address[0].Address[0].sin_port)); AddrFile->Send = UDPSendDatagram; break;

19 years, 11 months

[chorns] 13222: * Build epsapi, dxguid, devenum, imm32, dinput8, dsound, expat, glu32, vfatlib

by chorns＠svn.reactos.com

* Build epsapi, dxguid, devenum, imm32, dinput8, dsound, expat, glu32, vfatlib * Build dbghelp, gdiplus, dxdiagn, imagehlp, strmiids, dinput, fmifs, psapi Added: branches/xmlbuildsystem/reactos/lib/dbghelp/dbghelp.xml Added: branches/xmlbuildsystem/reactos/lib/devenum/devenum.xml Added: branches/xmlbuildsystem/reactos/lib/dinput/dinput.xml Added: branches/xmlbuildsystem/reactos/lib/dinput8/dinput8.xml Modified: branches/xmlbuildsystem/reactos/lib/directory.xml Added: branches/xmlbuildsystem/reactos/lib/dsound/dsound.xml Added: branches/xmlbuildsystem/reactos/lib/dxdiagn/dxdiagn.xml Added: branches/xmlbuildsystem/reactos/lib/dxguid/dxguid.xml Added: branches/xmlbuildsystem/reactos/lib/epsapi/epsapi.xml Added: branches/xmlbuildsystem/reactos/lib/expat/expat.xml Added: branches/xmlbuildsystem/reactos/lib/fmifs/fmifs.xml Added: branches/xmlbuildsystem/reactos/lib/fslib/directory.xml Added: branches/xmlbuildsystem/reactos/lib/fslib/vfatlib/vfatlib.xml Added: branches/xmlbuildsystem/reactos/lib/gdiplus/gdiplus.xml Added: branches/xmlbuildsystem/reactos/lib/glu32/glu32.xml Added: branches/xmlbuildsystem/reactos/lib/imagehlp/imagehlp.xml Added: branches/xmlbuildsystem/reactos/lib/imm32/imm32.xml Added: branches/xmlbuildsystem/reactos/lib/psapi/psapi.xml Added: branches/xmlbuildsystem/reactos/lib/strmiids/strmiids.xml Modified: branches/xmlbuildsystem/reactos/lib/winmm/winmm.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____ Added: branches/xmlbuildsystem/reactos/lib/dbghelp/dbghelp.xml --- branches/xmlbuildsystem/reactos/lib/dbghelp/dbghelp.xml 2005-01-22 22:00:17 UTC (rev 13221) +++ branches/xmlbuildsystem/reactos/lib/dbghelp/dbghelp.xml 2005-01-23 01:33:35 UTC (rev 13222) @@ -0,0 +1,37 @@ +<module name="dbghelp" type="win32dll"> + <dependency>winebuild</dependency> + <importlibrary definition="dbghelp.spec.def" /> + <include base="dbghelp">.</include> + <include base="ReactOS">include/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>ntdll</library> + <library>kernel32</library> + <library>psapi</library> + <library>pseh</library> + <file>coff.c</file> + <file>dbghelp.c</file> + <file>elf_module.c</file> + <file>image.c</file> + <file>memory.c</file> + <file>minidump.c</file> + <file>module.c</file> + <file>msc.c</file> + <file>path.c</file> + <file>pe_module.c</file> + <file>regex.c</file> + <file>source.c</file> + <file>stabs.c</file> + <file>stack.c</file> + <file>storage.c</file> + <file>symbol.c</file> + <file>type.c</file> + <file>dbghelp.rc</file> + <file>dbghelp.spec</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/devenum/devenum.xml --- branches/xmlbuildsystem/reactos/lib/devenum/devenum.xml 2005-01-22 22:00:17 UTC (rev 13221) +++ branches/xmlbuildsystem/reactos/lib/devenum/devenum.xml 2005-01-23 01:33:35 UTC (rev 13222) @@ -0,0 +1,28 @@ +<module name="devenum" type="win32dll"> + <dependency>winebuild</dependency> + <importlibrary definition="devenum.spec.def" /> + <include base="devenum">.</include> + <include base="ReactOS">include/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>ole32</library> + <library>oleaut32</library> + <library>winmm</library> + <library>dxguid</library> + <library>strmiids</library> + <file>createdevenum.c</file> + <file>devenum_main.c</file> + <file>factory.c</file> + <file>mediacatenum.c</file> + <file>parsedisplayname.c</file> + <file>devenum.spec</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/dinput/dinput.xml --- branches/xmlbuildsystem/reactos/lib/dinput/dinput.xml 2005-01-22 22:00:17 UTC (rev 13221) +++ branches/xmlbuildsystem/reactos/lib/dinput/dinput.xml 2005-01-23 01:33:35 UTC (rev 13222) @@ -0,0 +1,31 @@ +<module name="dinput" type="win32dll"> + <dependency>winebuild</dependency> + <importlibrary definition="dinput.spec.def" /> + <include base="dinput">.</include> + <include base="ReactOS">include/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>advapi32</library> + <library>ole32</library> + <library>winmm</library> + <library>dxguid</library> + <file>data_formats.c</file> + <file>device.c</file> + <file>dinput_main.c</file> + <file>joystick_linux.c</file> + <file>joystick_linuxinput.c</file> + <file>keyboard.c</file> + <file>mouse.c</file> + <file>regsvr.c</file> + <file>dinput.spec</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/dinput8/dinput8.xml --- branches/xmlbuildsystem/reactos/lib/dinput8/dinput8.xml 2005-01-22 22:00:17 UTC (rev 13221) +++ branches/xmlbuildsystem/reactos/lib/dinput8/dinput8.xml 2005-01-23 01:33:35 UTC (rev 13222) @@ -0,0 +1,25 @@ +<module name="dinput8" type="win32dll"> + <dependency>winebuild</dependency> + <importlibrary definition="dinput8.spec.def" /> + <include base="dinput8">.</include> + <include base="ReactOS">include/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>advapi32</library> + <library>ole32</library> + <library>winmm</library> + <library>dxguid</library> + <library>dinput</library> + <file>dinput8_main.c</file> + <file>dinput8.spec</file> +</module> _____ Modified: branches/xmlbuildsystem/reactos/lib/directory.xml --- branches/xmlbuildsystem/reactos/lib/directory.xml 2005-01-22 22:00:17 UTC (rev 13221) +++ branches/xmlbuildsystem/reactos/lib/directory.xml 2005-01-23 01:33:35 UTC (rev 13222) @@ -31,15 +31,60 @@ <directory name="crtdll"> <xi:include href="crtdll/crtdll.xml" /> </directory> +<directory name="dbghelp"> + <xi:include href="dbghelp/dbghelp.xml" /> +</directory> +<directory name="devenum"> + <xi:include href="devenum/devenum.xml" /> +</directory> +<directory name="dinput"> + <xi:include href="dinput/dinput.xml" /> +</directory> +<directory name="dinput8"> + <xi:include href="dinput8/dinput8.xml" /> +</directory> <directory name="dnsapi"> <xi:include href="dnsapi/dnsapi.xml" /> </directory> +<directory name="dsound"> + <xi:include href="dsound/dsound.xml" /> +</directory> +<directory name="dxdiagn"> + <xi:include href="dxdiagn/dxdiagn.xml" /> +</directory> +<directory name="dxguid"> + <xi:include href="dxguid/dxguid.xml" /> +</directory> +<directory name="epsapi"> + <xi:include href="epsapi/epsapi.xml" /> +</directory> +<directory name="expat"> + <xi:include href="expat/expat.xml" /> +</directory> +<directory name="fmifs"> + <xi:include href="fmifs/fmifs.xml" /> +</directory> <directory name="freetype"> <xi:include href="freetype/freetype.xml" /> </directory> +<directory name="fslib"> + <xi:include href="fslib/directory.xml" /> +</directory> <directory name="gdi32"> <xi:include href="gdi32/gdi32.xml" /> </directory> +<directory name="gdiplus"> + <xi:include href="gdiplus/gdiplus.xml" /> +</directory> +<directory name="glu32"> + <xi:include href="glu32/glu32.xml" /> +</directory> +<directory name="imagehlp"> + <xi:include href="imagehlp/imagehlp.xml" /> +</directory> +<directory name="imm32"> + <xi:include href="imm32/imm32.xml" /> +</directory> <directory name="iphlpapi"> <xi:include href="iphlpapi/iphlpapi.xml" /> </directory> @@ -65,6 +110,9 @@ <directory name="oleaut32"> <xi:include href="oleaut32/oleaut32.xml" /> </directory> +<directory name="psapi"> + <xi:include href="psapi/psapi.xml" /> +</directory> <directory name="pseh"> <xi:include href="pseh/pseh.xml" /> </directory> @@ -86,6 +134,9 @@ <directory name="string"> <xi:include href="string/string.xml" /> </directory> +<directory name="strmiids"> + <xi:include href="strmiids/strmiids.xml" /> +</directory> <directory name="unicode"> <xi:include href="unicode/unicode.xml" /> </directory> _____ Added: branches/xmlbuildsystem/reactos/lib/dsound/dsound.xml --- branches/xmlbuildsystem/reactos/lib/dsound/dsound.xml 2005-01-22 22:00:17 UTC (rev 13221) +++ branches/xmlbuildsystem/reactos/lib/dsound/dsound.xml 2005-01-23 01:33:35 UTC (rev 13222) @@ -0,0 +1,8 @@ +<module name="dsound" type="win32dll"> + <importlibrary definition="dsound.def" /> + <include base="dsound">.</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <library>kernel32</library> + <file>dsound.c</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/dxdiagn/dxdiagn.xml --- branches/xmlbuildsystem/reactos/lib/dxdiagn/dxdiagn.xml 2005-01-22 22:00:17 UTC (rev 13221) +++ branches/xmlbuildsystem/reactos/lib/dxdiagn/dxdiagn.xml 2005-01-23 01:33:35 UTC (rev 13222) @@ -0,0 +1,27 @@ +<module name="dxdiagn" type="win32dll"> + <dependency>winebuild</dependency> + <importlibrary definition="dxdiagn.spec.def" /> + <include base="dxdiagn">.</include> + <include base="ReactOS">include/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>advapi32</library> + <library>ole32</library> + <library>dxguid</library> + <library>strmiids</library> + <file>container.c</file> + <file>dxdiag_main.c</file> + <file>provider.c</file> + <file>regsvr.c</file> + <file>dxdiagn.spec</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/dxguid/dxguid.xml --- branches/xmlbuildsystem/reactos/lib/dxguid/dxguid.xml 2005-01-22 22:00:17 UTC (rev 13221) +++ branches/xmlbuildsystem/reactos/lib/dxguid/dxguid.xml 2005-01-23 01:33:35 UTC (rev 13222) @@ -0,0 +1,5 @@ +<module name="dxguid" type="staticlibrary"> + <define name="_DISABLE_TIDENTS" /> + <define name="__REACTOS__" /> + <file>dxguid-mingw.c</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/epsapi/epsapi.xml --- branches/xmlbuildsystem/reactos/lib/epsapi/epsapi.xml 2005-01-22 22:00:17 UTC (rev 13221) +++ branches/xmlbuildsystem/reactos/lib/epsapi/epsapi.xml 2005-01-23 01:33:35 UTC (rev 13222) @@ -0,0 +1,8 @@ +<module name="epsapi" type="objectlibrary"> + <define name="_DISABLE_TIDENTS" /> + <directory name="enum"> + <file>drivers.c</file> + <file>modules.c</file> + <file>processes.c</file> + </directory> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/expat/expat.xml --- branches/xmlbuildsystem/reactos/lib/expat/expat.xml 2005-01-22 22:00:17 UTC (rev 13221) +++ branches/xmlbuildsystem/reactos/lib/expat/expat.xml 2005-01-23 01:33:35 UTC (rev 13222) @@ -0,0 +1,12 @@ +<module name="expat" type="win32dll"> + <importlibrary definition="lib/libexpat.def" /> + <include base="expat">.</include> + <define name="HAVE_EXPAT_CONFIG_H" /> + <define name="__USE_W32API" /> + <library>kernel32</library> + <directory name="lib"> + <file>xmlparse.c</file> + <file>xmlrole.c</file> + <file>xmltok.c</file> + </directory> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/fmifs/fmifs.xml --- branches/xmlbuildsystem/reactos/lib/fmifs/fmifs.xml 2005-01-22 22:00:17 UTC (rev 13221) +++ branches/xmlbuildsystem/reactos/lib/fmifs/fmifs.xml 2005-01-23 01:33:35 UTC (rev 13222) @@ -0,0 +1,18 @@ +<module name="fmifs" type="win32dll" entrypoint="_InitializeFmIfs@12"> + <importlibrary definition="fmifs.def" /> + <include base="fmifs">.</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <library>vfatlib</library> + <library>ntdll</library> + <library>kernel32</library> + <file>chkdsk.c</file> + <file>compress.c</file> + <file>diskcopy.c</file> + <file>extend.c</file> + <file>format.c</file> + <file>init.c</file> + <file>label.c</file> + <file>media.c</file> + <file>fmifs.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/fslib/directory.xml --- branches/xmlbuildsystem/reactos/lib/fslib/directory.xml 2005-01-22 22:00:17 UTC (rev 13221) +++ branches/xmlbuildsystem/reactos/lib/fslib/directory.xml 2005-01-23 01:33:35 UTC (rev 13222) @@ -0,0 +1,3 @@ +<directory name="vfatlib"> + <xi:include href="vfatlib/vfatlib.xml" /> +</directory> _____ Added: branches/xmlbuildsystem/reactos/lib/fslib/vfatlib/vfatlib.xml --- branches/xmlbuildsystem/reactos/lib/fslib/vfatlib/vfatlib.xml 2005-01-22 22:00:17 UTC (rev 13221) +++ branches/xmlbuildsystem/reactos/lib/fslib/vfatlib/vfatlib.xml 2005-01-23 01:33:35 UTC (rev 13222) @@ -0,0 +1,8 @@ +<module name="vfatlib" type="staticlibrary"> + <include base="vfatlib">.</include> + <define name="_DISABLE_TIDENTS" /> + <file>fat12.c</file> + <file>fat16.c</file> + <file>fat32.c</file> + <file>vfatlib.c</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/gdiplus/gdiplus.xml --- branches/xmlbuildsystem/reactos/lib/gdiplus/gdiplus.xml 2005-01-22 22:00:17 UTC (rev 13221) +++ branches/xmlbuildsystem/reactos/lib/gdiplus/gdiplus.xml 2005-01-23 01:33:35 UTC (rev 13222) @@ -0,0 +1,45 @@ +<module name="gdiplus" type="win32dll"> + <importlibrary definition="gdiplus.def" /> + <include base="gdiplus">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>ntdll</library> + <library>kernel32</library> + <library>gdi32</library> + <library>msvcrt</library> + <directory name="gdiplus"> + <file>arrow.c</file> + <file>bitmap.c</file> + <file>brush.c</file> + <file>clip.c</file> + <file>codec.c</file> + <file>container.c</file> + <file>dllmain.c</file> + <file>draw.c</file> + <file>effect.c</file> + <file>fill.c</file> + <file>font.c</file> + <file>graphics.c</file> + <file>image.c</file> + <file>linecap.c</file> + <file>linegradient.c</file> + <file>matrix.c</file> + <file>memory.c</file> + <file>metafile.c</file> + <file>palette.c</file> + <file>path.c</file> + <file>pathgradient.c</file> + <file>pathiterator.c</file> + <file>pen.c</file> + <file>region.c</file> + <file>string.c</file> + <file>texture.c</file> + <file>transform.c</file> + </directory> + <file>gdiplus.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/glu32/glu32.xml --- branches/xmlbuildsystem/reactos/lib/glu32/glu32.xml 2005-01-22 22:00:17 UTC (rev 13221) +++ branches/xmlbuildsystem/reactos/lib/glu32/glu32.xml 2005-01-23 01:33:35 UTC (rev 13222) @@ -0,0 +1,119 @@ +<module name="glu32" type="win32dll"> + <importlibrary definition="glu32.def" /> + <include base="glu32">include</include> + <include base="glu32">libnurbs/internals</include> + <include base="glu32">libnurbs/interface</include> + <include base="glu32">libnurbs/nurbtess</include> + <include base="glu32">libtess</include> + <include base="glu32">libutil</include> + <define name="__USE_W32API" /> + <define name="RESOLVE_3D_TEXTURE_SUPPORT" /> + <define name="BUILD_GL32" /> + <define name="LIBRARYBUILD" /> + <linkerflag>-lopengl32</linkerflag> + <library>ntdll</library> + <library>kernel32</library> + <library>gdi32</library> + <library>msvcrt</library> + <directory name="libnurbs"> + <directory name="interface"> + <file>bezierEval.cc</file> + <file>bezierPatch.cc</file> + <file>bezierPatchMesh.cc</file> + <file>glcurveval.cc</file> + <file>glinterface.cc</file> + <file>glrenderer.cc</file> + <file>glsurfeval.cc</file> + <file>incurveeval.cc</file> + <file>insurfeval.cc</file> + </directory> + <directory name="internals"> + <file>arc.cc</file> + <file>arcsorter.cc</file> + <file>arctess.cc</file> + <file>backend.cc</file> + <file>basiccrveval.cc</file> + <file>basicsurfeval.cc</file> + <file>bin.cc</file> + <file>bufpool.cc</file> + <file>cachingeval.cc</file> + <file>ccw.cc</file> + <file>coveandtiler.cc</file> + <file>curve.cc</file> + <file>curvelist.cc</file> + <file>curvesub.cc</file> + <file>dataTransform.cc</file> + <file>displaylist.cc</file> + <file>flist.cc</file> + <file>flistsorter.cc</file> + <file>hull.cc</file> + <file>intersect.cc</file> + <file>knotvector.cc</file> + <file>mapdesc.cc</file> + <file>mapdescv.cc</file> + <file>maplist.cc</file> + <file>mesher.cc</file> + <file>monoTriangulationBackend.cc</file> + <file>monotonizer.cc</file> + <file>mycode.cc</file> + <file>nurbsinterfac.cc</file> + <file>nurbstess.cc</file> + <file>patch.cc</file> + <file>patchlist.cc</file> + <file>quilt.cc</file> + <file>reader.cc</file> + <file>renderhints.cc</file> + <file>slicer.cc</file> + <file>sorter.cc</file> + <file>splitarcs.cc</file> + <file>subdivider.cc</file> + <file>tobezier.cc</file> + <file>trimline.cc</file> + <file>trimregion.cc</file> + <file>trimvertpool.cc</file> + <file>uarray.cc</file> + <file>varray.cc</file> + </directory> + <directory name="nurbtess"> + <file>directedLine.cc</file> + <file>gridWrap.cc</file> + <file>monoChain.cc</file> + <file>monoPolyPart.cc</file> + <file>monoTriangulation.cc</file> + <file>partitionX.cc</file> + <file>partitionY.cc</file> + <file>polyDBG.cc</file> + <file>polyUtil.cc</file> + <file>primitiveStream.cc</file> + <file>quicksort.cc</file> + <file>rectBlock.cc</file> + <file>sampleComp.cc</file> + <file>sampleCompBot.cc</file> + <file>sampleCompRight.cc</file> + <file>sampleCompTop.cc</file> + <file>sampleMonoPoly.cc</file> + <file>sampledLine.cc</file> + <file>searchTree.cc</file> + </directory> + </directory> + <directory name="libtess"> + <file>dict.c</file> + <file>geom.c</file> + <file>memalloc.c</file> + <file>mesh.c</file> + <file>normal.c</file> + <file>priorityq.c</file> + <file>render.c</file> + <file>sweep.c</file> + <file>tess.c</file> + <file>tessmono.c</file> + </directory> + <directory name="libutil"> + <file>error.c</file> + <file>glue.c</file> + <file>mipmap.c</file> + <file>project.c</file> + <file>quad.c</file> + <file>registry.c</file> + </directory> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/imagehlp/imagehlp.xml --- branches/xmlbuildsystem/reactos/lib/imagehlp/imagehlp.xml 2005-01-22 22:00:17 UTC (rev 13221) +++ branches/xmlbuildsystem/reactos/lib/imagehlp/imagehlp.xml 2005-01-23 01:33:35 UTC (rev 13222) @@ -0,0 +1,26 @@ +<module name="imagehlp" type="win32dll"> + <dependency>winebuild</dependency> + <importlibrary definition="imagehlp.def" /> + <include base="imagehlp">.</include> + <include base="ReactOS">include/wine</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <define name="COBJMACROS" /> + <define name="__need_offsetof" /> + <define name="DCX_USESTYLE">0x10000L</define> + <library>wine</library> + <library>ntdll</library> + <library>kernel32</library> + <file>access.c</file> + <file>debug.c</file> + <file>imagehlp_main.c</file> + <file>integrity.c</file> + <file>internal.c</file> + <file>modify.c</file> + <file>symbol.c</file> + <file>imagehlp.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/imm32/imm32.xml --- branches/xmlbuildsystem/reactos/lib/imm32/imm32.xml 2005-01-22 22:00:17 UTC (rev 13221) +++ branches/xmlbuildsystem/reactos/lib/imm32/imm32.xml 2005-01-23 01:33:35 UTC (rev 13222) @@ -0,0 +1,12 @@ +<module name="imm32" type="win32dll"> + <importlibrary definition="imm32.def" /> + <include base="imm32">.</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <library>wine</library> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <file>imm.c</file> + <file>imm32.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/psapi/psapi.xml --- branches/xmlbuildsystem/reactos/lib/psapi/psapi.xml 2005-01-22 22:00:17 UTC (rev 13221) +++ branches/xmlbuildsystem/reactos/lib/psapi/psapi.xml 2005-01-23 01:33:35 UTC (rev 13222) @@ -0,0 +1,16 @@ +<module name="psapi" type="win32dll"> + <importlibrary definition="psapi.def" /> + <include base="psapi">.</include> + <include base="psapi">include</include> + <define name="_DISABLE_TIDENTS" /> + <library>ntdll</library> + <library>kernel32</library> + <library>epsapi</library> + <directory name="misc"> + <file>dllmain.c</file> + <file>malloc.c</file> + <file>stubs.c</file> + <file>win32.c</file> + </directory> + <file>psapi.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/strmiids/strmiids.xml --- branches/xmlbuildsystem/reactos/lib/strmiids/strmiids.xml 2005-01-22 22:00:17 UTC (rev 13221) +++ branches/xmlbuildsystem/reactos/lib/strmiids/strmiids.xml 2005-01-23 01:33:35 UTC (rev 13222) @@ -0,0 +1,5 @@ +<module name="strmiids" type="staticlibrary"> + <define name="_DISABLE_TIDENTS" /> + <define name="__REACTOS__" /> + <file>strmiids.c</file> +</module> _____ Modified: branches/xmlbuildsystem/reactos/lib/winmm/winmm.xml --- branches/xmlbuildsystem/reactos/lib/winmm/winmm.xml 2005-01-22 22:00:17 UTC (rev 13221) +++ branches/xmlbuildsystem/reactos/lib/winmm/winmm.xml 2005-01-23 01:33:35 UTC (rev 13222) @@ -1,5 +1,4 @@ <module name="winmm" type="win32dll"> - <dependency>bin2res</dependency> <dependency>winebuild</dependency> <importlibrary definition="winmm.spec.def" /> <include base="winmm">.</include> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-22 22:00:17 UTC (rev 13221) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-23 01:33:35 UTC (rev 13222) @@ -724,7 +724,7 @@ cflagsMacro ); return; } - else if ( extension == ".cxx" || extension == ".CXX" ) + else if ( extension == ".cc" || extension == ".CC" || extension == ".cxx" || extension == ".CXX" ) { GenerateGccCommand ( module, sourceFilename, @@ -1651,10 +1651,16 @@ objectFilenames.c_str (), linkingDependencies.c_str () ); + string linker; + if ( module.HasFileWithExtensions ( ".cc", ".CC" ) || module.HasFileWithExtensions ( ".cxx", ".CXX" ) ) + linker = "${gpp}"; + else + linker = "${gcc}"; + string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,0x10000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -mdll", module.entrypoint.c_str () ); GenerateLinkerCommand ( module, - "${gcc}", + linker, linkerParameters, objectFilenames ); }

19 years, 11 months

[chorns] 13221: * Build crtdll

by chorns＠svn.reactos.com

* Build crtdll * Add module attribute "mangledsymbols" to control --kill-at option for dlltool in order to allow preservation of mangled symbols Added: branches/xmlbuildsystem/reactos/lib/crtdll/crtdll.xml Deleted: branches/xmlbuildsystem/reactos/lib/crtdll/quad/ Modified: branches/xmlbuildsystem/reactos/lib/directory.xml Added: branches/xmlbuildsystem/reactos/lib/msvcrt/crt.xml Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/ctype/isalnum.c Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/ctype/isascii.c Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/ctype/iscntrl.c Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/ctype/isgraph.c Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/ctype/isprint.c Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/ctype/ispunct.c Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/ctype/isupper.c Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/math/pow.c Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/msvcrt.def Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/msvcrt.xml Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/stdio/sprintf.c Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/stdio/sscanf.c Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/stdio/vsprintf.c Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h _____ Added: branches/xmlbuildsystem/reactos/lib/crtdll/crtdll.xml --- branches/xmlbuildsystem/reactos/lib/crtdll/crtdll.xml 2005-01-22 20:59:49 UTC (rev 13220) +++ branches/xmlbuildsystem/reactos/lib/crtdll/crtdll.xml 2005-01-22 22:00:17 UTC (rev 13221) @@ -0,0 +1,151 @@ +<module name="crtdll" type="win32dll" mangledsymbols="true"> + <linkerflag>-nostartfiles</linkerflag> + <linkerflag>-lgcc</linkerflag> + <importlibrary definition="crtdll.def" /> + <include base="crtdll">.</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="__REACTOS__" /> + <define name="USE_MSVCRT_PREFIX" /> + <define name="_MSVCRT_LIB_" /> + <library>string</library> + <library>kernel32</library> + <library>ntdll</library> + <library>crt</library> + <directory name="ctype"> + <file>isctype.c</file> + </directory> + <directory name="except"> + <file>abnorter.c</file> + <file>exhand2.c</file> + <file>matherr.c</file> + <file>unwind.c</file> + </directory> + <directory name="io"> + <file>create.c</file> + <file>dup.c</file> + <file>eof.c</file> + <file>find.c</file> + <file>fmode.c</file> + <file>lseek.c</file> + <file>open.c</file> + <file>pipe.c</file> + <file>read.c</file> + <file>unlink.c</file> + <file>write.c</file> + </directory> + <directory name="math"> + <file>acosh.c</file> + <file>asinh.c</file> + <file>atanh.c</file> + <file>ceil.c</file> + <file>floor.c</file> + <file>huge_val.c</file> + </directory> + <directory name="malloc"> + <file>expand.c</file> + <file>heap.c</file> + </directory> + <directory name="misc"> + <file>amsg.c</file> + <file>debug.c</file> + <file>dllmain.c</file> + <file>GetArgs.c</file> + <file>purecall.c</file> + <file>setnew.c</file> + </directory> + <directory name="process"> + <file>_cwait.c</file> + <file>_system.c</file> + <file>spawnl.c</file> + <file>spawnlp.c</file> + <file>spawnlpe.c</file> + <file>spawnvp.c</file> + <file>spawnv.c</file> + <file>spawnve.c</file> + <file>spawnle.c</file> + <file>execl.c</file> + <file>execlp.c</file> + <file>execlpe.c</file> + <file>execvpe.c</file> + <file>execvp.c</file> + <file>execv.c</file> + <file>execle.c</file> + <file>execve.c</file> + <file>thread.c</file> + </directory> + <directory name="signal"> + <file>xcptfil.c</file> + <file>xcptinfo.c</file> + </directory> + <directory name="stdio"> + <file>getenv.c</file> + <file>ferror.c</file> + <file>fflush.c</file> + <file>fgetchar.c</file> + <file>fgets.c</file> + <file>filbuf.c</file> + <file>fileno.c</file> + <file>fopen.c</file> + <file>fputchar.c</file> + <file>fputs.c</file> + <file>fread.c</file> + <file>freopen.c</file> + <file>fscanf.c</file> + <file>frlist.c</file> + <file>fsopen.c</file> + <file>ftell.c</file> + <file>fwrite.c</file> + <file>getc.c</file> + <file>getchar.c</file> + <file>gets.c</file> + <file>getw.c</file> + <file>popen.c</file> + <file>printf.c</file> + <file>putc.c</file> + <file>putchar.c</file> + <file>puts.c</file> + <file>remove.c</file> + <file>setbuffe.c</file> + <file>setlineb.c</file> + <file>stdiohk.c</file> + </directory> + <directory name="stdlib"> + <file>errno.c</file> + <file>fullpath.c</file> + <file>itow.c</file> + <file>malloc.c</file> + <file>mbstowcs.c</file> + <file>putenv.c</file> + <file>rand.c</file> + <file>wcstomb.c</file> + </directory> + <directory name="string"> + <file>lasttok.c</file> + <file>strerror.c</file> + </directory> + <directory name="sys_stat"> + <file>fstat.c</file> + <file>ftime.c</file> + <file>systime.c</file> + <file>stat.c</file> + </directory> + <directory name="tchar"> + <file>strdec.c</file> + <file>strinc.c</file> + <file>strninc.c</file> + <file>strncnt.c</file> + <file>strnextc.c</file> + <file>strspnp.c</file> + </directory> + <directory name="time"> + <file>tz_vars.c</file> + </directory> + <directory name="wchar"> + <file>wlasttok.c</file> + <file>wcscoll.c</file> + </directory> + <file>crtdll.rc</file> +</module> _____ Modified: branches/xmlbuildsystem/reactos/lib/directory.xml --- branches/xmlbuildsystem/reactos/lib/directory.xml 2005-01-22 20:59:49 UTC (rev 13220) +++ branches/xmlbuildsystem/reactos/lib/directory.xml 2005-01-22 22:00:17 UTC (rev 13221) @@ -28,6 +28,9 @@ <directory name="cpl"> <xi:include href="cpl/directory.xml" /> </directory> +<directory name="crtdll"> + <xi:include href="crtdll/crtdll.xml" /> +</directory> <directory name="dnsapi"> <xi:include href="dnsapi/dnsapi.xml" /> </directory> @@ -50,6 +53,7 @@ <xi:include href="libwine/libwine.xml" /> </directory> <directory name="msvcrt"> + <xi:include href="msvcrt/crt.xml" /> <xi:include href="msvcrt/msvcrt.xml" /> </directory> <directory name="ntdll"> _____ Added: branches/xmlbuildsystem/reactos/lib/msvcrt/crt.xml --- branches/xmlbuildsystem/reactos/lib/msvcrt/crt.xml 2005-01-22 20:59:49 UTC (rev 13220) +++ branches/xmlbuildsystem/reactos/lib/msvcrt/crt.xml 2005-01-22 22:00:17 UTC (rev 13221) @@ -0,0 +1,268 @@ +<module name="crt" type="staticlibrary"> + <include base="crt">.</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="__REACTOS__" /> + <define name="USE_MSVCRT_PREFIX" /> + <define name="_MSVCRT_LIB_" /> + <define name="_MT" /> + <directory name="ctype"> + <file>ctype.c</file> + <file>isalnum.c</file> + <file>isascii.c</file> + <file>iscntrl.c</file> + <file>isgraph.c</file> + <file>isprint.c</file> + <file>ispunct.c</file> + <file>isupper.c</file> + </directory> + <directory name="direct"> + <file>chdir.c</file> + <file>chdrive.c</file> + <file>getcwd.c</file> + <file>getdcwd.c</file> + <file>getdfree.c</file> + <file>getdrive.c</file> + <file>mkdir.c</file> + <file>rmdir.c</file> + </directory> + <directory name="float"> + <file>chgsign.c</file> + <file>clearfp.c</file> + <file>cntrlfp.c</file> + <file>copysign.c</file> + <file>fpclass.c</file> + <file>fpecode.c</file> + <file>fpreset.c</file> + <file>isnan.c</file> + <file>logb.c</file> + <file>nafter.c</file> + <file>scalb.c</file> + <file>statfp.c</file> + </directory> + <directory name="io"> + <file>access.c</file> + <file>chmod.c</file> + <file>chsize.c</file> + <file>close.c</file> + <file>commit.c</file> + <file>dup2.c</file> + <file>filelen.c</file> + <file>isatty.c</file> + <file>locking.c</file> + <file>mktemp.c</file> + <file>setmode.c</file> + <file>sopen.c</file> + <file>tell.c</file> + <file>umask.c</file> + <file>utime.c</file> + <file>write.c</file> + </directory> + <directory name="locale"> + <file>locale.c</file> + </directory> + <directory name="math"> + <file>acos.c</file> + <file>asin.c</file> + <file>atan2.c</file> + <file>atan.c</file> + <file>cabs.c</file> + <file>cos.c</file> + <file>cosh.c</file> + <file>exp.c</file> + <file>fabs.c</file> + <file>fmod.c</file> + <file>frexp.c</file> + <file>hypot.c</file> + <file>j0_y0.c</file> + <file>j1_y1.c</file> + <file>jn_yn.c</file> + <file>ldexp.c</file> + <file>log10.c</file> + <file>log.c</file> + <file>modf.c</file> + <file>pow.c</file> + <file>sin.c</file> + <file>sinh.c</file> + <file>sqrt.c</file> + <file>stubs.c</file> + <file>tan.c</file> + <file>tanh.c</file> + </directory> + <directory name="mbstring"> + <file>hanzen.c</file> + <file>ischira.c</file> + <file>iskana.c</file> + <file>iskmoji.c</file> + <file>iskpun.c</file> + <file>islead.c</file> + <file>islwr.c</file> + <file>ismbal.c</file> + <file>ismbaln.c</file> + <file>ismbc.c</file> + <file>ismbgra.c</file> + <file>ismbkaln.c</file> + <file>ismblead.c</file> + <file>ismbpri.c</file> + <file>ismbpun.c</file> + <file>ismbtrl.c</file> + <file>isuppr.c</file> + <file>jistojms.c</file> + <file>jmstojis.c</file> + <file>mbbtype.c</file> + <file>mbccpy.c</file> + <file>mbclen.c</file> + <file>mbscat.c</file> + <file>mbschr.c</file> + <file>mbscmp.c</file> + <file>mbscoll.c</file> + <file>mbscpy.c</file> + <file>mbscspn.c</file> + <file>mbsdec.c</file> + <file>mbsdup.c</file> + <file>mbsicmp.c</file> + <file>mbsicoll.c</file> + <file>mbsinc.c</file> + <file>mbslen.c</file> + <file>mbslwr.c</file> + <file>mbsncat.c</file> + <file>mbsnccnt.c</file> + <file>mbsncmp.c</file> + <file>mbsncoll.c</file> + <file>mbsncpy.c</file> + <file>mbsnextc.c</file> + <file>mbsnicmp.c</file> + <file>mbsnicoll.c</file> + <file>mbsninc.c</file> + <file>mbsnset.c</file> + <file>mbspbrk.c</file> + <file>mbsrchr.c</file> + <file>mbsrev.c</file> + <file>mbsset.c</file> + <file>mbsspn.c</file> + <file>mbsspnp.c</file> + <file>mbsstr.c</file> + <file>mbstok.c</file> + <file>mbstrlen.c</file> + <file>mbsupr.c</file> + </directory> + <directory name="misc"> + <file>amsg.c</file> + <file>assert.c</file> + <file>environ.c</file> + <file>initterm.c</file> + </directory> + <directory name="process"> + <file>dll.c</file> + <file>procid.c</file> + <file>threadid.c</file> + </directory> + <directory name="search"> + <file>lfind.c</file> + <file>lsearch.c</file> + </directory> + <directory name="setjmp"> + <directory name="i386"> + <file>setjmp.s</file> + </directory> + </directory> + <directory name="signal"> + <file>signal.c</file> + </directory> + <directory name="stdio"> + <file>allocfil.c</file> + <file>clearerr.c</file> + <file>fclose.c</file> + <file>fdopen.c</file> + <file>feof.c</file> + <file>fgetc.c</file> + <file>fgetpos.c</file> + <file>flsbuf.c</file> + <file>fprintf.c</file> + <file>fputc.c</file> + <file>fseek.c</file> + <file>fsetpos.c</file> + <file>fwalk.c</file> + <file>getw.c</file> + <file>putw.c</file> + <file>rename.c</file> + <file>rewind.c</file> + <file>rmtmp.c</file> + <file>scanf.c</file> + <file>setbuf.c</file> + <file>setvbuf.c</file> + <file>sprintf.c</file> + <file>sscanf.c</file> + <file>stdhnd.c</file> + <file>tempnam.c</file> + <file>tmpfile.c</file> + <file>tmpnam.c</file> + <file>ungetc.c</file> + <file>vfprintf.c</file> + <file>vfscanf.c</file> + <file>vfwprint.c</file> + <file>vprintf.c</file> + <file>vscanf.c</file> + <file>vsprintf.c</file> + <file>vsscanf.c</file> + </directory> + <directory name="stdlib"> + <file>_exit.c</file> + <file>abort.c</file> + <file>abs.c</file> + <file>atexit.c</file> + <file>atof.c</file> + <file>atoi.c</file> + <file>atol.c</file> + <file>bsearch.c</file> + <file>div.c</file> + <file>ecvt.c</file> + <file>ecvtbuf.c</file> + <file>fcvt.c</file> + <file>fcvtbuf.c</file> + <file>gcvt.c</file> + <file>itoa.c</file> + <file>labs.c</file> + <file>ldiv.c</file> + <file>makepath.c</file> + <file>obsol.c</file> + <file>rot.c</file> + <file>senv.c</file> + <file>splitp.c</file> + <file>strtod.c</file> + <file>strtol.c</file> + <file>strtoul.c</file> + <file>swab.c</file> + <file>wcstod.c</file> + </directory> + <directory name="string"> + <file>lasttok.c</file> + <file>strcoll.c</file> + <file>strdup.c</file> + <file>strrev.c</file> + <file>strset.c</file> + <file>strtok.c</file> + <file>strxfrm.c</file> + </directory> + <directory name="sys_stat"> + <file>futime.c</file> + </directory> + <directory name="time"> + <file>clock.c</file> + <file>ctime.c</file> + <file>difftime.c</file> + <file>strdate.c</file> + <file>strftime.c</file> + <file>strtime.c</file> + <file>time.c</file> + </directory> + <directory name="wstring"> + <file>wcsdup.c</file> + <file>wcsrev.c</file> + <file>wcsset.c</file> + <file>wcstok.c</file> + <file>wcsxfrm.c</file> + </directory> +</module> _____ Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/ctype/isalnum.c --- branches/xmlbuildsystem/reactos/lib/msvcrt/ctype/isalnum.c 2005-01-22 20:59:49 UTC (rev 13220) +++ branches/xmlbuildsystem/reactos/lib/msvcrt/ctype/isalnum.c 2005-01-22 22:00:17 UTC (rev 13221) @@ -9,16 +9,6 @@ */ #include <msvcrt/ctype.h> - -#undef isalnum -/* - * @implemented - */ -int isalnum(int c) -{ - return _isctype(c, _ALPHA | _DIGIT); -} - #undef iswalnum /* * @implemented _____ Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/ctype/isascii.c --- branches/xmlbuildsystem/reactos/lib/msvcrt/ctype/isascii.c 2005-01-22 20:59:49 UTC (rev 13220) +++ branches/xmlbuildsystem/reactos/lib/msvcrt/ctype/isascii.c 2005-01-22 22:00:17 UTC (rev 13221) @@ -13,14 +13,6 @@ /* * @implemented */ -int __isascii(int c) -{ - return (!((c)&(~0x7f))); -} - -/* - * @implemented - */ int iswascii(wint_t c) { return __isascii(c); _____ Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/ctype/iscntrl.c --- branches/xmlbuildsystem/reactos/lib/msvcrt/ctype/iscntrl.c 2005-01-22 20:59:49 UTC (rev 13220) +++ branches/xmlbuildsystem/reactos/lib/msvcrt/ctype/iscntrl.c 2005-01-22 22:00:17 UTC (rev 13221) @@ -1,16 +1,6 @@ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ #include <msvcrt/ctype.h> - -#undef iscntrl -/* - * @implemented - */ -int iscntrl(int c) -{ - return _isctype(c, _CONTROL); -} - #undef iswcntrl /* * @implemented _____ Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/ctype/isgraph.c --- branches/xmlbuildsystem/reactos/lib/msvcrt/ctype/isgraph.c 2005-01-22 20:59:49 UTC (rev 13220) +++ branches/xmlbuildsystem/reactos/lib/msvcrt/ctype/isgraph.c 2005-01-22 22:00:17 UTC (rev 13221) @@ -1,15 +1,6 @@ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ #include <msvcrt/ctype.h> -#undef isgraph -/* - * @implemented - */ -int isgraph(int c) -{ - return _isctype(c,_PUNCT | _ALPHA | _DIGIT); -} - #undef iswgraph /* * @implemented _____ Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/ctype/isprint.c --- branches/xmlbuildsystem/reactos/lib/msvcrt/ctype/isprint.c 2005-01-22 20:59:49 UTC (rev 13220) +++ branches/xmlbuildsystem/reactos/lib/msvcrt/ctype/isprint.c 2005-01-22 22:00:17 UTC (rev 13221) @@ -1,18 +1,9 @@ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ #include <msvcrt/ctype.h> -#undef isprint /* * @implemented */ -int isprint(int c) -{ - return _isctype(c,_BLANK | _PUNCT | _ALPHA | _DIGIT); -} - -/* - * @implemented - */ int iswprint(wint_t c) { return iswctype((unsigned short)c,_BLANK | _PUNCT | _ALPHA | _DIGIT); _____ Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/ctype/ispunct.c --- branches/xmlbuildsystem/reactos/lib/msvcrt/ctype/ispunct.c 2005-01-22 20:59:49 UTC (rev 13220) +++ branches/xmlbuildsystem/reactos/lib/msvcrt/ctype/ispunct.c 2005-01-22 22:00:17 UTC (rev 13221) @@ -1,16 +1,6 @@ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ #include <msvcrt/ctype.h> - -#undef ispunct -/* - * @implemented - */ -int ispunct(int c) -{ - return _isctype(c, _PUNCT); -} - #undef iswpunct /* * @implemented _____ Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/ctype/isupper.c --- branches/xmlbuildsystem/reactos/lib/msvcrt/ctype/isupper.c 2005-01-22 20:59:49 UTC (rev 13220) +++ branches/xmlbuildsystem/reactos/lib/msvcrt/ctype/isupper.c 2005-01-22 22:00:17 UTC (rev 13221) @@ -3,13 +3,6 @@ #undef isupper -/* - * @implemented - */ -int isupper(int c) -{ - return _isctype(c, _UPPER); -} /* * @implemented _____ Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/math/pow.c --- branches/xmlbuildsystem/reactos/lib/msvcrt/math/pow.c 2005-01-22 20:59:49 UTC (rev 13220) +++ branches/xmlbuildsystem/reactos/lib/msvcrt/math/pow.c 2005-01-22 22:00:17 UTC (rev 13221) @@ -20,77 +20,6 @@ #include <msvcrt/math.h> -double pow (double __x, double __y); - -double __log2 (double __x); - -double __log2 (double __x) -{ - register double __value; -#ifdef __GNUC__ - __asm __volatile__ - ("fld1\n\t" - "fxch\n\t" - "fyl2x" - : "=t" (__value) : "0" (__x)); -#else - //__value = linkme_log2(__x); - __value = 0; -#endif /*__GNUC__*/ - return __value; -} - -/* - * @implemented - */ -double pow (double __x, double __y) -{ - register double __value; -#ifdef __GNUC__ - register double __exponent; - long __p = (long) __y; - - if (__x == 0.0 && __y > 0.0) - return 0.0; - if (__y == (double) __p) - { - double __r = 1.0; - if (__p == 0) - return 1.0; - if (__p < 0) - { - __p = -__p; - __x = 1.0 / __x; - } - while (1) - { - if (__p & 1) - __r *= __x; - __p >>= 1; - if (__p == 0) - return __r; - __x *= __x; - } - /* NOTREACHED */ - } - __asm __volatile__ - ("fmul %%st(1) # y * log2(x)\n\t" - "fst %%st(1)\n\t" - "frndint # int(y * log2(x))\n\t" - "fxch\n\t" - "fsub %%st(1) # fract(y * log2(x))\n\t" - "f2xm1 # 2^(fract(y * log2(x))) - 1\n\t" - : "=t" (__value), "=u" (__exponent) : "0" (__log2 (__x)), "1" (__y)); - __value += 1.0; - __asm __volatile__ - ("fscale" - : "=t" (__value) : "0" (__value), "u" (__exponent)); -#else - __value = linkme_pow(__x, __y); -#endif /*__GNUC__*/ - return __value; -} - long double powl (long double __x,long double __y) { return pow(__x,__y/2)*pow(__x,__y/2); _____ Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/msvcrt.def --- branches/xmlbuildsystem/reactos/lib/msvcrt/msvcrt.def 2005-01-22 20:59:49 UTC (rev 13220) +++ branches/xmlbuildsystem/reactos/lib/msvcrt/msvcrt.def 2005-01-22 22:00:17 UTC (rev 13221) @@ -116,7 +116,7 @@ __fpecode __getmainargs __initenv DATA -__isascii +__isascii=NTDLL.__isascii __iscsym __iscsymf __lc_codepage @@ -493,10 +493,10 @@ _setmode ;_setsystime _sleep -_snprintf +_snprintf=msvcrt__snprintf ;_snscanf ;_snwscanf -_snwprintf +_snwprintf=msvcrt__snwprintf _sopen _spawnl _spawnle @@ -554,8 +554,8 @@ ;_utime64 ;_vscprintf ;_vscwprintf -_vsnprintf -_vsnwprintf +_vsnprintf=msvcrt__vsnprintf +_vsnwprintf=msvcrt__vsnwprintf _waccess _wasctime _wchdir @@ -706,17 +706,17 @@ getwchar gmtime is_wctype -isalnum +isalnum=NTDLL.isalnum isalpha -iscntrl +iscntrl=NTDLL.iscntrl isdigit -isgraph +isgraph=NTDLL.isgraph isleadbyte islower -isprint -ispunct +isprint=NTDLL.isprint +ispunct=NTDLL.ispunct isspace -isupper +isupper=NTDLL.isupper iswalnum iswalpha iswascii @@ -751,7 +751,7 @@ mktime modf perror -pow +pow=NTDLL.pow printf putc putchar @@ -772,10 +772,10 @@ signal sin sinh -sprintf +sprintf=msvcrt_sprintf sqrt srand -sscanf +sscanf=msvcrt_sscanf strcat strchr strcmp @@ -797,7 +797,7 @@ strtol strtoul strxfrm -swprintf +swprintf=msvcrt_swprintf swscanf system tan @@ -814,7 +814,7 @@ vfprintf vfwprintf vprintf -vsprintf +vsprintf=msvcrt_vsprintf vswprintf vwprintf wcscat _____ Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/msvcrt.xml --- branches/xmlbuildsystem/reactos/lib/msvcrt/msvcrt.xml 2005-01-22 20:59:49 UTC (rev 13220) +++ branches/xmlbuildsystem/reactos/lib/msvcrt/msvcrt.xml 2005-01-22 22:00:17 UTC (rev 13221) @@ -1,4 +1,4 @@ -<module name="msvcrt" type="win32dll"> +<module name="msvcrt" type="win32dll" mangledsymbols="true"> <linkerflag>-nostartfiles</linkerflag> <linkerflag>--enable-stdcall-fixup</linkerflag> <linkerflag>-lgcc</linkerflag> @@ -16,46 +16,20 @@ <library>string</library> <library>kernel32</library> <library>ntdll</library> - <directory name="conio"> - <file>cgets.c</file> - <file>cprintf.c</file> - <file>cputs.c</file> - <file>cscanf.c</file> - <file>getch.c</file> - <file>getche.c</file> - <file>kbhit.c</file> - <file>putch.c</file> - <file>ungetch.c</file> - </directory> + <library>crt</library> <directory name="ctype"> - <file>ctype.c</file> - <file>isalnum.c</file> <file>isalpha.c</file> - <file>isascii.c</file> - <file>iscntrl.c</file> <file>iscsym.c</file> <file>isctype.c</file> <file>isdigit.c</file> - <file>isgraph.c</file> <file>islower.c</file> - <file>isprint.c</file> - <file>ispunct.c</file> <file>isspace.c</file> - <file>isupper.c</file> <file>isxdigit.c</file> <file>toascii.c</file> <file>tolower.c</file> <file>toupper.c</file> </directory> <directory name="direct"> - <file>chdir.c</file> - <file>chdrive.c</file> - <file>getcwd.c</file> - <file>getdcwd.c</file> - <file>getdfree.c</file> - <file>getdrive.c</file> - <file>mkdir.c</file> - <file>rmdir.c</file> <file>wchdir.c</file> <file>wgetcwd.c</file> <file>wgetdcwd.c</file> @@ -70,161 +44,41 @@ <file>unwind.c</file> <file>xcptfil.c</file> </directory> - <directory name="float"> - <file>chgsign.c</file> - <file>clearfp.c</file> - <file>cntrlfp.c</file> - <file>copysign.c</file> - <file>fpclass.c</file> - <file>fpecode.c</file> - <file>fpreset.c</file> - <file>isnan.c</file> - <file>logb.c</file> - <file>nafter.c</file> - <file>scalb.c</file> - <file>statfp.c</file> - </directory> <directory name="io"> - <file>access.c</file> - <file>chmod.c</file> - <file>chsize.c</file> - <file>close.c</file> - <file>commit.c</file> <file>create.c</file> - <file>dup2.c</file> <file>dup.c</file> <file>eof.c</file> - <file>filelen.c</file> <file>fileleni.c</file> <file>find.c</file> <file>fmode.c</file> - <file>isatty.c</file> - <file>locking.c</file> <file>lseek.c</file> <file>lseeki64.c</file> - <file>mktemp.c</file> <file>open.c</file> <file>pipe.c</file> <file>read.c</file> - <file>setmode.c</file> - <file>sopen.c</file> <file>stubs.c</file> - <file>tell.c</file> <file>telli64.c</file> - <file>umask.c</file> <file>unlink.c</file> - <file>utime.c</file> <file>waccess.c</file> <file>wchmod.c</file> <file>wcreate.c</file> <file>wfind.c</file> <file>wmktemp.c</file> <file>wopen.c</file> - <file>write.c</file> <file>wunlink.c</file> <file>wutime.c</file> </directory> - <directory name="locale"> - <file>locale.c</file> - </directory> <directory name="math"> - <file>acos.c</file> <file>adjust.c</file> - <file>asin.c</file> - <file>atan2.c</file> - <file>atan.c</file> - <file>cabs.c</file> <file>ceil.c</file> - <file>cos.c</file> - <file>cosh.c</file> - <file>exp.c</file> - <file>fabs.c</file> <file>floor.c</file> - <file>fmod.c</file> - <file>frexp.c</file> <file>huge_val.c</file> - <file>hypot.c</file> - <file>j0_y0.c</file> - <file>j1_y1.c</file> - <file>jn_yn.c</file> - <file>ldexp.c</file> - <file>log10.c</file> - <file>log.c</file> <file>math.c</file> - <file>modf.c</file> - <file>pow.c</file> - <file>sin.c</file> - <file>sinh.c</file> - <file>sqrt.c</file> - <file>stubs.c</file> - <file>tan.c</file> - <file>tanh.c</file> </directory> - <directory name="mbstring"> - <file>hanzen.c</file> - <file>ischira.c</file> - <file>iskana.c</file> - <file>iskmoji.c</file> - <file>iskpun.c</file> - <file>islead.c</file> - <file>islwr.c</file> - <file>ismbal.c</file> - <file>ismbaln.c</file> - <file>ismbc.c</file> - <file>ismbgra.c</file> - <file>ismbkaln.c</file> - <file>ismblead.c</file> - <file>ismbpri.c</file> - <file>ismbpun.c</file> - <file>ismbtrl.c</file> - <file>isuppr.c</file> - <file>jistojms.c</file> - <file>jmstojis.c</file> - <file>mbbtype.c</file> - <file>mbccpy.c</file> - <file>mbclen.c</file> - <file>mbscat.c</file> - <file>mbschr.c</file> - <file>mbscmp.c</file> - <file>mbscoll.c</file> - <file>mbscpy.c</file> - <file>mbscspn.c</file> - <file>mbsdec.c</file> - <file>mbsdup.c</file> - <file>mbsicmp.c</file> - <file>mbsicoll.c</file> - <file>mbsinc.c</file> - <file>mbslen.c</file> - <file>mbslwr.c</file> - <file>mbsncat.c</file> - <file>mbsnccnt.c</file> - <file>mbsncmp.c</file> - <file>mbsncoll.c</file> - <file>mbsncpy.c</file> - <file>mbsnextc.c</file> - <file>mbsnicmp.c</file> - <file>mbsnicoll.c</file> - <file>mbsninc.c</file> - <file>mbsnset.c</file> - <file>mbspbrk.c</file> - <file>mbsrchr.c</file> - <file>mbsrev.c</file> - <file>mbsset.c</file> - <file>mbsspn.c</file> - <file>mbsspnp.c</file> - <file>mbsstr.c</file> - <file>mbstok.c</file> - <file>mbstrlen.c</file> - <file>mbsupr.c</file> - </directory> <directory name="misc"> - <file>amsg.c</file> - <file>assert.c</file> <file>crtmain.c</file> <file>dllmain.c</file> - <file>environ.c</file> <file>getargs.c</file> - <file>initterm.c</file> <file>lock.c</file> <file>purecall.c</file> <file>stubs.c</file> @@ -233,134 +87,58 @@ <directory name="process"> <file>_cwait.c</file> [truncated at 1000 lines; 418 more skipped]

19 years, 11 months

[weiden] 13220: don't leak resources on failure

by weiden＠svn.reactos.com

don't leak resources on failure Modified: trunk/reactos/ntoskrnl/rtl/capture.c _____ Modified: trunk/reactos/ntoskrnl/rtl/capture.c --- trunk/reactos/ntoskrnl/rtl/capture.c 2005-01-22 20:53:14 UTC (rev 13219) +++ trunk/reactos/ntoskrnl/rtl/capture.c 2005-01-22 20:59:49 UTC (rev 13220) @@ -115,6 +115,13 @@ Status = _SEH_GetExceptionCode(); } _SEH_END; + + if(!NT_SUCCESS(Status)) + { + ExFreePool(Dest->Buffer); + Dest->Buffer = NULL; + Dest->Length = Dest->MaximumLength = 0; + } } else {

19 years, 11 months

[weiden] 13219: RtlCaptureUnicodeString should also check the buffers that the UNICODE_STRING structure points to...

by weiden＠svn.reactos.com

RtlCaptureUnicodeString should also check the buffers that the UNICODE_STRING structure points to... Modified: trunk/reactos/ntoskrnl/rtl/capture.c _____ Modified: trunk/reactos/ntoskrnl/rtl/capture.c --- trunk/reactos/ntoskrnl/rtl/capture.c 2005-01-22 18:08:28 UTC (rev 13218) +++ trunk/reactos/ntoskrnl/rtl/capture.c 2005-01-22 20:53:14 UTC (rev 13219) @@ -58,6 +58,12 @@ sizeof(UNICODE_STRING), sizeof(ULONG)); Src = *UnsafeSrc; + if(Src.Length > 0) + { + ProbeForRead(Src.Buffer, + Src.Length, + sizeof(WCHAR)); + } } _SEH_HANDLE { @@ -86,20 +92,19 @@ * Initialize the destination string. */ Dest->Length = Src.Length; - Dest->MaximumLength = Src.Length + sizeof(WCHAR); - Dest->Buffer = ExAllocatePool(PoolType, Dest->MaximumLength); - if (Dest->Buffer == NULL) - { - Dest->Length = Dest->MaximumLength = 0; - Dest->Buffer = NULL; - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* - * Copy the source string to kernel space. - */ if(Src.Length > 0) { + Dest->MaximumLength = Src.Length + sizeof(WCHAR); + Dest->Buffer = ExAllocatePool(PoolType, Dest->MaximumLength); + if (Dest->Buffer == NULL) + { + Dest->Length = Dest->MaximumLength = 0; + Dest->Buffer = NULL; + return STATUS_INSUFFICIENT_RESOURCES; + } + /* + * Copy the source string to kernel space. + */ _SEH_TRY { RtlCopyMemory(Dest->Buffer, Src.Buffer, Src.Length); @@ -111,6 +116,11 @@ } _SEH_END; } + else + { + Dest->MaximumLength = 0; + Dest->Buffer = NULL; + } return Status; }

19 years, 11 months

[chorns] 13218: Add missing file

by chorns＠svn.reactos.com

Add missing file Added: branches/xmlbuildsystem/reactos/lib/cpl/directory.xml _____ Added: branches/xmlbuildsystem/reactos/lib/cpl/directory.xml --- branches/xmlbuildsystem/reactos/lib/cpl/directory.xml 2005-01-22 18:06:37 UTC (rev 13217) +++ branches/xmlbuildsystem/reactos/lib/cpl/directory.xml 2005-01-22 18:08:28 UTC (rev 13218) @@ -0,0 +1,27 @@ +<directory name="access"> + <xi:include href="access/access.xml" /> +</directory> +<directory name="appwiz"> + <xi:include href="appwiz/appwiz.xml" /> +</directory> +<directory name="control"> + <xi:include href="control/control.xml" /> +</directory> +<directory name="desk"> + <xi:include href="desk/desk.xml" /> +</directory> +<directory name="intl"> + <xi:include href="intl/intl.xml" /> +</directory> +<directory name="main"> + <xi:include href="main/main.xml" /> +</directory> +<directory name="ncpa"> + <xi:include href="ncpa/ncpa.xml" /> +</directory> +<directory name="sysdm"> + <xi:include href="sysdm/sysdm.xml" /> +</directory> +<directory name="timedate"> + <xi:include href="timedate/timedate.xml" /> +</directory>

19 years, 11 months

[chorns] 13217: Build control panel applets

by chorns＠svn.reactos.com

Build control panel applets Added: branches/xmlbuildsystem/reactos/lib/cpl/access/access.xml Added: branches/xmlbuildsystem/reactos/lib/cpl/appwiz/appwiz.xml Added: branches/xmlbuildsystem/reactos/lib/cpl/control/control.xml Added: branches/xmlbuildsystem/reactos/lib/cpl/desk/desk.xml Added: branches/xmlbuildsystem/reactos/lib/cpl/intl/intl.xml Added: branches/xmlbuildsystem/reactos/lib/cpl/main/main.xml Added: branches/xmlbuildsystem/reactos/lib/cpl/ncpa/ncpa.xml Added: branches/xmlbuildsystem/reactos/lib/cpl/sysdm/sysdm.xml Added: branches/xmlbuildsystem/reactos/lib/cpl/timedate/timedate.xml Modified: branches/xmlbuildsystem/reactos/lib/directory.xml _____ Added: branches/xmlbuildsystem/reactos/lib/cpl/access/access.xml --- branches/xmlbuildsystem/reactos/lib/cpl/access/access.xml 2005-01-22 17:38:31 UTC (rev 13216) +++ branches/xmlbuildsystem/reactos/lib/cpl/access/access.xml 2005-01-22 18:06:37 UTC (rev 13217) @@ -0,0 +1,20 @@ +<module name="access" type="win32dll" extension=".cpl"> + <importlibrary definition="access.def" /> + <include base="access">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>user32</library> + <library>comctl32</library> + <file>access.c</file> + <file>display.c</file> + <file>general.c</file> + <file>keyboard.c</file> + <file>mouse.c</file> + <file>sound.c</file> + <file>access.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/cpl/appwiz/appwiz.xml --- branches/xmlbuildsystem/reactos/lib/cpl/appwiz/appwiz.xml 2005-01-22 17:38:31 UTC (rev 13216) +++ branches/xmlbuildsystem/reactos/lib/cpl/appwiz/appwiz.xml 2005-01-22 18:06:37 UTC (rev 13217) @@ -0,0 +1,15 @@ +<module name="appwiz" type="win32dll" extension=".cpl"> + <importlibrary definition="appwiz.def" /> + <include base="appwiz">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>user32</library> + <library>comctl32</library> + <file>appwiz.c</file> + <file>appwiz.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/cpl/control/control.xml --- branches/xmlbuildsystem/reactos/lib/cpl/control/control.xml 2005-01-22 17:38:31 UTC (rev 13216) +++ branches/xmlbuildsystem/reactos/lib/cpl/control/control.xml 2005-01-22 18:06:37 UTC (rev 13217) @@ -0,0 +1,14 @@ +<module name="control" type="win32gui"> + <include base="control">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>user32</library> + <library>comctl32</library> + <file>control.c</file> + <file>control.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/cpl/desk/desk.xml --- branches/xmlbuildsystem/reactos/lib/cpl/desk/desk.xml 2005-01-22 17:38:31 UTC (rev 13216) +++ branches/xmlbuildsystem/reactos/lib/cpl/desk/desk.xml 2005-01-22 18:06:37 UTC (rev 13217) @@ -0,0 +1,15 @@ +<module name="desk" type="win32dll" extension=".cpl"> + <importlibrary definition="desk.def" /> + <include base="desk">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>user32</library> + <library>comctl32</library> + <file>desk.c</file> + <file>desk.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/cpl/intl/intl.xml --- branches/xmlbuildsystem/reactos/lib/cpl/intl/intl.xml 2005-01-22 17:38:31 UTC (rev 13216) +++ branches/xmlbuildsystem/reactos/lib/cpl/intl/intl.xml 2005-01-22 18:06:37 UTC (rev 13217) @@ -0,0 +1,21 @@ +<module name="intl" type="win32dll" extension=".cpl"> + <importlibrary definition="intl.def" /> + <include base="intl">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>user32</library> + <library>comctl32</library> + <file>currency.c</file> + <file>date.c</file> + <file>general.c</file> + <file>intl.c</file> + <file>locale.c</file> + <file>numbers.c</file> + <file>time.c</file> + <file>intl.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/cpl/main/main.xml --- branches/xmlbuildsystem/reactos/lib/cpl/main/main.xml 2005-01-22 17:38:31 UTC (rev 13216) +++ branches/xmlbuildsystem/reactos/lib/cpl/main/main.xml 2005-01-22 18:06:37 UTC (rev 13217) @@ -0,0 +1,17 @@ +<module name="main" type="win32dll" extension=".cpl"> + <importlibrary definition="main.def" /> + <include base="main">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>user32</library> + <library>comctl32</library> + <file>keyboard.c</file> + <file>main.c</file> + <file>mouse.c</file> + <file>main.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/cpl/ncpa/ncpa.xml --- branches/xmlbuildsystem/reactos/lib/cpl/ncpa/ncpa.xml 2005-01-22 17:38:31 UTC (rev 13216) +++ branches/xmlbuildsystem/reactos/lib/cpl/ncpa/ncpa.xml 2005-01-22 18:06:37 UTC (rev 13217) @@ -0,0 +1,17 @@ +<module name="ncpa" type="win32dll" extension=".cpl"> + <importlibrary definition="ncpa.def" /> + <include base="ncpa">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>user32</library> + <library>comctl32</library> + <library>iphlpapi</library> + <file>ncpa.c</file> + <file>tcpip_properties.c</file> + <file>ncpa.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/cpl/sysdm/sysdm.xml --- branches/xmlbuildsystem/reactos/lib/cpl/sysdm/sysdm.xml 2005-01-22 17:38:31 UTC (rev 13216) +++ branches/xmlbuildsystem/reactos/lib/cpl/sysdm/sysdm.xml 2005-01-22 18:06:37 UTC (rev 13217) @@ -0,0 +1,21 @@ +<module name="sysdm" type="win32dll" extension=".cpl"> + <importlibrary definition="sysdm.def" /> + <include base="sysdm">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>user32</library> + <library>comctl32</library> + <file>advanced.c</file> + <file>computer.c</file> + <file>environment.c</file> + <file>general.c</file> + <file>hardware.c</file> + <file>sysdm.c</file> + <file>userprofile.c</file> + <file>sysdm.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/cpl/timedate/timedate.xml --- branches/xmlbuildsystem/reactos/lib/cpl/timedate/timedate.xml 2005-01-22 17:38:31 UTC (rev 13216) +++ branches/xmlbuildsystem/reactos/lib/cpl/timedate/timedate.xml 2005-01-22 18:06:37 UTC (rev 13217) @@ -0,0 +1,16 @@ +<module name="timedate" type="win32dll" extension=".cpl"> + <importlibrary definition="timedate.def" /> + <include base="timedate">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>user32</library> + <library>comctl32</library> + <library>iphlpapi</library> + <file>timedate.c</file> + <file>timedate.rc</file> +</module> _____ Modified: branches/xmlbuildsystem/reactos/lib/directory.xml --- branches/xmlbuildsystem/reactos/lib/directory.xml 2005-01-22 17:38:31 UTC (rev 13216) +++ branches/xmlbuildsystem/reactos/lib/directory.xml 2005-01-22 18:06:37 UTC (rev 13217) @@ -25,6 +25,9 @@ <directory name="comdlg32"> <xi:include href="comdlg32/comdlg32.xml" /> </directory> +<directory name="cpl"> + <xi:include href="cpl/directory.xml" /> +</directory> <directory name="dnsapi"> <xi:include href="dnsapi/dnsapi.xml" /> </directory>

19 years, 11 months

[chorns] 13216: * Invoke cabman when building a CD

by chorns＠svn.reactos.com

* Invoke cabman when building a CD * Entrypoint attribute on <module> to override default entrypoint * Use entrypoint _DrvEnableDriver@12 for display drivers Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr.xml Modified: branches/xmlbuildsystem/reactos/drivers/video/displays/framebuf/framebuf .xml Modified: branches/xmlbuildsystem/reactos/drivers/video/displays/vga/vgaddi.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr.xml --- branches/xmlbuildsystem/reactos/boot/freeldr/freeldr.xml 2005-01-22 15:48:00 UTC (rev 13215) +++ branches/xmlbuildsystem/reactos/boot/freeldr/freeldr.xml 2005-01-22 17:38:31 UTC (rev 13216) @@ -1,11 +1,4 @@ - +</module> <directory name="freeldr"> <xi:include href="freeldr/freeldr_startup.xml" /> <xi:include href="freeldr/freeldr_base64k.xml" /> _____ Modified: branches/xmlbuildsystem/reactos/drivers/video/displays/framebuf/framebuf .xml --- branches/xmlbuildsystem/reactos/drivers/video/displays/framebuf/framebuf .xml 2005-01-22 15:48:00 UTC (rev 13215) +++ branches/xmlbuildsystem/reactos/drivers/video/displays/framebuf/framebuf .xml 2005-01-22 17:38:31 UTC (rev 13216) @@ -1,4 +1,4 @@ -<module name="framebuf" type="kernelmodedriver"> +<module name="framebuf" type="kernelmodedll" entrypoint="_DrvEnableDriver@12"> <importlibrary definition="framebuf.def" /> <include base="framebuf">.</include> <define name="__USE_W32API" /> _____ Modified: branches/xmlbuildsystem/reactos/drivers/video/displays/vga/vgaddi.xml --- branches/xmlbuildsystem/reactos/drivers/video/displays/vga/vgaddi.xml 2005-01-22 15:48:00 UTC (rev 13215) +++ branches/xmlbuildsystem/reactos/drivers/video/displays/vga/vgaddi.xml 2005-01-22 17:38:31 UTC (rev 13216) @@ -1,4 +1,4 @@ -<module name="vgaddi" type="kernelmodedriver"> +<module name="vgaddi" type="kernelmodedll" entrypoint="_DrvEnableDriver@12"> <importlibrary definition="vgaddi.def" /> <include base="vgaddi">.</include> <define name="__USE_W32API" /> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-22 15:48:00 UTC (rev 13215) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-22 17:38:31 UTC (rev 13216) @@ -193,6 +193,8 @@ fprintf ( fMakefile, "NUL=NUL\n" ); fprintf ( fMakefile, "winebuild = tools" SSEP "winebuild" SSEP "winebuild\n" ); fprintf ( fMakefile, "bin2res = tools" SSEP "bin2res" SSEP "bin2res\n" ); + fprintf ( fMakefile, "cabman = tools" SSEP "cabman" SSEP "cabman\n" ); + fprintf ( fMakefile, "cdmake = tools" SSEP "cdmake" SSEP "cdmake\n" ); fprintf ( fMakefile, "\n" ); GenerateGlobalCFlagsAndProperties ( "=", @@ -213,6 +215,8 @@ { if ( module.type == ObjectLibrary ) return false; + if ( module.type == BootSector ) + return false; if ( module.type == Iso ) return false; return true; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-22 15:48:00 UTC (rev 13215) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-22 17:38:31 UTC (rev 13216) @@ -960,7 +960,8 @@ const string& cc, const string& cppc, const string& ar, - const string* cflags ) const + const string* cflags, + const string* nasmflags ) const { string cflagsMacro = ssprintf ("%s_CFLAGS", module.name.c_str ()); string nasmflagsMacro = ssprintf ("%s_NASMFLAGS", module.name.c_str ()); @@ -982,7 +983,15 @@ cflagsMacro.c_str (), cflags->c_str () ); } - + + if ( nasmflags != NULL ) + { + fprintf ( fMakefile, + "%s += %s\n\n", + nasmflagsMacro.c_str (), + nasmflags->c_str () ); + } + // generate phony target for module name fprintf ( fMakefile, ".PHONY: %s\n", module.name.c_str () ); @@ -1021,21 +1030,33 @@ void MingwModuleHandler::GenerateMacrosAndTargetsHost ( const Module& module ) const { - GenerateMacrosAndTargets ( module, "${host_gcc}", "${host_gpp}", "${host_ar}", NULL ); + GenerateMacrosAndTargets ( module, + "${host_gcc}", + "${host_gpp}", + "${host_ar}", + NULL, + NULL ); } void MingwModuleHandler::GenerateMacrosAndTargetsTarget ( const Module& module ) const { GenerateMacrosAndTargetsTarget ( module, + NULL, NULL ); } void MingwModuleHandler::GenerateMacrosAndTargetsTarget ( const Module& module, - const string* clags ) const + const string* cflags, + const string* nasmflags ) const { - GenerateMacrosAndTargets ( module, "${gcc}", "${gpp}", "${ar}", clags ); + GenerateMacrosAndTargets ( module, + "${gcc}", + "${gpp}", + "${ar}", + cflags, + nasmflags ); } string @@ -1306,8 +1327,9 @@ string base_tmp = ros_junk + module.name + ".base.tmp"; string junk_tmp = ros_junk + module.name + ".junk.tmp"; string temp_exp = ros_junk + module.name + ".temp.exp"; - string gccOptions = ssprintf ("-Wl,-T,%s" SSEP "ntoskrnl.lnk -Wl,--subsystem,native -Wl,--entry,_NtProcessStartup -Wl,--image-base,0xC0000000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll", - module.GetBasePath ().c_str () ); + string gccOptions = ssprintf ("-Wl,-T,%s" SSEP "ntoskrnl.lnk -Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,0xC0000000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll", + module.GetBasePath ().c_str (), + module.entrypoint.c_str () ); GenerateMacrosAndTargetsTarget ( module ); @@ -1429,7 +1451,8 @@ archiveFilename.c_str (), importLibraryDependencies.c_str () ); - string linkerParameters ( "-Wl,--subsystem,native -Wl,--entry,_DriverEntry@8 -Wl,--image-base,0x10000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll" ); + string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,0x10000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll", + module.entrypoint.c_str () ); GenerateLinkerCommand ( module, "${gcc}", linkerParameters, @@ -1476,7 +1499,8 @@ { string* cflags = new string ( "-D__NTDRIVER__" ); GenerateMacrosAndTargetsTarget ( module, - cflags ); + cflags, + NULL ); delete cflags; fprintf ( fMakefile, "%s: %s %s\n", @@ -1484,7 +1508,8 @@ archiveFilename.c_str (), importLibraryDependencies.c_str () ); - string linkerParameters ( "-Wl,--subsystem,native -Wl,--entry,_DriverEntry@8 -Wl,--image-base,0x10000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll" ); + string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,0x10000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll", + module.entrypoint.c_str () ); GenerateLinkerCommand ( module, "${gcc}", linkerParameters, @@ -1546,7 +1571,8 @@ archiveFilename.c_str (), importLibraryDependencies.c_str () ); - string linkerParameters ( "-Wl,--subsystem,native -Wl,--entry,_DllMainCRTStartup@12 -Wl,--image-base,0x10000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib -mdll" ); + string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,0x10000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib -mdll", + module.entrypoint.c_str () ); GenerateLinkerCommand ( module, "${gcc}", linkerParameters, @@ -1618,7 +1644,8 @@ objectFilenames.c_str (), linkingDependencies.c_str () ); - string linkerParameters ( "-Wl,--subsystem,console -Wl,--entry,_DllMain@12 -Wl,--image-base,0x10000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -mdll" ); + string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,0x10000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -mdll", + module.entrypoint.c_str () ); GenerateLinkerCommand ( module, "${gcc}", linkerParameters, @@ -1669,7 +1696,8 @@ objectFilenames.c_str (), importLibraryDependencies.c_str () ); - string linkerParameters ( "-Wl,--subsystem,windows -Wl,--entry,_WinMainCRTStartup -Wl,--image-base,0x00400000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000" ); + string linkerParameters = ssprintf ( "-Wl,--subsystem,windows -Wl,--entry,%s -Wl,--image-base,0x00400000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000", + module.entrypoint.c_str () ); GenerateLinkerCommand ( module, "${gcc}", linkerParameters, @@ -1734,6 +1762,40 @@ } +static MingwBootSectorModuleHandler bootsectormodule_handler; + +MingwBootSectorModuleHandler::MingwBootSectorModuleHandler () + : MingwModuleHandler ( BootSector ) +{ +} + +void +MingwBootSectorModuleHandler::Process ( const Module& module ) +{ + GeneratePreconditionDependencies ( module ); + GenerateBootSectorModuleTarget ( module ); + GenerateInvocations ( module ); +} + +void +MingwBootSectorModuleHandler::GenerateBootSectorModuleTarget ( const Module& module ) +{ + string objectsMacro = GetObjectsMacro ( module ); + + string* nasmflags = new string ( "-f bin" ); + GenerateMacrosAndTargetsTarget ( module, + NULL, + nasmflags); + + fprintf ( fMakefile, ".PHONY: %s\n\n", + module.name.c_str ()); + fprintf ( fMakefile, + "%s: %s\n", + module.name.c_str (), + objectsMacro.c_str () ); +} + + static MingwIsoModuleHandler isomodule_handler; MingwIsoModuleHandler::MingwIsoModuleHandler () @@ -1752,10 +1814,28 @@ void MingwIsoModuleHandler::GenerateIsoModuleTarget ( const Module& module ) { - string target ( FixupTargetFilename ( module.GetPath ()) ); + string isoboot = "$(ROS_INTERMEDIATE)" + FixupTargetFilename ( "boot/freeldr/bootsect/isoboot.o" ); - fprintf ( fMakefile, "%s: all\n", - target.c_str () ); + fprintf ( fMakefile, ".PHONY: %s\n\n", + module.name.c_str ()); fprintf ( fMakefile, - "\t\n" ); + "%s: all %s\n", + module.name.c_str (), + isoboot.c_str () ); + fprintf ( fMakefile, + "\t${cabman} /C %s /L $(ROS_INTERMEDIATE)%s /I\n", + FixupTargetFilename ( "bootdata/packages/reactos.dff" ).c_str (), + FixupTargetFilename ( "bootcd/reactos" ).c_str () ); + fprintf ( fMakefile, + "\t${cabman} /C %s /RC $(ROS_INTERMEDIATE)%s /L $(BOOTCD_DIR)reactos /N\n", + FixupTargetFilename ( "bootdata/packages/reactos.dff" ).c_str (), + FixupTargetFilename ( "bootcd/reactos/reactos.inf" ).c_str () ); + fprintf ( fMakefile, + "\t- ${rm} $(ROS_INTERMEDIATE)%s\n", + FixupTargetFilename ( "bootcd/reactos/reactos.inf" ).c_str () ); + fprintf ( fMakefile, + "\t${cdmake} -v -m -b %s $(ROS_INTERMEDIATE)bootcd REACTOS ReactOS.iso\n", + isoboot.c_str () ); + fprintf ( fMakefile, + "\n" ); } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-22 15:48:00 UTC (rev 13215) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-22 17:38:31 UTC (rev 13216) @@ -42,7 +42,8 @@ void GenerateMacrosAndTargetsHost ( const Module& module ) const; void GenerateMacrosAndTargetsTarget ( const Module& module ) const; void GenerateMacrosAndTargetsTarget ( const Module& module, - const std::string* clags ) const; + const std::string* cflags, + const std::string* nasmflags ) const; std::string GetInvocationDependencies ( const Module& module ) const; std::string GetInvocationParameters ( const Invoke& invoke ) const; void GenerateInvocations ( const Module& module ) const; @@ -141,7 +142,8 @@ const std::string& cc, const std::string& cppc, const std::string& ar, - const std::string* clags ) const; + const std::string* clags, + const std::string* nasmflags ) const; std::string GetPreconditionDependenciesName ( const Module& module ) const; std::string GetSpecObjectDependencies ( const std::string& filename ) const; }; @@ -248,6 +250,16 @@ }; +class MingwBootSectorModuleHandler : public MingwModuleHandler +{ +public: + MingwBootSectorModuleHandler (); + virtual void Process ( const Module& module ); +private: + void GenerateBootSectorModuleTarget ( const Module& module ); +}; + + class MingwIsoModuleHandler : public MingwModuleHandler { public: _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-01-22 15:48:00 UTC (rev 13215) +++ branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-01-22 17:38:31 UTC (rev 13216) @@ -61,10 +61,16 @@ type = GetModuleType ( node.location, *att ); att = moduleNode.GetAttribute ( "extension", false ); - if (att != NULL) + if ( att != NULL ) extension = att->value; else extension = GetDefaultModuleExtension (); + + att = moduleNode.GetAttribute ( "entrypoint", false ); + if ( att != NULL ) + entrypoint = att->value; + else + entrypoint = GetDefaultModuleEntrypoint (); } Module::~Module () @@ -265,6 +271,8 @@ return Win32GUI; if ( attribute.value == "bootloader" ) return BootLoader; + if ( attribute.value == "bootsector" ) + return BootSector; if ( attribute.value == "iso" ) return Iso; throw InvalidAttributeValueException ( location, @@ -293,6 +301,8 @@ case KernelModeDriver: case BootLoader: return ".sys"; + case BootSector: + return ".o"; case Iso: return ".iso"; } @@ -300,6 +310,35 @@ __LINE__ ); } +string +Module::GetDefaultModuleEntrypoint () const +{ + switch (type) + { + case Kernel: + return "_NtProcessStartup"; + case Win32GUI: + return "_WinMainCRTStartup"; + case KernelModeDLL: + return "_DriverEntry@8"; + case NativeDLL: + return "_DllMainCRTStartup@12"; + case Win32DLL: + return "_DllMain@12"; + case KernelModeDriver: + return "_DriverEntry@8"; + case BuildTool: + case StaticLibrary: + case ObjectLibrary: + case BootLoader: + case BootSector: + case Iso: + return ""; + } + throw InvalidOperationException ( __FILE__, + __LINE__ ); +} + bool Module::HasImportLibrary () const { _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-22 15:48:00 UTC (rev 13215) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-22 17:38:31 UTC (rev 13216) @@ -80,6 +80,7 @@ Win32DLL, Win32GUI, BootLoader, + BootSector, Iso }; @@ -91,6 +92,7 @@ const XMLElement& node; std::string name; std::string extension; + std::string entrypoint; std::string path; ModuleType type; ImportLibrary* importLibrary; @@ -123,6 +125,7 @@ void ProcessXML(); private: std::string GetDefaultModuleExtension () const; + std::string GetDefaultModuleEntrypoint () const; void ProcessXMLSubElement ( const XMLElement& e, const std::string& path, If* pIf = NULL );

19 years, 11 months

[weiden] 13215: more NtXxx vs. ZwXxx fixes

by weiden＠svn.reactos.com

more NtXxx vs. ZwXxx fixes Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c Modified: trunk/reactos/ntoskrnl/cm/regfile.c Modified: trunk/reactos/ntoskrnl/cm/registry.c Modified: trunk/reactos/ntoskrnl/ex/uuid.c _____ Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c --- trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-01-22 15:27:06 UTC (rev 13214) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-01-22 15:48:00 UTC (rev 13215) @@ -237,16 +237,19 @@ NTSTATUS STDCALL NtDeleteKey(IN HANDLE KeyHandle) { + KPROCESSOR_MODE PreviousMode; PKEY_OBJECT KeyObject; NTSTATUS Status; DPRINT1("NtDeleteKey(KeyHandle %x) called\n", KeyHandle); + + PreviousMode = ExGetPreviousMode(); /* Verify that the handle is valid and is a registry key */ Status = ObReferenceObjectByHandle(KeyHandle, DELETE, CmiKeyType, - UserMode, + PreviousMode, (PVOID *)&KeyObject, NULL); if (!NT_SUCCESS(Status)) @@ -899,14 +902,17 @@ NTSTATUS Status; PKEY_OBJECT KeyObject; PREGISTRY_HIVE RegistryHive; + KPROCESSOR_MODE PreviousMode; DPRINT("NtFlushKey (KeyHandle %lx) called\n", KeyHandle); + + PreviousMode = ExGetPreviousMode(); /* Verify that the handle is valid and is a registry key */ Status = ObReferenceObjectByHandle(KeyHandle, KEY_QUERY_VALUE, CmiKeyType, - UserMode, + PreviousMode, (PVOID *)&KeyObject, NULL); if (!NT_SUCCESS(Status)) @@ -947,8 +953,10 @@ IN POBJECT_ATTRIBUTES ObjectAttributes) { UNICODE_STRING RemainingPath; - NTSTATUS Status; + KPROCESSOR_MODE PreviousMode; PVOID Object; + HANDLE hKey; + NTSTATUS Status = STATUS_SUCCESS; DPRINT("NtOpenKey(KH %x DA %x OA %x OA->ON '%wZ'\n", KeyHandle, @@ -956,6 +964,28 @@ ObjectAttributes, ObjectAttributes ? ObjectAttributes->ObjectName : NULL); + PreviousMode = ExGetPreviousMode(); + + if(PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForWrite(KeyHandle, + sizeof(HANDLE), + sizeof(ULONG)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } + RemainingPath.Buffer = NULL; Status = ObFindObject(ObjectAttributes, &Object, @@ -990,7 +1020,7 @@ Object, DesiredAccess, TRUE, - KeyHandle); + &hKey); ObDereferenceObject(Object); if (!NT_SUCCESS(Status)) @@ -998,7 +1028,17 @@ return(Status); } - return(STATUS_SUCCESS); + _SEH_TRY + { + *KeyHandle = hKey; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + return Status; } _____ Modified: trunk/reactos/ntoskrnl/cm/regfile.c --- trunk/reactos/ntoskrnl/cm/regfile.c 2005-01-22 15:27:06 UTC (rev 13214) +++ trunk/reactos/ntoskrnl/cm/regfile.c 2005-01-22 15:48:00 UTC (rev 13215) @@ -71,7 +71,7 @@ RootKeyCell->CellSize = -sizeof(KEY_CELL); RootKeyCell->Id = REG_KEY_CELL_ID; RootKeyCell->Flags = REG_KEY_ROOT_CELL | REG_KEY_NAME_PACKED; - NtQuerySystemTime(&RootKeyCell->LastWriteTime); + ZwQuerySystemTime(&RootKeyCell->LastWriteTime); RootKeyCell->ParentKeyOffset = 0; RootKeyCell->NumberOfSubKeys = 0; RootKeyCell->HashTableOffset = -1; @@ -384,7 +384,7 @@ /* The rest of the block is free */ FreeCell->CellSize = REG_BLOCK_SIZE - (REG_HBIN_DATA_OFFSET + sizeof(KEY_CELL)); - Status = NtWriteFile(FileHandle, + Status = ZwWriteFile(FileHandle, NULL, NULL, NULL, @@ -403,7 +403,7 @@ return(Status); } - Status = NtFlushBuffersFile(FileHandle, + Status = ZwFlushBuffersFile(FileHandle, &IoStatusBlock); return(Status); @@ -483,7 +483,7 @@ else if (!NT_SUCCESS(Status)) { DPRINT("ZwCreateFile() failed (Status %lx)\n", Status); - NtClose(HiveHandle); + ZwClose(HiveHandle); return(Status); } @@ -499,7 +499,7 @@ /* Read hive base block */ FileOffset.QuadPart = 0ULL; - Status = NtReadFile(HiveHandle, + Status = ZwReadFile(HiveHandle, 0, 0, 0, @@ -510,7 +510,7 @@ 0); if (!NT_SUCCESS(Status)) { - DPRINT("NtReadFile() failed (Status %lx)\n", Status); + DPRINT("ZwReadFile() failed (Status %lx)\n", Status); goto ByeBye; } @@ -541,7 +541,7 @@ /* Read log file header */ FileOffset.QuadPart = 0ULL; - Status = NtReadFile(LogHandle, + Status = ZwReadFile(LogHandle, 0, 0, 0, @@ -552,7 +552,7 @@ 0); if (!NT_SUCCESS(Status)) { - DPRINT("NtReadFile() failed (Status %lx)\n", Status); + DPRINT("ZwReadFile() failed (Status %lx)\n", Status); goto ByeBye; } @@ -585,14 +585,14 @@ */ /* Get file size */ - Status = NtQueryInformationFile(LogHandle, + Status = ZwQueryInformationFile(LogHandle, &IoStatusBlock, &fsi, sizeof(fsi), FileStandardInformation); if (!NT_SUCCESS(Status)) { - DPRINT("NtQueryInformationFile() failed (Status %lx)\n", Status); + DPRINT("ZwQueryInformationFile() failed (Status %lx)\n", Status); goto ByeBye; } FileSize = fsi.EndOfFile.u.LowPart; @@ -617,7 +617,7 @@ /* Read log file header */ FileOffset.QuadPart = 0ULL; - Status = NtReadFile(LogHandle, + Status = ZwReadFile(LogHandle, 0, 0, 0, @@ -628,7 +628,7 @@ 0); if (!NT_SUCCESS(Status)) { - DPRINT("NtReadFile() failed (Status %lx)\n", Status); + DPRINT("ZwReadFile() failed (Status %lx)\n", Status); goto ByeBye; } @@ -656,9 +656,9 @@ ExFreePool(LogHeader); if (LogHandle != INVALID_HANDLE_VALUE) - NtClose(LogHandle); + ZwClose(LogHandle); - NtClose(HiveHandle); + ZwClose(HiveHandle); return(Status); } @@ -929,7 +929,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("CmiCreateNewRegFile() failed (Status %lx)\n", Status); - NtClose(FileHandle); + ZwClose(FileHandle); RtlFreeUnicodeString(&RegistryHive->HiveFileName); RtlFreeUnicodeString(&RegistryHive->LogFileName); return(Status); @@ -972,7 +972,7 @@ ObDereferenceObject(SectionObject); RtlFreeUnicodeString(&RegistryHive->HiveFileName); RtlFreeUnicodeString(&RegistryHive->LogFileName); - NtClose(FileHandle); + ZwClose(FileHandle); return(Status); } DPRINT("ViewBase %p ViewSize %lx\n", ViewBase, ViewSize); @@ -996,7 +996,7 @@ ObDereferenceObject(SectionObject); RtlFreeUnicodeString(&RegistryHive->HiveFileName); RtlFreeUnicodeString(&RegistryHive->LogFileName); - NtClose(FileHandle); + ZwClose(FileHandle); return STATUS_INSUFFICIENT_RESOURCES; } RtlZeroMemory (RegistryHive->BlockList, @@ -1013,7 +1013,7 @@ ObDereferenceObject(SectionObject); RtlFreeUnicodeString(&RegistryHive->HiveFileName); RtlFreeUnicodeString(&RegistryHive->LogFileName); - NtClose(FileHandle); + ZwClose(FileHandle); return Status; } @@ -1023,7 +1023,7 @@ ObDereferenceObject(SectionObject); /* Close the hive file */ - NtClose(FileHandle); + ZwClose(FileHandle); /* Initialize the free cell list */ Status = CmiCreateHiveFreeCellList (RegistryHive); @@ -1438,7 +1438,7 @@ /* Write hive block and block bitmap */ FileOffset.QuadPart = (ULONGLONG)0; - Status = NtWriteFile(FileHandle, + Status = ZwWriteFile(FileHandle, NULL, NULL, NULL, @@ -1449,8 +1449,8 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - NtClose(FileHandle); + DPRINT("ZwWriteFile() failed (Status %lx)\n", Status); + ZwClose(FileHandle); ExFreePool(Buffer); return(Status); } @@ -1479,7 +1479,7 @@ DPRINT("File offset %I64x\n", FileOffset.QuadPart); /* Write hive block */ - Status = NtWriteFile(FileHandle, + Status = ZwWriteFile(FileHandle, NULL, NULL, NULL, @@ -1490,8 +1490,8 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("NtWriteFile() failed (Status %lx)\n", Status); - NtClose(FileHandle); + DPRINT1("ZwWriteFile() failed (Status %lx)\n", Status); + ZwClose(FileHandle); return(Status); } @@ -1501,40 +1501,40 @@ /* Truncate log file */ EndOfFileInfo.EndOfFile.QuadPart = FileOffset.QuadPart; - Status = NtSetInformationFile(FileHandle, + Status = ZwSetInformationFile(FileHandle, &IoStatusBlock, &EndOfFileInfo, sizeof(FILE_END_OF_FILE_INFORMATION), FileEndOfFileInformation); if (!NT_SUCCESS(Status)) { - DPRINT("NtSetInformationFile() failed (Status %lx)\n", Status); - NtClose(FileHandle); + DPRINT("ZwSetInformationFile() failed (Status %lx)\n", Status); + ZwClose(FileHandle); return(Status); } FileAllocationInfo.AllocationSize.QuadPart = FileOffset.QuadPart; - Status = NtSetInformationFile(FileHandle, + Status = ZwSetInformationFile(FileHandle, &IoStatusBlock, &FileAllocationInfo, sizeof(FILE_ALLOCATION_INFORMATION), FileAllocationInformation); if (!NT_SUCCESS(Status)) { - DPRINT("NtSetInformationFile() failed (Status %lx)\n", Status); - NtClose(FileHandle); + DPRINT("ZwSetInformationFile() failed (Status %lx)\n", Status); + ZwClose(FileHandle); return(Status); } /* Flush the log file */ - Status = NtFlushBuffersFile(FileHandle, + Status = ZwFlushBuffersFile(FileHandle, &IoStatusBlock); if (!NT_SUCCESS(Status)) { - DPRINT("NtFlushBuffersFile() failed (Status %lx)\n", Status); + DPRINT("ZwFlushBuffersFile() failed (Status %lx)\n", Status); } - NtClose(FileHandle); + ZwClose(FileHandle); return(Status); } @@ -1616,7 +1616,7 @@ /* Write hive block and block bitmap */ FileOffset.QuadPart = (ULONGLONG)0; - Status = NtWriteFile(FileHandle, + Status = ZwWriteFile(FileHandle, NULL, NULL, NULL, @@ -1627,8 +1627,8 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - NtClose(FileHandle); + DPRINT("ZwWriteFile() failed (Status %lx)\n", Status); + ZwClose(FileHandle); ExFreePool(Buffer); return(Status); } @@ -1636,14 +1636,14 @@ ExFreePool(Buffer); /* Flush the log file */ - Status = NtFlushBuffersFile(FileHandle, + Status = ZwFlushBuffersFile(FileHandle, &IoStatusBlock); if (!NT_SUCCESS(Status)) { - DPRINT("NtFlushBuffersFile() failed (Status %lx)\n", Status); + DPRINT("ZwFlushBuffersFile() failed (Status %lx)\n", Status); } - NtClose(FileHandle); + ZwClose(FileHandle); return(Status); } @@ -1697,20 +1697,20 @@ /* Truncate log file */ EndOfFileInfo.EndOfFile.QuadPart = (ULONGLONG)BufferSize; - Status = NtSetInformationFile(FileHandle, + Status = ZwSetInformationFile(FileHandle, &IoStatusBlock, &EndOfFileInfo, sizeof(FILE_END_OF_FILE_INFORMATION), FileEndOfFileInformation); if (!NT_SUCCESS(Status)) { - DPRINT("NtSetInformationFile() failed (Status %lx)\n", Status); - NtClose(FileHandle); + DPRINT("ZwSetInformationFile() failed (Status %lx)\n", Status); + ZwClose(FileHandle); return(Status); } FileAllocationInfo.AllocationSize.QuadPart = (ULONGLONG)BufferSize; - Status = NtSetInformationFile(FileHandle, + Status = ZwSetInformationFile(FileHandle, &IoStatusBlock, &FileAllocationInfo, sizeof(FILE_ALLOCATION_INFORMATION), @@ -1718,19 +1718,19 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtSetInformationFile() failed (Status %lx)\n", Status); - NtClose(FileHandle); + ZwClose(FileHandle); return(Status); } /* Flush the log file */ - Status = NtFlushBuffersFile(FileHandle, + Status = ZwFlushBuffersFile(FileHandle, &IoStatusBlock); if (!NT_SUCCESS(Status)) { - DPRINT("NtFlushBuffersFile() failed (Status %lx)\n", Status); + DPRINT("ZwFlushBuffersFile() failed (Status %lx)\n", Status); } - NtClose(FileHandle); + ZwClose(FileHandle); return(Status); } @@ -1780,7 +1780,7 @@ /* Write hive block */ FileOffset.QuadPart = (ULONGLONG)0; - Status = NtWriteFile(FileHandle, + Status = ZwWriteFile(FileHandle, NULL, NULL, NULL, @@ -1791,8 +1791,8 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - NtClose(FileHandle); + DPRINT("ZwWriteFile() failed (Status %lx)\n", Status); + ZwClose(FileHandle); return(Status); } @@ -1819,7 +1819,7 @@ DPRINT(" File offset %I64x\n", FileOffset.QuadPart); /* Write hive block */ - Status = NtWriteFile(FileHandle, + Status = ZwWriteFile(FileHandle, NULL, NULL, NULL, @@ -1830,22 +1830,22 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - NtClose(FileHandle); + DPRINT("ZwWriteFile() failed (Status %lx)\n", Status); + ZwClose(FileHandle); return(Status); } BlockIndex++; } - Status = NtFlushBuffersFile(FileHandle, + Status = ZwFlushBuffersFile(FileHandle, &IoStatusBlock); if (!NT_SUCCESS(Status)) { - DPRINT("NtFlushBuffersFile() failed (Status %lx)\n", Status); + DPRINT("ZwFlushBuffersFile() failed (Status %lx)\n", Status); } - NtClose(FileHandle); + ZwClose(FileHandle); return(Status); } @@ -1892,7 +1892,7 @@ /* Write hive block */ FileOffset.QuadPart = (ULONGLONG)0; - Status = NtWriteFile(FileHandle, + Status = ZwWriteFile(FileHandle, NULL, NULL, NULL, @@ -1903,19 +1903,19 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - NtClose(FileHandle); + DPRINT("ZwWriteFile() failed (Status %lx)\n", Status); + ZwClose(FileHandle); return(Status); } - Status = NtFlushBuffersFile(FileHandle, + Status = ZwFlushBuffersFile(FileHandle, &IoStatusBlock); if (!NT_SUCCESS(Status)) { - DPRINT("NtFlushBuffersFile() failed (Status %lx)\n", Status); + DPRINT("ZwFlushBuffersFile() failed (Status %lx)\n", Status); } - NtClose(FileHandle); + ZwClose(FileHandle); return(Status); } @@ -1939,7 +1939,7 @@ &RegistryHive->LogFileName); /* Update hive header modification time */ - NtQuerySystemTime(&RegistryHive->HiveHeader->DateModified); + ZwQuerySystemTime(&RegistryHive->HiveHeader->DateModified); /* Start log update */ Status = CmiStartLogUpdate(RegistryHive); @@ -2436,7 +2436,7 @@ { NewKeyCell->Id = REG_KEY_CELL_ID; NewKeyCell->Flags = 0; - NtQuerySystemTime(&NewKeyCell->LastWriteTime); + ZwQuerySystemTime(&NewKeyCell->LastWriteTime); NewKeyCell->ParentKeyOffset = -1; NewKeyCell->NumberOfSubKeys = 0; NewKeyCell->HashTableOffset = -1; @@ -2552,7 +2552,7 @@ ParentKeyCell->NumberOfSubKeys++; } - NtQuerySystemTime (&ParentKeyCell->LastWriteTime); + ZwQuerySystemTime (&ParentKeyCell->LastWriteTime); CmiMarkBlockDirty (RegistryHive, ParentKey->KeyCellOffset); return(Status); @@ -2710,7 +2710,7 @@ } } - NtQuerySystemTime(&ParentKey->KeyCell->LastWriteTime); + ZwQuerySystemTime(&ParentKey->KeyCell->LastWriteTime); CmiMarkBlockDirty(ParentKey->RegistryHive, ParentKey->KeyCellOffset); } @@ -3210,7 +3210,7 @@ /* Update time of heap */ if (!IsNoFileHive(RegistryHive)) - NtQuerySystemTime(&Bin->DateModified); + ZwQuerySystemTime(&Bin->DateModified); } /* Destroy the value cell */ @@ -3219,7 +3219,7 @@ /* Update time of heap */ if (!IsNoFileHive(RegistryHive) && CmiGetCell (RegistryHive, ValueCellOffset, &Bin)) { - NtQuerySystemTime(&Bin->DateModified); + ZwQuerySystemTime(&Bin->DateModified); } return Status; @@ -3254,7 +3254,7 @@ RegistryHive->FileSize += BinSize; tmpBin->BinSize = BinSize; tmpBin->Unused1 = 0; - NtQuerySystemTime(&tmpBin->DateModified); + ZwQuerySystemTime(&tmpBin->DateModified); tmpBin->Unused2 = 0; DPRINT (" BinOffset %lx BinSize %lx\n", tmpBin->BinOffset,tmpBin->BinSize); @@ -3382,7 +3382,7 @@ return STATUS_UNSUCCESSFUL; } - NtQuerySystemTime(&Bin->DateModified); + ZwQuerySystemTime(&Bin->DateModified); CmiMarkBlockDirty(RegistryHive, RegistryHive->FreeListOffset[i]); if ((i + 1) < RegistryHive->FreeListSize) @@ -3471,7 +3471,7 @@ /* Update time of heap */ if (!IsNoFileHive(RegistryHive) && CmiGetCell (RegistryHive, CellOffset,&pBin)) - NtQuerySystemTime(&pBin->DateModified); + ZwQuerySystemTime(&pBin->DateModified); CmiMarkBlockDirty(RegistryHive, CellOffset); } @@ -4247,7 +4247,7 @@ /* Write hive block */ FileOffset.QuadPart = (ULONGLONG)0; - Status = NtWriteFile (FileHandle, + Status = ZwWriteFile (FileHandle, NULL, NULL, NULL, @@ -4258,7 +4258,7 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT1 ("NtWriteFile() failed (Status %lx)\n", Status); + DPRINT1 ("ZwWriteFile() failed (Status %lx)\n", Status); return Status; } @@ -4272,7 +4272,7 @@ DPRINT ("File offset %I64x\n", FileOffset.QuadPart); /* Write hive block */ - Status = NtWriteFile (FileHandle, + Status = ZwWriteFile (FileHandle, NULL, NULL, NULL, @@ -4283,16 +4283,16 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT1 ("NtWriteFile() failed (Status %lx)\n", Status); + DPRINT1 ("ZwWriteFile() failed (Status %lx)\n", Status); return Status; } } - Status = NtFlushBuffersFile (FileHandle, + Status = ZwFlushBuffersFile (FileHandle, &IoStatusBlock); if (!NT_SUCCESS(Status)) { - DPRINT1 ("NtFlushBuffersFile() failed (Status %lx)\n", Status); + DPRINT1 ("ZwFlushBuffersFile() failed (Status %lx)\n", Status); } DPRINT ("CmiSaveTempHive() done\n"); _____ Modified: trunk/reactos/ntoskrnl/cm/registry.c --- trunk/reactos/ntoskrnl/cm/registry.c 2005-01-22 15:27:06 UTC (rev 13214) +++ trunk/reactos/ntoskrnl/cm/registry.c 2005-01-22 15:48:00 UTC (rev 13215) @@ -73,7 +73,7 @@ BufferSize = sizeof(KEY_NODE_INFORMATION) + 4096; KeyInfo = ExAllocatePool(PagedPool, BufferSize); - Status = NtEnumerateKey(Key, + Status = ZwEnumerateKey(Key, Index, KeyNodeInformation, KeyInfo, @@ -111,7 +111,7 @@ NULL, NULL); - Status = NtOpenKey(&SubKey, + Status = ZwOpenKey(&SubKey, KEY_ALL_ACCESS, &ObjectAttributes); @@ -119,7 +119,7 @@ CmiCheckKey(Verbose, SubKey); - NtClose(SubKey); + ZwClose(SubKey); Index++; } @@ -145,7 +145,7 @@ BufferSize = sizeof(KEY_NODE_INFORMATION) + 4096; ValueInfo = ExAllocatePool(PagedPool, BufferSize); - Status = NtEnumerateValueKey(Key, + Status = ZwEnumerateValueKey(Key, Index, KeyNodeInformation, ValueInfo, @@ -209,7 +209,7 @@ NULL, NULL); - Status = NtOpenKey(&Key, + Status = ZwOpenKey(&Key, KEY_ALL_ACCESS, &ObjectAttributes); @@ -225,7 +225,7 @@ CmiCheckKey(Verbose, Key); - NtClose(Key); + ZwClose(Key); } @@ -341,7 +341,7 @@ 0, RootKeyHandle, NULL); - Status = NtCreateKey(&KeyHandle, + Status = ZwCreateKey(&KeyHandle, STANDARD_RIGHTS_REQUIRED, &ObjectAttributes, 0, @@ -358,7 +358,7 @@ 0, RootKeyHandle, NULL); - Status = NtCreateKey(&KeyHandle, + Status = ZwCreateKey(&KeyHandle, STANDARD_RIGHTS_REQUIRED, &ObjectAttributes, 0, @@ -541,7 +541,7 @@ OBJ_CASE_INSENSITIVE | OBJ_OPENIF | OBJ_OPENLINK, NULL, NULL); - Status = NtCreateKey(&KeyHandle, + Status = ZwCreateKey(&KeyHandle, KEY_ALL_ACCESS | KEY_CREATE_LINK, &ObjectAttributes, 0, @@ -550,13 +550,13 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("NtCreateKey() failed (Status %lx)\n", Status); + DPRINT1("ZwCreateKey() failed (Status %lx)\n", Status); return(Status); } RtlRosInitUnicodeStringFromLiteral(&LinkValue, L"SymbolicLinkValue"); - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &LinkValue, 0, REG_LINK, @@ -564,10 +564,10 @@ TargetNameLength); if (!NT_SUCCESS(Status)) { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); + DPRINT1("ZwSetValueKey() failed (Status %lx)\n", Status); } - NtClose(KeyHandle); + ZwClose(KeyHandle); return Status; } @@ -721,7 +721,7 @@ KernelMode, (PVOID*)&KeyObject, NULL); - NtClose (KeyHandle); + ZwClose (KeyHandle); if (!NT_SUCCESS(Status)) { DPRINT1 ("ObReferenceObjectByName() failed (Status %lx)\n", Status); @@ -776,7 +776,7 @@ OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtCreateKey (&KeyHandle, + Status = ZwCreateKey (&KeyHandle, KEY_ALL_ACCESS, &ObjectAttributes, 0, @@ -785,10 +785,10 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT1 ("NtCreateKey() failed (Status %lx)\n", Status); + DPRINT1 ("ZwCreateKey() failed (Status %lx)\n", Status); return Status; } - NtClose (KeyHandle); + ZwClose (KeyHandle); /* Link 'CurrentControlSet' to 'ControlSet001' key */ RtlRosInitUnicodeStringFromLiteral (&ControlSetLinkName, @@ -798,7 +798,7 @@ OBJ_CASE_INSENSITIVE | OBJ_OPENIF | OBJ_OPENLINK, NULL, NULL); - Status = NtCreateKey (&KeyHandle, + Status = ZwCreateKey (&KeyHandle, KEY_ALL_ACCESS | KEY_CREATE_LINK, &ObjectAttributes, 0, @@ -807,13 +807,13 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT1 ("NtCreateKey() failed (Status %lx)\n", Status); + DPRINT1 ("ZwCreateKey() failed (Status %lx)\n", Status); return Status; } RtlRosInitUnicodeStringFromLiteral (&ControlSetValueName, L"SymbolicLinkValue"); - Status = NtSetValueKey (KeyHandle, + Status = ZwSetValueKey (KeyHandle, &ControlSetValueName, 0, REG_LINK, @@ -821,9 +821,9 @@ ControlSetKeyName.Length); if (!NT_SUCCESS(Status)) { - DPRINT1 ("NtSetValueKey() failed (Status %lx)\n", Status); + DPRINT1 ("ZwSetValueKey() failed (Status %lx)\n", Status); } - NtClose (KeyHandle); + ZwClose (KeyHandle); return STATUS_SUCCESS; } @@ -859,12 +859,12 @@ OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtOpenKey(&KeyHandle, + Status = ZwOpenKey(&KeyHandle, KEY_ALL_ACCESS, &ObjectAttributes); if (!NT_SUCCESS(Status)) { - DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); + DPRINT1("ZwOpenKey() failed (Status %lx)\n", Status); return(Status); } @@ -876,17 +876,17 @@ BufferSize); if (ValueInfo == NULL) { - NtClose(KeyHandle); + ZwClose(KeyHandle); return(STATUS_INSUFFICIENT_RESOURCES); } - Status = NtQueryValueKey(KeyHandle, + Status = ZwQueryValueKey(KeyHandle, &ValueName, KeyValuePartialInformation, ValueInfo, BufferSize, &ResultSize); - NtClose(KeyHandle); + ZwClose(KeyHandle); if (!NT_SUCCESS(Status)) { ExFreePool(ValueInfo); _____ Modified: trunk/reactos/ntoskrnl/ex/uuid.c --- trunk/reactos/ntoskrnl/ex/uuid.c 2005-01-22 15:27:06 UTC (rev 13214) +++ trunk/reactos/ntoskrnl/ex/uuid.c 2005-01-22 15:48:00 UTC (rev 13215) @@ -72,12 +72,12 @@ OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtOpenKey(&KeyHandle, + Status = ZwOpenKey(&KeyHandle, KEY_QUERY_VALUE, &ObjectAttributes); if (!NT_SUCCESS(Status)) { - DPRINT("NtOpenKey() failed (Status %lx)\n", Status); + DPRINT("ZwOpenKey() failed (Status %lx)\n", Status); return Status; } @@ -85,16 +85,16 @@ L"UuidSequenceNumber"); ValueInfo = (PKEY_VALUE_PARTIAL_INFORMATION)ValueBuffer; - Status = NtQueryValueKey(KeyHandle, + Status = ZwQueryValueKey(KeyHandle, &Name, KeyValuePartialInformation, ValueBuffer, VALUE_BUFFER_SIZE, &ValueLength); - NtClose(KeyHandle); + ZwClose(KeyHandle); if (!NT_SUCCESS(Status)) { - DPRINT("NtQueryValueKey() failed (Status %lx)\n", Status); + DPRINT("ZwQueryValueKey() failed (Status %lx)\n", Status); return Status; } @@ -122,27 +122,27 @@ OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtOpenKey(&KeyHandle, + Status = ZwOpenKey(&KeyHandle, KEY_SET_VALUE, &ObjectAttributes); if (!NT_SUCCESS(Status)) { - DPRINT("NtOpenKey() failed (Status %lx)\n", Status); + DPRINT("ZwOpenKey() failed (Status %lx)\n", Status); return Status; } RtlInitUnicodeString(&Name, L"UuidSequenceNumber"); - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &Name, 0, REG_DWORD, Sequence, sizeof(ULONG)); - NtClose(KeyHandle); + ZwClose(KeyHandle); if (!NT_SUCCESS(Status)) { - DPRINT("NtSetValueKey() failed (Status %lx)\n", Status); + DPRINT("ZwSetValueKey() failed (Status %lx)\n", Status); } return Status;

19 years, 11 months

← Newer
1
...
13
14
15
16
17
18
19
...
71
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 January 2005