Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 37004: - Remove ntdll exports not applicable for amd64, fix a couple of broken export names and stub out RtlInitializeCriticalSectionEx until its parameters are determined - Add rtl and ntdll stubs for arch specific routines - Now ntdll almost links, but some missing crt support is left to do
by sginsberg＠svn.reactos.org 26 Oct '08

26 Oct '08

Author: sginsberg Date: Sun Oct 26 16:35:03 2008 New Revision: 37004 URL: http://svn.reactos.org/svn/reactos?rev=37004&view=rev Log: - Remove ntdll exports not applicable for amd64, fix a couple of broken export names and stub out RtlInitializeCriticalSectionEx until its parameters are determined - Add rtl and ntdll stubs for arch specific routines - Now ntdll almost links, but some missing crt support is left to do Added: branches/ros-amd64-bringup/reactos/dll/ntdll/dispatch/amd64/ (with props) branches/ros-amd64-bringup/reactos/dll/ntdll/dispatch/amd64/stubs.c (with props) branches/ros-amd64-bringup/reactos/lib/rtl/amd64/stubs.c (with props) Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_amd64.def branches/ros-amd64-bringup/reactos/dll/ntdll/ntdll.rbuild branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_amd64.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_amd64.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_amd64.def [iso-8859-1] Sun Oct 26 16:35:03 2008 @@ -39,9 +39,6 @@ KiUserApcDispatcher KiUserCallbackDispatcher KiUserExceptionDispatcher -KiIntSystemCall -KiFastSystemCallRet -KiFastSystemCall LdrAccessResource LdrAddRefDll LdrDisableThreadCalloutsForDll @@ -475,7 +472,7 @@ RtlFreeUnicodeString RtlFreeUserThreadStack RtlGUIDFromString -RtlGeneratedotName +RtlGenerate8dot3Name RtlGetAce ;RtlGetCallersAddress RtlGetCompressionWorkSpaceSize @@ -488,7 +485,7 @@ RtlGetFullPathName_U RtlGetGroupSecurityDescriptor RtlGetLastNtStatus -RtlGetLastWinError +RtlGetLastWin32Error RtlGetLongestNtPathLength RtlGetNextRange RtlGetNtGlobalFlags @@ -519,7 +516,7 @@ RtlInitializeConditionVariable RtlInitializeContext RtlInitializeCriticalSection -RtlInitializeCriticalSectionEx +;RtlInitializeCriticalSectionEx RtlInitializeCriticalSectionAndSpinCount RtlInitializeGenericTable RtlInitializeGenericTableAvl @@ -533,26 +530,26 @@ RtlInsertElementGenericTableAvl RtlInsertElementGenericTableFull RtlInsertElementGenericTableFullAvl -RtlIntToUnicodeString +RtlInt64ToUnicodeString RtlIntegerToChar RtlIntegerToUnicodeString RtlInvertRangeList -RtlIpvAddressToStringA -RtlIpvAddressToStringExA -RtlIpvAddressToStringExW -RtlIpvAddressToStringW -RtlIpvStringToAddressA -RtlIpvStringToAddressExA -RtlIpvStringToAddressExW -RtlIpvStringToAddressW -RtlIpvAddressToStringA -RtlIpvAddressToStringExA -RtlIpvAddressToStringExW -RtlIpvAddressToStringW -RtlIpvStringToAddressA -RtlIpvStringToAddressExA -RtlIpvStringToAddressExW -RtlIpvStringToAddressW +RtlIpv4AddressToStringA +RtlIpv4AddressToStringExA +RtlIpv4AddressToStringExW +RtlIpv4AddressToStringW +RtlIpv4StringToAddressA +RtlIpv4StringToAddressExA +RtlIpv4StringToAddressExW +RtlIpv4StringToAddressW +RtlIpv6AddressToStringA +RtlIpv6AddressToStringExA +RtlIpv6AddressToStringExW +RtlIpv6AddressToStringW +RtlIpv6StringToAddressA +RtlIpv6StringToAddressExA +RtlIpv6StringToAddressExW +RtlIpv6StringToAddressW RtlIsDosDeviceName_U RtlIsGenericTableEmpty RtlIsGenericTableEmptyAvl @@ -635,11 +632,11 @@ ;RtlRemoteCall RtlRemoveVectoredExceptionHandler RtlResetRtlTranslations -RtlRestoreLastWinError=RtlSetLastWinError +RtlRestoreLastWin32Error=RtlSetLastWin32Error RtlRunDecodeUnicodeString RtlRunEncodeUnicodeString -RtlSecondsSinceToTime -RtlSecondsSinceToTime +RtlSecondsSince1970ToTime +RtlSecondsSince1980ToTime RtlSelfRelativeToAbsoluteSD RtlSelfRelativeToAbsoluteSD2 RtlSetAllBits @@ -653,8 +650,8 @@ RtlSetEnvironmentVariable RtlSetGroupSecurityDescriptor RtlSetInformationAcl -RtlSetLastWinError -RtlSetLastWinErrorAndNtStatusFromNtStatus +RtlSetLastWin32Error +RtlSetLastWin32ErrorAndNtStatusFromNtStatus RtlSetOwnerSecurityDescriptor RtlSetProcessIsCritical RtlSetSaclSecurityDescriptor @@ -970,19 +967,9 @@ __iscsym __iscsymf __toascii -_alldiv -_allmul -_alloca_probe -_allrem -_allshl -_allshr _atoi64 -_aulldiv -_aullrem -_aullshr _chkstk _fltused -_ftol _itoa _itow _i64toa Propchange: branches/ros-amd64-bringup/reactos/dll/ntdll/dispatch/amd64/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Oct 26 16:35:03 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/ros-amd64-bringup/reactos/dll/ntdll/dispatch/amd64/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/ros-amd64-bringup/reactos/dll/ntdll/dispatch/amd64/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/ros-amd64-bringup/reactos/dll/ntdll/dispatch/amd64/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/ros-amd64-bringup/reactos/dll/ntdll/dispatch/amd64/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/dispatch/amd64/stubs.c (added) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/dispatch/amd64/stubs.c [iso-8859-1] Sun Oct 26 16:35:03 2008 @@ -1,0 +1,43 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS NT Library + * FILE: dll/ntdll/dispatch/amd64/stubs.c + * PURPOSE: AMD64 stubs + * PROGRAMMERS: Stefan Ginsberg (stefan.ginsberg(a)reactos.org) + */ + +/* INCLUDES *****************************************************************/ + +#include <ntdll.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @unimplemented + */ +VOID +NTAPI +LdrInitializeThunk(ULONG Unknown1, // FIXME: Parameters! + ULONG Unknown2, + ULONG Unknown3, + ULONG Unknown4) +{ + UNIMPLEMENTED; + return; +} + +/* + * @unimplemented + */ +VOID +NTAPI +KiUserApcDispatcher(IN PVOID NormalRoutine, + IN PVOID NormalContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2) +{ + UNIMPLEMENTED; + return; +} Propchange: branches/ros-amd64-bringup/reactos/dll/ntdll/dispatch/amd64/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] Sun Oct 26 16:35:03 2008 @@ -31,6 +31,11 @@ <file>dispatch.S</file> </directory> </if> + <if property="ARCH" value="amd64"> + <directory name="amd64"> + <file>stubs.c</file> + </directory> + </if> <if property="ARCH" value="arm"> <directory name="arm"> <file>stubs_asm.s</file> Added: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/amd64/stubs.c (added) +++ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/stubs.c [iso-8859-1] Sun Oct 26 16:35:03 2008 @@ -1,0 +1,77 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Run-Time Library + * PURPOSE: AMD64 stubs + * FILE: lib/rtl/amd64/stubs.c + * PROGRAMMERS: Stefan Ginsberg (stefan.ginsberg(a)reactos.org) + */ + +/* INCLUDES *****************************************************************/ + +#include <rtl.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @unimplemented + */ +PVOID +NTAPI +RtlLookupFunctionEntry(IN ULONGLONG ControlPC, + OUT PULONGLONG ImageBase, + OUT PULONGLONG TargetGp) +{ + UNIMPLEMENTED; + return NULL; +} + +/* + * @unimplemented + */ +VOID +NTAPI +RtlInitializeContext(IN HANDLE ProcessHandle, + OUT PCONTEXT ThreadContext, + IN PVOID ThreadStartParam OPTIONAL, + IN PTHREAD_START_ROUTINE ThreadStartAddress, + IN PINITIAL_TEB InitialTeb) +{ + UNIMPLEMENTED; + return; +} + +/* + * @unimplemented + */ +VOID +NTAPI +RtlCaptureContext(OUT PCONTEXT ContextRecord) +{ + UNIMPLEMENTED; + return; +} + +/* + * @unimplemented + */ +PVOID +NTAPI +RtlpGetExceptionAddress(VOID) +{ + UNIMPLEMENTED; + return NULL; +} + +/* + * @unimplemented + */ +BOOLEAN +NTAPI +RtlDispatchException(IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context) +{ + UNIMPLEMENTED; + return FALSE; +} Propchange: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild [iso-8859-1] Sun Oct 26 16:35:03 2008 @@ -39,7 +39,10 @@ <if property="ARCH" value="amd64"> <directory name="amd64"> <file>debug_asm.S</file> + <file>stubs.c</file> </directory> + <file>mem.c</file> + <file>memgen.c</file> </if> <directory name="austin"> <file>avl.c</file>

1 0

[cgutman] 37003: - Simplify port allocation
by cgutman＠svn.reactos.org 26 Oct '08

26 Oct '08

Author: cgutman Date: Sun Oct 26 16:33:06 2008 New Revision: 37003 URL: http://svn.reactos.org/svn/reactos?rev=37003&view=rev Log: - Simplify port allocation Modified: branches/aicom-network-fixes/drivers/network/tcpip/include/ports.h branches/aicom-network-fixes/lib/drivers/ip/network/ports.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/include/ports.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/include/ports.h [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/include/ports.h [iso-8859-1] Sun Oct 26 16:33:06 2008 @@ -16,7 +16,6 @@ PVOID ProtoBitBuffer; UINT StartingPort; UINT PortsToOversee; - UINT LastAllocatedPort; FAST_MUTEX Mutex; } PORT_SET, *PPORT_SET; Modified: branches/aicom-network-fixes/lib/drivers/ip/network/ports.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/ports.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/ports.c [iso-8859-1] Sun Oct 26 16:33:06 2008 @@ -15,8 +15,7 @@ UINT PortsToManage ) { PortSet->StartingPort = StartingPort; PortSet->PortsToOversee = PortsToManage; - PortSet->LastAllocatedPort = PortSet->StartingPort + - PortSet->PortsToOversee - 1; + PortSet->ProtoBitBuffer = PoolAllocateBuffer( (PortSet->PortsToOversee + 7) / 8 ); if(!PortSet->ProtoBitBuffer) return STATUS_INSUFFICIENT_RESOURCES; @@ -43,8 +42,13 @@ BOOLEAN Clear; Port = htons(Port); - ASSERT(Port >= PortSet->StartingPort); - ASSERT(Port < PortSet->StartingPort + PortSet->PortsToOversee); + + if ((Port < PortSet->StartingPort) || + (Port > PortSet->StartingPort + PortSet->PortsToOversee)) + { + return FALSE; + } + Port -= PortSet->StartingPort; ExAcquireFastMutex( &PortSet->Mutex ); @@ -57,64 +61,42 @@ ULONG AllocateAnyPort( PPORT_SET PortSet ) { ULONG AllocatedPort; - ULONG Next; - - if (PortSet->StartingPort + PortSet->PortsToOversee <= - PortSet->LastAllocatedPort + 1) { - Next = PortSet->StartingPort; - } else { - Next = PortSet->LastAllocatedPort + 1; - } - Next -= PortSet->StartingPort; ExAcquireFastMutex( &PortSet->Mutex ); - AllocatedPort = RtlFindClearBits( &PortSet->ProtoBitmap, 1, Next ); + AllocatedPort = RtlFindClearBits( &PortSet->ProtoBitmap, 1, 0 ); if( AllocatedPort != (ULONG)-1 ) { RtlSetBit( &PortSet->ProtoBitmap, AllocatedPort ); AllocatedPort += PortSet->StartingPort; - PortSet->LastAllocatedPort = AllocatedPort; } ExReleaseFastMutex( &PortSet->Mutex ); AllocatedPort = htons(AllocatedPort); - - ASSERT(AllocatedPort >= PortSet->StartingPort); - ASSERT(AllocatedPort < PortSet->StartingPort + PortSet->PortsToOversee); return AllocatedPort; } ULONG AllocatePortFromRange( PPORT_SET PortSet, ULONG Lowest, ULONG Highest ) { ULONG AllocatedPort; - ULONG Next; - if (PortSet->StartingPort + PortSet->PortsToOversee <= - PortSet->LastAllocatedPort + 1) { - Next = PortSet->StartingPort; - } else { - Next = PortSet->LastAllocatedPort + 1; - } - if (Next < Lowest || Highest <= Next) { - Next = Lowest; - } - Next -= PortSet->StartingPort; + + if (Lowest < PortSet->StartingPort) + Lowest = PortSet->StartingPort; + + if (Highest > PortSet->StartingPort + PortSet->PortsToOversee) + Highest = PortSet->StartingPort + PortSet->PortsToOversee; + Lowest -= PortSet->StartingPort; Highest -= PortSet->StartingPort; ExAcquireFastMutex( &PortSet->Mutex ); - AllocatedPort = RtlFindClearBits( &PortSet->ProtoBitmap, 1, Next ); - if( AllocatedPort != (ULONG)-1 && AllocatedPort >= Lowest && - AllocatedPort <= Highest) { + AllocatedPort = RtlFindClearBits( &PortSet->ProtoBitmap, 1, Lowest ); + if( AllocatedPort != (ULONG)-1 && AllocatedPort <= Highest) { RtlSetBit( &PortSet->ProtoBitmap, AllocatedPort ); AllocatedPort += PortSet->StartingPort; - PortSet->LastAllocatedPort = AllocatedPort; } ExReleaseFastMutex( &PortSet->Mutex ); AllocatedPort = htons(AllocatedPort); - ASSERT(AllocatedPort >= PortSet->StartingPort); - ASSERT(AllocatedPort < PortSet->StartingPort + PortSet->PortsToOversee); - return AllocatedPort; }

1 0

[gschneider] 37002: DWORD is unsigned, so cast to signed type before checking for < 0. Fixes one gdi32 winetest.
by gschneider＠svn.reactos.org 26 Oct '08

26 Oct '08

Author: gschneider Date: Sun Oct 26 16:06:11 2008 New Revision: 37002 URL: http://svn.reactos.org/svn/reactos?rev=37002&view=rev Log: DWORD is unsigned, so cast to signed type before checking for < 0. Fixes one gdi32 winetest. Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] Sun Oct 26 16:06:11 2008 @@ -293,7 +293,7 @@ DWORD* pSafeStyle = NULL; HPEN hPen; - if (dwStyleCount < 0) return 0; + if ((int)dwStyleCount < 0) return 0; if (dwStyleCount > 16) { SetLastWin32Error(ERROR_INVALID_PARAMETER);

1 0

[ekohl] 37001: Initialize _RetVal properly in order to avoid compiler warnings.
by ekohl＠svn.reactos.org 26 Oct '08

26 Oct '08

Author: ekohl Date: Sun Oct 26 16:03:11 2008 New Revision: 37001 URL: http://svn.reactos.org/svn/reactos?rev=37001&view=rev Log: Initialize _RetVal properly in order to avoid compiler warnings. Modified: trunk/reactos/tools/widl/proxy.c Modified: trunk/reactos/tools/widl/proxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/proxy.c?rev=370… ============================================================================== --- trunk/reactos/tools/widl/proxy.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/proxy.c [iso-8859-1] Sun Oct 26 16:03:11 2008 @@ -267,7 +267,12 @@ if (has_ret) { print_proxy( "" ); write_type_decl_left(proxy, get_func_return_type(cur)); - print_proxy( " _RetVal;\n"); + + /* Initialize _RetVal properly in order to avoid compiler warnings */ + if (is_ptr(get_func_return_type(cur)) || is_array(get_func_return_type(cur))) + print_proxy(" _RetVal = NULL;\n"); + else + print_proxy(" _RetVal = 0;\n"); } print_proxy( "RPC_MESSAGE _RpcMessage;\n" ); print_proxy( "MIDL_STUB_MESSAGE _StubMsg;\n" );

1 0

[cgutman] 37000: - Check the status of AddGenericHeaderIPv4 - Fix a leak
by cgutman＠svn.reactos.org 26 Oct '08

26 Oct '08

Author: cgutman Date: Sun Oct 26 15:57:26 2008 New Revision: 37000 URL: http://svn.reactos.org/svn/reactos?rev=37000&view=rev Log: - Check the status of AddGenericHeaderIPv4 - Fix a leak Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/udp/udp.c Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] Sun Oct 26 15:57:26 2008 @@ -33,15 +33,19 @@ */ { PUDP_HEADER UDPHeader; + NTSTATUS Status; TI_DbgPrint(MID_TRACE, ("Packet: %x NdisPacket %x\n", IPPacket, IPPacket->NdisPacket)); - AddGenericHeaderIPv4 + Status = AddGenericHeaderIPv4 ( RemoteAddress, RemotePort, LocalAddress, LocalPort, IPPacket, DataLength, IPPROTO_UDP, sizeof(UDP_HEADER), (PVOID *)&UDPHeader ); + + if (!NT_SUCCESS(Status)) + return Status; /* Build UDP header */ UDPHeader = (PUDP_HEADER)((ULONG_PTR)IPPacket->Data - sizeof(UDP_HEADER)); @@ -195,8 +199,10 @@ if( !NT_SUCCESS(Status) ) return Status; - if(!(NCE = RouteGetRouteToDestination( &RemoteAddress ))) + if(!(NCE = RouteGetRouteToDestination( &RemoteAddress ))) { + FreeNdisPacket(Packet.NdisPacket); return STATUS_UNSUCCESSFUL; + } IPSendDatagram( &Packet, NCE, UDPSendPacketComplete, NULL );

1 0

[mkupfer] 36999: Olaf Siejka (Caemyr) <olaf_siejka AT o2 DOT pl> - Cleanup reactos installation package list
by mkupfer＠svn.reactos.org 26 Oct '08

26 Oct '08

Author: mkupfer Date: Sun Oct 26 15:54:05 2008 New Revision: 36999 URL: http://svn.reactos.org/svn/reactos?rev=36999&view=rev Log: Olaf Siejka (Caemyr) <olaf_siejka AT o2 DOT pl> - Cleanup reactos installation package list Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun Oct 26 15:54:05 2008 @@ -537,25 +537,11 @@ ; Subsystems subsystems\win32\csrss\csrss.exe 1 subsystems\win32\csrss\win32csr\win32csr.dll 1 -subsystems\csr\csr.exe 1 optional -subsystems\csr\csrsrv\csrsrv.dll 1 optional -subsystems\win\basesrv\basesrv.dll 1 optional -subsystems\win\winsrv\winsrv.dll 1 optional subsystems\ntvdm\ntvdm.exe 1 subsystems\win32\win32k\win32k.sys 1 - boot\bootdata\bootcdregtest\testboot.bat 7 optional -tools\dbgprint\dbgprint.exe 7 optional ; Modules -modules\os2\server\os2srv.dll 1 optional -modules\os2\dll\win32\doscalls\doscalls.dll 1 optional -modules\posix\server\psxsrv.dll 1 optional -modules\posix\dll\win32\psxdll\psxdll.dll 1 optional -modules\rosky\dll\win32\libsky\libsky.dll 1 optional -modules\rosky\dll\win32\libskygi\libskygi.dll 1 optional -modules\vms\server\vmssrv.dll 1 optional -modules\vms\dll\win32\vmsdll\vmsdll.dll 1 optional modules\rosapps\applications\screensavers\cylfrac\cylfrac.scr 1 optional modules\rosapps\applications\screensavers\matrix\matrix.scr 1 optional modules\rosapps\applications\screensavers\blankscr\scrnsave.scr 1 optional @@ -572,7 +558,7 @@ modules\rosapps\applications\devutils\gdb2\gdb2.exe 1 optional modules\rosapps\applications\devutils\gdihv\gdihv.exe 1 optional modules\rosapps\applications\devutils\genguid\genguid.exe 1 optional -modules\rosapps\applications\devutils\gettype\gettype.exe 1 optional +modules\rosapps\applications\sysutils\gettype\gettype.exe 1 optional modules\rosapps\applications\devutils\roswebparser\roswebparser.exe 1 optional modules\rosapps\applications\devutils\zoomin\zoomin.exe 1 optional modules\rosapps\applications\downloader\downloader.exe 1 optional @@ -622,9 +608,7 @@ modules\rosapps\drivers\avtest\avtest.sys 1 optional modules\rosapps\drivers\ramdrv\ramdrv.sys 1 optional modules\rosapps\drivers\green\green.sys 1 optional -modules\rosapps\lib\dflat32\dflat32.dll 1 optional -modules\rosapps\templates\dialog.exe 1 optional -modules\rosapps\templates\mdi.exe 1 optional +modules\rosapps\templates\dialog\dialog.exe 1 optional modules\rostests\winetests\advapi32\advapi32_winetest.exe 7 optional modules\rostests\winetests\advpack\advpack_winetest.exe 7 optional modules\rostests\winetests\browseui\browseui_winetest.exe 7 optional

1 0

[gschneider] 36998: - Add missing cleanup code - Rename variables to fit the naming scheme - Extend error dprints - Some comment changes - Fixes CIDs 617, 618, 619, 620
by gschneider＠svn.reactos.org 26 Oct '08

26 Oct '08

Author: gschneider Date: Sun Oct 26 13:29:56 2008 New Revision: 36998 URL: http://svn.reactos.org/svn/reactos?rev=36998&view=rev Log: - Add missing cleanup code - Rename variables to fit the naming scheme - Extend error dprints - Some comment changes - Fixes CIDs 617, 618, 619, 620 Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c [iso-8859-1] Sun Oct 26 13:29:56 2008 @@ -3,7 +3,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX * FILE: ddraw/surface/createsurface.c - * PURPOSE: IDirectDrawSurface7 Creation + * PURPOSE: IDirectDrawSurface Creation * PROGRAMMER: Magnus Olsen * */ @@ -14,10 +14,9 @@ /* - * all param have been checked if they are vaild before they are call to - * Internal_CreateSurface, if not please fix the code in the functions - * call to Internal_CreateSurface, ppSurf,pDDSD,pDDraw are being vaildate in - * Internal_CreateSurface +* All parameters must have been checked if they are valid before they are passed to Internal_CreateSurface. +* If not please fix the code in the functions which call Internal_CreateSurface. +* ppSurf,pDDSD,pDDraw are being validated in Internal_CreateSurface. */ HRESULT @@ -29,15 +28,16 @@ LPDDRAWI_DDRAWSURFACE_INT ThisSurfInt; LPDDRAWI_DDRAWSURFACE_LCL ThisSurfLcl; - LPDDRAWI_DDRAWSURFACE_GBL ThisSurfaceGbl; - LPDDRAWI_DDRAWSURFACE_MORE ThisSurfaceMore; - - LPDDRAWI_DDRAWSURFACE_INT * slist_int; - LPDDRAWI_DDRAWSURFACE_LCL * slist_lcl; - LPDDRAWI_DDRAWSURFACE_GBL * slist_gbl; - LPDDRAWI_DDRAWSURFACE_MORE * slist_more; + LPDDRAWI_DDRAWSURFACE_GBL ThisSurfGbl; + LPDDRAWI_DDRAWSURFACE_MORE ThisSurfMore; + + LPDDRAWI_DDRAWSURFACE_INT * slist_int = NULL; + LPDDRAWI_DDRAWSURFACE_LCL * slist_lcl = NULL; + LPDDRAWI_DDRAWSURFACE_GBL * slist_gbl = NULL; + LPDDRAWI_DDRAWSURFACE_MORE * slist_more = NULL; DWORD num_of_surf=1; DWORD count; + HRESULT ret; if(pDDraw->lpLcl->dwLocalFlags != DDRAWILCL_SETCOOPCALLED) { @@ -87,112 +87,113 @@ pDDSD->dwFlags = pDDSD->dwFlags | DDSD_LPSURFACE; } - /* FIXME count our how many surface we need */ + /* FIXME count how many surfaces we need */ DxHeapMemAlloc(slist_int, num_of_surf * sizeof( LPDDRAWI_DDRAWSURFACE_INT ) ); if( slist_int == NULL) { - return DDERR_OUTOFMEMORY; + ret = DDERR_OUTOFMEMORY; + goto cleanup; } DxHeapMemAlloc(slist_lcl, num_of_surf * sizeof( LPDDRAWI_DDRAWSURFACE_LCL ) ); if( slist_lcl == NULL ) { + ret = DDERR_OUTOFMEMORY; + goto cleanup; + } + + /* keep pointers to all gbl surfs to be able to free them on error */ + DxHeapMemAlloc(slist_gbl, num_of_surf * sizeof( LPDDRAWI_DDRAWSURFACE_GBL ) ); + if( slist_gbl == NULL ) + { DxHeapMemFree(slist_int); return DDERR_OUTOFMEMORY; } - /* for more easy to free the memory if something goes wrong */ - DxHeapMemAlloc(slist_gbl, num_of_surf * sizeof( LPDDRAWI_DDRAWSURFACE_GBL ) ); - if( slist_gbl == NULL ) + /* keep pointers to all more surfs to be able to free them on error */ + DxHeapMemAlloc(slist_more, num_of_surf * sizeof( LPDDRAWI_DDRAWSURFACE_MORE ) ); + if( slist_more == NULL ) { DxHeapMemFree(slist_int); return DDERR_OUTOFMEMORY; } - /* for more easy to free the memory if something goes wrong */ - DxHeapMemAlloc(slist_more, num_of_surf * sizeof( LPDDRAWI_DDRAWSURFACE_MORE ) ); - if( slist_more == NULL ) - { - DxHeapMemFree(slist_int); - return DDERR_OUTOFMEMORY; - } - for( count=0; count < num_of_surf; count++ ) { - /* Alloc the surface interface and need members */ + /* Allocate the surface interface and needed members */ DxHeapMemAlloc(ThisSurfInt, sizeof( DDRAWI_DDRAWSURFACE_INT ) ); if( ThisSurfInt == NULL ) { - /* Fixme free the memory */ - return DDERR_OUTOFMEMORY; + ret = DDERR_OUTOFMEMORY; + goto cleanup; } DxHeapMemAlloc(ThisSurfLcl, sizeof( DDRAWI_DDRAWSURFACE_LCL ) ); if( ThisSurfLcl == NULL ) { - /* Fixme free the memory */ - return DDERR_OUTOFMEMORY; - } - - DxHeapMemAlloc(ThisSurfaceGbl, sizeof( DDRAWI_DDRAWSURFACE_GBL ) ); - if( ThisSurfaceGbl == NULL ) - { - /* Fixme free the memory */ - return DDERR_OUTOFMEMORY; - } - - DxHeapMemAlloc(ThisSurfaceMore, sizeof( DDRAWI_DDRAWSURFACE_MORE ) ); - if( ThisSurfaceMore == NULL ) - { - /* Fixme free the memory */ - return DDERR_OUTOFMEMORY; - } - - /* setup a list only one we really need is slist_lcl - rest of slist shall be release before a return */ + ret = DDERR_OUTOFMEMORY; + goto cleanup; + } + + DxHeapMemAlloc(ThisSurfGbl, sizeof( DDRAWI_DDRAWSURFACE_GBL ) ); + if( ThisSurfGbl == NULL ) + { + ret = DDERR_OUTOFMEMORY; + goto cleanup; + } + + DxHeapMemAlloc(ThisSurfMore, sizeof( DDRAWI_DDRAWSURFACE_MORE ) ); + if( ThisSurfMore == NULL ) + { + ret = DDERR_OUTOFMEMORY; + goto cleanup; + } + + /* setup lists, really needed are slist_lcl, slist_int + other slists should be released on return */ slist_int[count] = ThisSurfInt; slist_lcl[count] = ThisSurfLcl; - slist_gbl[count] = ThisSurfaceGbl; - slist_more[count] = ThisSurfaceMore; + slist_gbl[count] = ThisSurfGbl; + slist_more[count] = ThisSurfMore; /* Start now fill in the member as they shall look like before call to createsurface */ ThisSurfInt->lpLcl = ThisSurfLcl; - ThisSurfLcl->lpGbl = ThisSurfaceGbl; + ThisSurfLcl->lpGbl = ThisSurfGbl; ThisSurfLcl->ddsCaps.dwCaps = pDDSD->ddsCaps.dwCaps; - ThisSurfaceGbl->lpDD = pDDraw->lpLcl->lpGbl; - ThisSurfaceGbl->lpDDHandle = pDDraw->lpLcl->lpGbl; + ThisSurfGbl->lpDD = pDDraw->lpLcl->lpGbl; + ThisSurfGbl->lpDDHandle = pDDraw->lpLcl->lpGbl; /* FIXME ? */ - ThisSurfaceGbl->dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; + ThisSurfGbl->dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - ThisSurfaceGbl->wWidth = pDDraw->lpLcl->lpGbl->vmiData.dwDisplayWidth; - ThisSurfaceGbl->wHeight = pDDraw->lpLcl->lpGbl->vmiData.dwDisplayHeight; - ThisSurfaceGbl->lPitch = pDDraw->lpLcl->lpGbl->vmiData.lDisplayPitch; - ThisSurfaceGbl->dwLinearSize = pDDraw->lpLcl->lpGbl->vmiData.lDisplayPitch; - - - ThisSurfaceMore->dmiDDrawReserved7.wWidth = pDDraw->lpLcl->lpGbl->vmiData.dwDisplayWidth; - ThisSurfaceMore->dmiDDrawReserved7.wHeight = pDDraw->lpLcl->lpGbl->vmiData.dwDisplayHeight; - ThisSurfaceMore->dmiDDrawReserved7.wBPP = pDDraw->lpLcl->lpGbl->dwMonitorFrequency; + ThisSurfGbl->wWidth = pDDraw->lpLcl->lpGbl->vmiData.dwDisplayWidth; + ThisSurfGbl->wHeight = pDDraw->lpLcl->lpGbl->vmiData.dwDisplayHeight; + ThisSurfGbl->lPitch = pDDraw->lpLcl->lpGbl->vmiData.lDisplayPitch; + ThisSurfGbl->dwLinearSize = pDDraw->lpLcl->lpGbl->vmiData.lDisplayPitch; + + + ThisSurfMore->dmiDDrawReserved7.wWidth = pDDraw->lpLcl->lpGbl->vmiData.dwDisplayWidth; + ThisSurfMore->dmiDDrawReserved7.wHeight = pDDraw->lpLcl->lpGbl->vmiData.dwDisplayHeight; + ThisSurfMore->dmiDDrawReserved7.wBPP = pDDraw->lpLcl->lpGbl->dwMonitorFrequency; /* FIXME ThisSurfaceMore->dmiDDrawReserved7.wMonitorsAttachedToDesktop */ - ThisSurfaceMore->dmiDDrawReserved7.wMonitorsAttachedToDesktop = 1; + ThisSurfMore->dmiDDrawReserved7.wMonitorsAttachedToDesktop = 1; pDDraw->lpLcl->lpPrimary = ThisSurfInt; Main_DirectDraw_AddRef(pDDraw); } else { - ThisSurfaceGbl->wWidth = (WORD)pDDSD->dwWidth; - ThisSurfaceGbl->wHeight = (WORD)pDDSD->dwHeight; - ThisSurfaceGbl->lPitch = pDDSD->lPitch; - ThisSurfaceGbl->dwLinearSize = pDDSD->lPitch; + ThisSurfGbl->wWidth = (WORD)pDDSD->dwWidth; + ThisSurfGbl->wHeight = (WORD)pDDSD->dwHeight; + ThisSurfGbl->lPitch = pDDSD->lPitch; + ThisSurfGbl->dwLinearSize = pDDSD->lPitch; } if(pDDraw->lpVtbl == &DirectDraw7_Vtable) @@ -213,14 +214,15 @@ } else { - return DDERR_NOTINITIALIZED; - } - - ThisSurfLcl->lpSurfMore = ThisSurfaceMore; - ThisSurfaceMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - ThisSurfaceMore->lpDD_int = pDDraw; - ThisSurfaceMore->lpDD_lcl = pDDraw->lpLcl; - ThisSurfaceMore->slist = slist_lcl; + ret = DDERR_NOTINITIALIZED; + goto cleanup; + } + + ThisSurfLcl->lpSurfMore = ThisSurfMore; + ThisSurfMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); + ThisSurfMore->lpDD_int = pDDraw; + ThisSurfMore->lpDD_lcl = pDDraw->lpLcl; + ThisSurfMore->slist = slist_lcl; ThisSurfLcl->dwProcessId = GetCurrentProcessId(); @@ -241,37 +243,73 @@ mDdCanCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; mDdCanCreateSurface.ddRVal = DDERR_GENERIC; - if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) - { - DX_STUB_str("mDdCanCreateSurface DDHAL_DRIVER_NOTHANDLED fail"); - return DDERR_NOTINITIALIZED; + if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface) == DDHAL_DRIVER_NOTHANDLED) + { + DX_STUB_str("mDdCanCreateSurface failed with DDHAL_DRIVER_NOTHANDLED."); + ret = DDERR_NOTINITIALIZED; + goto cleanup; } if (mDdCanCreateSurface.ddRVal != DD_OK) { - DX_STUB_str("mDdCanCreateSurface fail"); - return DDERR_NOTINITIALIZED; + DX_STUB_str("mDdCanCreateSurface failed."); + ret = mDdCanCreateSurface.ddRVal; + goto cleanup; } mDdCreateSurface.lpDD = pDDraw->lpLcl->lpGbl; mDdCreateSurface.CreateSurface = pDDraw->lpLcl->lpGbl->lpDDCBtmp->HALDD.CreateSurface; - mDdCreateSurface.ddRVal = DDERR_GENERIC; + mDdCreateSurface.ddRVal = DDERR_GENERIC; mDdCreateSurface.dwSCnt = num_of_surf; mDdCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; mDdCreateSurface.lplpSList = slist_lcl; if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) { - return DDERR_NOTINITIALIZED; + DX_STUB_str("mDdCreateSurface failed with DDHAL_DRIVER_NOTHANDLED."); + ret = DDERR_NOTINITIALIZED; + goto cleanup; } if (mDdCreateSurface.ddRVal != DD_OK) { - return mDdCreateSurface.ddRVal; - } + DX_STUB_str("mDdCreateSurface failed."); + ret = mDdCreateSurface.ddRVal; + goto cleanup; + } + + /* free unneeded slists */ + if (slist_more != NULL) + DxHeapMemFree(slist_more); + if (slist_gbl != NULL) + DxHeapMemFree(slist_gbl); *ppSurf = (LPDDRAWI_DDRAWSURFACE_INT) &slist_int[0]->lpVtbl; + return DD_OK; + +cleanup: + for(count = 0; count < num_of_surf; count++) + { + if (slist_more[count] != NULL) + DxHeapMemFree(slist_more[count]); + if (slist_gbl[count] != NULL) + DxHeapMemFree(slist_gbl[count]); + if (slist_lcl[count] != NULL) + DxHeapMemFree(slist_lcl[count]); + if (slist_int[count] != NULL) + DxHeapMemFree(slist_int[count]); + } + if (slist_more != NULL) + DxHeapMemFree(slist_more); + if (slist_gbl != NULL) + DxHeapMemFree(slist_gbl); + if (slist_lcl != NULL) + DxHeapMemFree(slist_lcl); + if (slist_int != NULL) + DxHeapMemFree(slist_int); + + return ret; }

1 0

[gschneider] 36997: StretchBlt: - Pixel size depends on the type of the destination surface, so don't always write ULONG values - Use PutPixel and remove now unneeded position code - Fixes high red zone overwrites, see bug #812 (vlc) and bug #3807 (ccleaner) - Enable dprints for unhandled sources - Add a parameter dprint for 24bpp
by gschneider＠svn.reactos.org 26 Oct '08

26 Oct '08

Author: gschneider Date: Sun Oct 26 13:07:10 2008 New Revision: 36997 URL: http://svn.reactos.org/svn/reactos?rev=36997&view=rev Log: StretchBlt: - Pixel size depends on the type of the destination surface, so don't always write ULONG values - Use PutPixel and remove now unneeded position code - Fixes high red zone overwrites, see bug #812 (vlc) and bug #3807 (ccleaner) - Enable dprints for unhandled sources - Add a parameter dprint for 24bpp Modified: trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c Modified: trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c [iso-8859-1] Sun Oct 26 13:07:10 2008 @@ -740,8 +740,6 @@ LONG sy = 0; LONG DesX; LONG DesY; - PULONG DestBits; - LONG DifflDelta; LONG SrcZoomXHight; LONG SrcZoomXLow; @@ -753,6 +751,7 @@ LONG sx_dec = 0; LONG sx_max; + ULONG color; DPRINT("DIB_16BPP_StretchBlt: Source BPP: %u, srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, @@ -781,11 +780,6 @@ sx_max = DesSizeX; sy_max = DesSizeY; sy = SourceRect->top; - - DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 1) + - DestRect->top * DestSurf->lDelta); - - DifflDelta = DestSurf->lDelta - (DesSizeX << 1); switch(SourceSurf->iBitmapFormat) { @@ -801,10 +795,10 @@ for (DesX=0; DesX<DesSizeX; DesX++) { - *DestBits = XLATEOBJ_iXlate(ColorTranslation, - DIB_1BPP_GetPixel(SourceSurf, sx, sy)); - - DestBits = (PULONG)((ULONG_PTR)DestBits + 2); + color = XLATEOBJ_iXlate(ColorTranslation, + DIB_1BPP_GetPixel(SourceSurf, sx, sy)); + + DIB_16BPP_PutPixel(DestSurf, DesX, DesY, color); sx += SrcZoomXHight; sx_dec += SrcZoomXLow; @@ -815,8 +809,6 @@ } } - DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); - sy += SrcZoomYHight; sy_dec += SrcZoomYLow; if (sy_dec >= sy_max) @@ -838,10 +830,10 @@ for (DesX=0; DesX<DesSizeX; DesX++) { - *DestBits = XLATEOBJ_iXlate(ColorTranslation, + color = XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)); - DestBits = (PULONG)((ULONG_PTR)DestBits + 2); + DIB_16BPP_PutPixel(DestSurf, DesX, DesY, color); sx += SrcZoomXHight; sx_dec += SrcZoomXLow; @@ -852,8 +844,6 @@ } } - DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); - sy += SrcZoomYHight; sy_dec += SrcZoomYLow; if (sy_dec >= sy_max) @@ -875,10 +865,10 @@ for (DesX=0; DesX<DesSizeX; DesX++) { - *DestBits = XLATEOBJ_iXlate(ColorTranslation, - DIB_8BPP_GetPixel(SourceSurf, sx, sy)); - - DestBits = (PULONG)((ULONG_PTR)DestBits + 2); + color = XLATEOBJ_iXlate(ColorTranslation, + DIB_8BPP_GetPixel(SourceSurf, sx, sy)); + + DIB_16BPP_PutPixel(DestSurf, DesX, DesY, color); sx += SrcZoomXHight; sx_dec += SrcZoomXLow; @@ -889,8 +879,6 @@ } } - DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); - sy += SrcZoomYHight; sy_dec += SrcZoomYLow; if (sy_dec >= sy_max) @@ -906,11 +894,6 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 1) + - DestRect->top * DestSurf->lDelta); - - DifflDelta = DestSurf->lDelta - (DesSizeX << 1); - for (DesY=0; DesY<DesSizeY; DesY++) { sx = SourceRect->left; @@ -918,10 +901,10 @@ for (DesX=0; DesX<DesSizeX; DesX++) { - *DestBits = XLATEOBJ_iXlate(ColorTranslation, + color = XLATEOBJ_iXlate(ColorTranslation, DIB_24BPP_GetPixel(SourceSurf, sx, sy)); - DestBits = (PULONG)((ULONG_PTR)DestBits + 2); + DIB_16BPP_PutPixel(DestSurf, DesX, DesY, color); sx += SrcZoomXHight; sx_dec += SrcZoomXLow; @@ -932,8 +915,6 @@ } } - DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); - sy += SrcZoomYHight; sy_dec += SrcZoomYLow; if (sy_dec >= sy_max) @@ -955,10 +936,10 @@ for (DesX=0; DesX<DesSizeX; DesX++) { - *DestBits = XLATEOBJ_iXlate(ColorTranslation, + color = XLATEOBJ_iXlate(ColorTranslation, DIB_32BPP_GetPixel(SourceSurf, sx, sy)); - DestBits = (PULONG)((ULONG_PTR)DestBits + 2); + DIB_16BPP_PutPixel(DestSurf, DesX, DesY, color); sx += SrcZoomXHight; sx_dec += SrcZoomXLow; @@ -968,7 +949,6 @@ sx_dec -= sx_max; } } - DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); sy += SrcZoomYHight; sy_dec += SrcZoomYLow; Modified: trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c [iso-8859-1] Sun Oct 26 13:07:10 2008 @@ -420,6 +420,9 @@ LONG DesY; LONG color; + DPRINT("DIB_24BPP_StretchBlt: Source BPP: %u, srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", + BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, + DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); SrcSizeY = SourceRect->bottom - SourceRect->top; SrcSizeX = SourceRect->right - SourceRect->left; @@ -539,7 +542,7 @@ break; default: - //DPRINT1("DIB_24BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat)); + DPRINT1("DIB_24BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat)); return FALSE; } Modified: trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c [iso-8859-1] Sun Oct 26 13:07:10 2008 @@ -726,7 +726,7 @@ break; default: - //DPRINT1("DIB_32BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat)); + DPRINT1("DIB_32BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat)); return FALSE; } Modified: trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c [iso-8859-1] Sun Oct 26 13:07:10 2008 @@ -475,8 +475,6 @@ LONG sy = 0; LONG DesX; LONG DesY; - PULONG DestBits; - LONG DifflDelta; LONG SrcZoomXHight; LONG SrcZoomXLow; @@ -489,6 +487,8 @@ LONG sx_dec = 0; LONG sx_max; + ULONG color; + DPRINT("DIB_8BPP_StretchBlt: Source BPP: %u, srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); @@ -516,11 +516,6 @@ sx_max = DesSizeX; sy_max = DesSizeY; sy = SourceRect->top; - - DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left) + - DestRect->top * DestSurf->lDelta); - - DifflDelta = DestSurf->lDelta - DesSizeX ; switch(SourceSurf->iBitmapFormat) { @@ -533,10 +528,10 @@ sx_dec = 0; for (DesX=0; DesX<DesSizeX; DesX++) { - *DestBits = XLATEOBJ_iXlate(ColorTranslation, - DIB_1BPP_GetPixel(SourceSurf, sx, sy)); - - DestBits = (PULONG)((ULONG_PTR)DestBits + 1); + color = XLATEOBJ_iXlate(ColorTranslation, + DIB_1BPP_GetPixel(SourceSurf, sx, sy)); + + DIB_8BPP_PutPixel(DestSurf, DesX, DesY, color); sx += SrcZoomXHight; sx_dec += SrcZoomXLow; @@ -546,8 +541,6 @@ sx_dec -= sx_max; } } - - DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); sy += SrcZoomYHight; sy_dec += SrcZoomYLow; @@ -568,10 +561,10 @@ sx_dec = 0; for (DesX=0; DesX<DesSizeX; DesX++) { - *DestBits = XLATEOBJ_iXlate(ColorTranslation, - DIB_4BPP_GetPixel(SourceSurf, sx, sy)); - - DestBits = (PULONG)((ULONG_PTR)DestBits + 1); + color = XLATEOBJ_iXlate(ColorTranslation, + DIB_4BPP_GetPixel(SourceSurf, sx, sy)); + + DIB_8BPP_PutPixel(DestSurf, DesX, DesY, color); sx += SrcZoomXHight; sx_dec += SrcZoomXLow; @@ -581,8 +574,6 @@ sx_dec -= sx_max; } } - - DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); sy += SrcZoomYHight; sy_dec += SrcZoomYLow; @@ -608,10 +599,10 @@ sx_dec = 0; for (DesX=0; DesX<DesSizeX; DesX++) { - *DestBits = XLATEOBJ_iXlate(ColorTranslation, - DIB_16BPP_GetPixel(SourceSurf, sx, sy)); - - DestBits = (PULONG)((ULONG_PTR)DestBits + 1); + color = XLATEOBJ_iXlate(ColorTranslation, + DIB_16BPP_GetPixel(SourceSurf, sx, sy)); + + DIB_8BPP_PutPixel(DestSurf, DesX, DesY, color); sx += SrcZoomXHight; sx_dec += SrcZoomXLow; @@ -621,8 +612,6 @@ sx_dec -= sx_max; } } - - DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); sy += SrcZoomYHight; sy_dec += SrcZoomYLow; @@ -641,10 +630,10 @@ sx_dec = 0; for (DesX=0; DesX<DesSizeX; DesX++) { - *DestBits = XLATEOBJ_iXlate(ColorTranslation, - DIB_24BPP_GetPixel(SourceSurf, sx, sy)); - - DestBits = (PULONG)((ULONG_PTR)DestBits + 1); + color = XLATEOBJ_iXlate(ColorTranslation, + DIB_24BPP_GetPixel(SourceSurf, sx, sy)); + + DIB_8BPP_PutPixel(DestSurf, DesX, DesY, color); sx += SrcZoomXHight; sx_dec += SrcZoomXLow; @@ -654,8 +643,6 @@ sx_dec -= sx_max; } } - - DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); sy += SrcZoomYHight; sy_dec += SrcZoomYLow; @@ -676,10 +663,10 @@ sx_dec = 0; for (DesX=0; DesX<DesSizeX; DesX++) { - *DestBits = XLATEOBJ_iXlate(ColorTranslation, + color = XLATEOBJ_iXlate(ColorTranslation, DIB_32BPP_GetPixel(SourceSurf, sx, sy)); - DestBits = (PULONG)((ULONG_PTR)DestBits + 1); + DIB_8BPP_PutPixel(DestSurf, DesX, DesY, color); sx += SrcZoomXHight; sx_dec += SrcZoomXLow; @@ -689,8 +676,6 @@ sx_dec -= sx_max; } } - - DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); sy += SrcZoomYHight; sy_dec += SrcZoomYLow;

1 0

[cwittich] 36996: fix some advapi32 security winetests
by cwittich＠svn.reactos.org 26 Oct '08

26 Oct '08

Author: cwittich Date: Sun Oct 26 13:03:38 2008 New Revision: 36996 URL: http://svn.reactos.org/svn/reactos?rev=36996&view=rev Log: fix some advapi32 security winetests Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/mis… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] Sun Oct 26 13:03:38 2008 @@ -1256,7 +1256,7 @@ /* Check the privilege name is not NULL */ if (lpName == NULL) { - SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(ERROR_NO_SUCH_PRIVILEGE); return FALSE; } @@ -1334,7 +1334,7 @@ for (Priv = 0; Priv < sizeof(DefaultPrivNames) / sizeof(DefaultPrivNames[0]); Priv++) { - if (0 == wcscmp(PrivName, DefaultPrivNames[Priv])) + if (0 == wcsicmp(PrivName, DefaultPrivNames[Priv])) { Luid->LowPart = Priv + 1; Luid->HighPart = 0;

1 0

[cfinck] 36995: - Add a "host" attribute to the project's <include> and <define> tags to make it possible to define global includes/defines for host components - Define TARGET_arm/TARGET_i386 in the ReactOS-arm.rbuild/ReactOS-i386.rbuild files for the host tools to make it possible for them to know about the target to build - Make use of this define in winebuild to fix the issue of r36927 properly - Define global includes for host tools to simplify all host tool/library rbuild files - Remove dea
by cfinck＠svn.reactos.org 26 Oct '08

26 Oct '08

Author: cfinck Date: Sun Oct 26 13:03:06 2008 New Revision: 36995 URL: http://svn.reactos.org/svn/reactos?rev=36995&view=rev Log: - Add a "host" attribute to the project's <include> and <define> tags to make it possible to define global includes/defines for host components - Define TARGET_arm/TARGET_i386 in the ReactOS-arm.rbuild/ReactOS-i386.rbuild files for the host tools to make it possible for them to know about the target to build - Make use of this define in winebuild to fix the issue of r36927 properly - Define global includes for host tools to simplify all host tool/library rbuild files - Remove dead rbuild code - Remove the include/reactos/config.h file, none of its defines are still used - Fix components accidentally using that file Removed: trunk/reactos/include/reactos/config.h Modified: trunk/reactos/ReactOS-arm.rbuild trunk/reactos/ReactOS-generic.rbuild trunk/reactos/ReactOS-i386.rbuild trunk/reactos/base/applications/winhlp32/winhlp32.rbuild trunk/reactos/dll/directx/quartz/quartz.rbuild trunk/reactos/dll/win32/netshell/precomp.h trunk/reactos/dll/win32/user32/misc/dde.c trunk/reactos/lib/cmlib/cmlib.rbuild trunk/reactos/lib/host/wcsfuncs/wcsfuncs.rbuild trunk/reactos/lib/inflib/inflib.rbuild trunk/reactos/tools/cabman/cabman.rbuild trunk/reactos/tools/mkhive/mkhive.rbuild trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h trunk/reactos/tools/rbuild/project.cpp trunk/reactos/tools/rbuild/rbuild.h trunk/reactos/tools/unicode/unicode.rbuild trunk/reactos/tools/widl/widl.rbuild trunk/reactos/tools/winebuild/main.c trunk/reactos/tools/winebuild/winebuild.rbuild trunk/reactos/tools/wmc/wmc.rbuild trunk/reactos/tools/wpp/wpp.rbuild trunk/reactos/tools/wrc/wrc.rbuild Modified: trunk/reactos/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=369… ============================================================================== --- trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] Sun Oct 26 13:03:06 2008 @@ -12,6 +12,7 @@ <define name="__REACTOS__" /> <define name="_ARM_" /> <define name="__arm__" /> + <define name="TARGET_arm" host="true" /> <if property="DBG" value="1"> <define name="DBG">1</define> Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Sun Oct 26 13:03:06 2008 @@ -4,6 +4,8 @@ <xi:include href="baseaddress.rbuild" /> <define name="__REACTOS__" /> + <define name="__REACTOS__" host="true" /> + <if property="DBG" value="1"> <define name="DBG">1</define> <define name="_SEH_ENABLE_TRACE" /> @@ -74,6 +76,11 @@ <include root="intermediate">include/reactos/mc</include> <include>include/reactos/libs</include> + <include host="true">include</include> + <include host="true" root="intermediate">include</include> + <include host="true">include/reactos</include> + <include host="true">include/reactos/wine</include> + <directory name="base"> <xi:include href="base/base.rbuild" /> </directory> Modified: trunk/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=36… ============================================================================== --- trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] Sun Oct 26 13:03:06 2008 @@ -12,6 +12,7 @@ <define name="_M_IX86" /> <define name="_X86_" /> <define name="__i386__" /> + <define name="TARGET_i386" host="true" /> <property name="NTOSKRNL_SHARED" value="-file-alignment=0x1000 -section-alignment=0x1000 -shared"/> Modified: trunk/reactos/base/applications/winhlp32/winhlp32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhlp32.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/winhlp32.rbuild [iso-8859-1] Sun Oct 26 13:03:06 2008 @@ -2,6 +2,7 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="winhlp32" type="win32gui" installbase="system32" installname="winhlp32.exe" unicode="no" allowwarnings="true"> <include base="winhlp32">.</include> + <include base="ReactOS">include/reactos/wine</include> <library>wine</library> <library>comdlg32</library> <library>comctl32</library> Modified: trunk/reactos/dll/directx/quartz/quartz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/quartz.… ============================================================================== --- trunk/reactos/dll/directx/quartz/quartz.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/quartz/quartz.rbuild [iso-8859-1] Sun Oct 26 13:03:06 2008 @@ -5,6 +5,7 @@ <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="quartz.spec" /> <include base="quartz">.</include> + <include base="ReactOS">include/reactos/wine</include> <define name="_WIN32_WINNT">0x600</define> <library>wine</library> <library>uuid</library> Modified: trunk/reactos/dll/win32/netshell/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/precomp… ============================================================================== --- trunk/reactos/dll/win32/netshell/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/precomp.h [iso-8859-1] Sun Oct 26 13:03:06 2008 @@ -1,7 +1,5 @@ #ifndef _PRECOMP_H__ #define _PRECOMP_H__ - -#include "config.h" #include <stdarg.h> #include <stdlib.h> Modified: trunk/reactos/dll/win32/user32/misc/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dde.… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dde.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/dde.c [iso-8859-1] Sun Oct 26 13:03:06 2008 @@ -22,8 +22,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "config.h" #include <user32.h> #include "dde_private.h" Removed: trunk/reactos/include/reactos/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/config.h?r… ============================================================================== --- trunk/reactos/include/reactos/config.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/config.h (removed) @@ -1,41 +1,0 @@ -#ifndef _INC_REACTOS_CONFIG_H -#define _INC_REACTOS_CONFIG_H -/* $Id$ */ -/* ReactOS global configuration options */ - -#define CONFIG_PROCESSOR_FAMILY_I386 386L -#define CONFIG_PROCESSOR_FAMILY_I486 486L -#define CONFIG_PROCESSOR_FAMILY_I586 586L -#define CONFIG_PROCESSOR_FAMILY_IPII 686L - -#define CONFIG_PROCESSOR_FAMILY_ALPHA 0x10000000 - -#define CONFIG_ARCHITECTURE_IBMPC 0x00000000 -/* - * Processor and architecture. - */ -#define CONFIG_PROCESSOR_FAMILY CONFIG_PROCESSOR_FAMILY_I586 -#define CONFIG_ARCHITECTURE CONFIG_ARCHITECTURE_IBMPC -/* - * Hardware page size - */ -#define CONFIG_MEMORY_PAGE_SIZE 4096 -/* - * Use __fastcall calling conventions when needed - * in system components that require it. - */ - -/* #define CONFIG_USE_FASTCALL */ - -/* - * Enable debugging output on a per module - * base. - */ -#define DBG_NTOSKRNL_KE_MAIN -#define DBG_NTOSKRNL_MM_MM -#define DBG_NTOSKRNL_MM_NPOOL - -#define DBG_NTDLL_LDR_STARTUP -#define DBG_NTDLL_LDR_UTILS - -#endif /* ndef _INC_REACTOS_CONFIG_H */ Modified: trunk/reactos/lib/cmlib/cmlib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.rbuild?rev… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.rbuild [iso-8859-1] Sun Oct 26 13:03:06 2008 @@ -16,8 +16,6 @@ </module> <module name="cmlibhost" type="hoststaticlibrary"> <include base="cmlibhost">.</include> - <include base="ReactOS">include/reactos</include> - <include base="ReactOS">include</include> <define name="__NO_CTYPE_INLINES" /> <define name="_NTOSKRNL_" /> <define name="_NTSYSTEM_" /> Modified: trunk/reactos/lib/host/wcsfuncs/wcsfuncs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/host/wcsfuncs/wcsfuncs… ============================================================================== --- trunk/reactos/lib/host/wcsfuncs/wcsfuncs.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/host/wcsfuncs/wcsfuncs.rbuild [iso-8859-1] Sun Oct 26 13:03:06 2008 @@ -1,6 +1,5 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="host_wcsfuncs" type="hoststaticlibrary"> - <include base="ReactOS">include</include> <file>wcsfuncs.c</file> </module> Modified: trunk/reactos/lib/inflib/inflib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/inflib.rbuild?r… ============================================================================== --- trunk/reactos/lib/inflib/inflib.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/inflib/inflib.rbuild [iso-8859-1] Sun Oct 26 13:03:06 2008 @@ -13,14 +13,12 @@ </module> <module name="inflibhost" type="hoststaticlibrary" allowwarnings="true"> <include base="inflibhost">.</include> - <include base="ReactOS">include/reactos</include> <define name="__NO_CTYPE_INLINES" /> <compilerflag>-Wpointer-arith</compilerflag> <compilerflag>-Wconversion</compilerflag> <compilerflag>-Wstrict-prototypes</compilerflag> <compilerflag>-Wmissing-prototypes</compilerflag> <define name="INFLIB_HOST" /> - <include base="ReactOS">include</include> <file>infcore.c</file> <file>infget.c</file> <file>infput.c</file> Modified: trunk/reactos/tools/cabman/cabman.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabman.rbuild… ============================================================================== --- trunk/reactos/tools/cabman/cabman.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/cabman.rbuild [iso-8859-1] Sun Oct 26 13:03:06 2008 @@ -1,7 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> <module name="cabman" type="buildtool"> - <include base="ReactOS">include</include> <include base="zlibhost">.</include> <library>zlibhost</library> <file>cabinet.cxx</file> Modified: trunk/reactos/tools/mkhive/mkhive.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.rbuild… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/mkhive.rbuild [iso-8859-1] Sun Oct 26 13:03:06 2008 @@ -1,8 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> <module name="mkhive" type="buildtool" allowwarnings="true"> - <include base="ReactOS">include</include> - <include base="ReactOS">include/reactos</include> <include base="inflibhost">.</include> <include base="cmlibhost">.</include> <include base="zlibhost">.</include> Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sun Oct 26 13:03:06 2008 @@ -591,20 +591,6 @@ } string -MingwModuleHandler::GenerateGccDefineParameters () const -{ - set<string> used_defs; - string parameters = GenerateGccDefineParametersFromVector ( module.project.non_if_data.defines, used_defs ); - string s = GenerateGccDefineParametersFromVector ( module.non_if_data.defines, used_defs ); - if ( s.length () > 0 ) - { - parameters += " "; - parameters += s; - } - return parameters; -} - -string MingwModuleHandler::ConcatenatePaths ( const string& path1, const string& path2 ) const @@ -627,19 +613,6 @@ if ( parameters.length () > 0 ) parameters += " "; parameters += "-I" + backend->GetFullPath ( *include.directory );; - } - return parameters; -} - -string -MingwModuleHandler::GenerateGccIncludeParameters () const -{ - string parameters = GenerateGccIncludeParametersFromVector ( module.non_if_data.includes ); - string s = GenerateGccIncludeParametersFromVector ( module.project.non_if_data.includes ); - if ( s.length () > 0 ) - { - parameters += " "; - parameters += s; } return parameters; } @@ -1870,7 +1843,11 @@ &module.linkerFlags, used_defs ); - if ( ModuleHandlerInformations[module.type].DefaultHost == HostFalse ) + if ( ModuleHandlerInformations[module.type].DefaultHost == HostTrue ) + { + GenerateMacros("+=", module.project.host_non_if_data, NULL, used_defs); + } + else { GenerateMacros ( "+=", @@ -1899,7 +1876,7 @@ if ( ModuleHandlerInformations[module.type].DefaultHost == HostFalse ) globalCflags += " $(PROJECT_CFLAGS)"; else - globalCflags += " -Wall -Wpointer-arith -D__REACTOS__"; + globalCflags += " -Wall -Wpointer-arith"; globalCflags += " -g"; if ( backend->usePipe ) globalCflags += " -pipe"; Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] Sun Oct 26 13:03:06 2008 @@ -116,7 +116,6 @@ private: std::string ConcatenatePaths ( const std::string& path1, const std::string& path2 ) const; - std::string GenerateGccDefineParameters () const; std::string GenerateCompilerParametersFromVector ( const std::vector<CompilerFlag*>& compilerFlags, const CompilerType type ) const; std::string GenerateLinkerParametersFromVector ( const std::vector<LinkerFlag*>& linkerFlags ) const; std::string GenerateImportLibraryDependenciesFromVector ( const std::vector<Library*>& libraries ); @@ -132,9 +131,6 @@ std::set<const Define *>& used_defs ); void GenerateSourceMacros ( const IfableData& data ); void GenerateObjectMacros ( const IfableData& data ); - std::string GenerateGccIncludeParameters () const; - std::string GenerateGccParameters () const; - std::string GenerateNasmParameters () const; const FileLocation* GetPrecompiledHeaderFilename () const; void GenerateGccCommand ( const FileLocation* sourceFile, const Rule *rule, Modified: trunk/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.cpp?r… ============================================================================== --- trunk/reactos/tools/rbuild/project.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/project.cpp [iso-8859-1] Sun Oct 26 13:03:06 2008 @@ -306,6 +306,7 @@ } non_if_data.ProcessXML (); + host_non_if_data.ProcessXML (); non_if_data.ExtractModules( modules ); @@ -359,14 +360,26 @@ } else if ( e.name == "include" ) { + const XMLAttribute* host = e.GetAttribute("host", false); Include* include = new Include ( *this, &e ); - non_if_data.includes.push_back ( include ); + + if(host && host->value == "true") + host_non_if_data.includes.push_back(include); + else + non_if_data.includes.push_back ( include ); + subs_invalid = true; } else if ( e.name == "define" ) { + const XMLAttribute* host = e.GetAttribute("host", false); Define* define = new Define ( *this, e ); - non_if_data.defines.push_back ( define ); + + if(host && host->value == "true") + host_non_if_data.defines.push_back(define); + else + non_if_data.defines.push_back ( define ); + subs_invalid = true; } else if ( e.name == "compilerflag" ) Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] Sun Oct 26 13:03:06 2008 @@ -236,6 +236,7 @@ std::vector<InstallFile*> installfiles; std::map<std::string, Module*> modules; IfableData non_if_data; + IfableData host_non_if_data; Project ( const Configuration& configuration, const std::string& filename, Modified: trunk/reactos/tools/unicode/unicode.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/unicode.rbui… ============================================================================== --- trunk/reactos/tools/unicode/unicode.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/unicode/unicode.rbuild [iso-8859-1] Sun Oct 26 13:03:06 2008 @@ -2,9 +2,6 @@ <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> <module name="unicode" type="hoststaticlibrary"> <define name="WINE_UNICODE_API">" "</define> - <include base="ReactOS">include/reactos/wine</include> - <include base="ReactOS">include/reactos</include> - <include base="ReactOS">include</include> <file>casemap.c</file> <file>compose.c</file> <file>cptable.c</file> Modified: trunk/reactos/tools/widl/widl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.rbuild?rev… ============================================================================== --- trunk/reactos/tools/widl/widl.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/widl/widl.rbuild [iso-8859-1] Sun Oct 26 13:03:06 2008 @@ -4,10 +4,6 @@ <define name="INT16">SHORT</define> <define name="YYDEBUG">1</define> <include base="wpp">.</include> - <include base="ReactOS">include/reactos/wine</include> - <include base="ReactOS">include/reactos</include> - <include base="ReactOS">include</include> - <include base="ReactOS" root="intermediate">include</include> <library>wpp</library> <file>client.c</file> <file>hash.c</file> Modified: trunk/reactos/tools/winebuild/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/main.c?rev… ============================================================================== --- trunk/reactos/tools/winebuild/main.c [iso-8859-1] (original) +++ trunk/reactos/tools/winebuild/main.c [iso-8859-1] Sun Oct 26 13:03:06 2008 @@ -48,16 +48,10 @@ int save_temps = 0; int link_ext_symbols = 0; -#if defined(__i386__) || defined(__x86_64__) +#if defined(TARGET_i386) enum target_cpu target_cpu = CPU_x86; -#elif defined(__x86_64__) +#elif defined(TARGET_amd64) enum target_cpu target_cpu = CPU_x86_64; -#elif defined(__sparc__) -enum target_cpu target_cpu = CPU_SPARC; -#elif defined(__ALPHA__) -enum target_cpu target_cpu = CPU_ALPHA; -#elif defined(__powerpc__) -enum target_cpu target_cpu = CPU_POWERPC; #else #error Unsupported CPU #endif Modified: trunk/reactos/tools/winebuild/winebuild.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winebuild.… ============================================================================== --- trunk/reactos/tools/winebuild/winebuild.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/winebuild/winebuild.rbuild [iso-8859-1] Sun Oct 26 13:03:06 2008 @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> <module name="winebuild" type="buildtool"> - <include base="ReactOS">include/reactos/wine</include> - <include base="ReactOS">include/reactos</include> - <include base="ReactOS">include</include> - <include base="ReactOS" root="intermediate">include</include> <file>import.c</file> <file>main.c</file> <file>parser.c</file> Modified: trunk/reactos/tools/wmc/wmc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/wmc.rbuild?rev=3… ============================================================================== --- trunk/reactos/tools/wmc/wmc.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/wmc/wmc.rbuild [iso-8859-1] Sun Oct 26 13:03:06 2008 @@ -3,10 +3,6 @@ <module name="wmc" type="buildtool" allowwarnings="true"> <define name="WINE_UNICODE_API">" "</define> <include base="unicode">.</include> - <include base="ReactOS">include/reactos/wine</include> - <include base="ReactOS">include/reactos</include> - <include base="ReactOS">include</include> - <include base="ReactOS" root="intermediate">include</include> <library>unicode</library> <file>lang.c</file> <file>mcl.c</file> Modified: trunk/reactos/tools/wpp/wpp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/wpp.rbuild?rev=3… ============================================================================== --- trunk/reactos/tools/wpp/wpp.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/wpp/wpp.rbuild [iso-8859-1] Sun Oct 26 13:03:06 2008 @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> <module name="wpp" type="hoststaticlibrary" allowwarnings="true"> - <include base="ReactOS">include/reactos/wine</include> - <include base="ReactOS">include/reactos</include> - <include base="ReactOS">include</include> - <include base="ReactOS" root="intermediate">include</include> <file>lex.yy.c</file> <file>preproc.c</file> <file>wpp.c</file> Modified: trunk/reactos/tools/wrc/wrc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/wrc.rbuild?rev=3… ============================================================================== --- trunk/reactos/tools/wrc/wrc.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/wrc/wrc.rbuild [iso-8859-1] Sun Oct 26 13:03:06 2008 @@ -4,10 +4,6 @@ <define name="WINE_UNICODE_API">" "</define> <include base="unicode" /> <include base="wpp" /> - <include base="ReactOS">include/reactos/wine</include> - <include base="ReactOS">include/reactos</include> - <include base="ReactOS">include</include> - <include base="ReactOS" root="intermediate">include</include> <library>unicode</library> <library>wpp</library> <file>dumpres.c</file>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs