Ros-diffs July 2007

ros-diffs@reactos.org

20 participants
707 discussions

[cwittich] 27376: add stdole2.tlb to bootcd
by cwittich＠svn.reactos.org 03 Jul '07

03 Jul '07

Author: cwittich Date: Tue Jul 3 23:12:19 2007 New Revision: 27376 URL: http://svn.reactos.org/svn/reactos?rev=27376&view=rev Log: add stdole2.tlb to bootcd 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 (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Tue Jul 3 23:12:19 2007 @@ -218,6 +218,7 @@ dll\win32\shfolder\shfolder.dll 1 dll\win32\shlwapi\shlwapi.dll 1 dll\win32\smdll\smdll.dll 1 +dll\win32\stdole2.tlb\stdole2.tlb 1 dll\win32\syssetup\syssetup.dll 1 dll\win32\twain_32\twain_32.dll 1 dll\win32\ufat\ufat.dll 1

1 0

[cwittich] 27375: add stdole2.tlb to build
by cwittich＠svn.reactos.org 03 Jul '07

03 Jul '07

Author: cwittich Date: Tue Jul 3 23:11:35 2007 New Revision: 27375 URL: http://svn.reactos.org/svn/reactos?rev=27375&view=rev Log: add stdole2.tlb to build Added: trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild Modified: trunk/reactos/dll/win32/win32.rbuild Added: trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole2.tlb/stdo… ============================================================================== --- trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild (added) +++ trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild Tue Jul 3 23:11:35 2007 @@ -1,0 +1,28 @@ +<group> +<module name="std_ole_v2" type="embeddedtypelib"> + <include base="std_ole_v2">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__REACTOS__" /> + <define name="__WINESRC__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <file>std_ole_v2.idl</file> +</module> +<module name="stdole2" type="win32dll" extension=".tlb" installbase="system32" installname="stdole2.tlb"> + <importlibrary definition="stdole2.tlb.spec.def" /> + <include base="stdole2">.</include> + <include base="ReactOS">include/reactos/wine</include> + <dependency>std_ole_v2</dependency> + <define name="__REACTOS__" /> + <define name="__WINESRC__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>kernel32</library> + <file>stdole2.tlb.spec</file> + <file>rsrc.rc</file> +</module> +</group> Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Tue Jul 3 23:11:35 2007 @@ -244,6 +244,9 @@ <directory name="snmpapi"> <xi:include href="snmpapi/snmpapi.rbuild" /> </directory> +<directory name="stdole2.tlb"> + <xi:include href="stdole2.tlb/stdole2.rbuild" /> +</directory> <directory name="syssetup"> <xi:include href="syssetup/syssetup.rbuild" /> </directory>

1 0

[cwittich] 27374: renamed TypeLib target to EmbeddedTypeLib
by cwittich＠svn.reactos.org 03 Jul '07

03 Jul '07

Author: cwittich Date: Tue Jul 3 23:10:33 2007 New Revision: 27374 URL: http://svn.reactos.org/svn/reactos?rev=27374&view=rev Log: renamed TypeLib target to EmbeddedTypeLib Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h trunk/reactos/tools/rbuild/bootstrap.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h 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 (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Tue Jul 3 23:10:33 2007 @@ -265,8 +265,8 @@ case IdlHeader: handler = new MingwIdlHeaderModuleHandler ( module ); break; - case TypeLib: - handler = new MingwTypeLibModuleHandler ( module ); + case EmbeddedTypeLib: + handler = new MingwEmbeddedTypeLibModuleHandler ( module ); break; default: throw UnknownModuleTypeException ( @@ -1263,7 +1263,7 @@ } void -MingwModuleHandler::GenerateWidlCommandsTypeLib ( +MingwModuleHandler::GenerateWidlCommandsEmbeddedTypeLib ( const CompilationUnit& compilationUnit, const string& widlflagsMacro ) { @@ -1272,19 +1272,22 @@ string dependencies = filename; dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); - string TypeLibFilename = module.GetTargetName (); - + string basename = GetBasename ( filename ); + string EmbeddedTypeLibFilename = basename + ".tlb"; + fprintf ( fMakefile, "%s: %s $(WIDL_TARGET) | %s\n", GetTargetMacro ( module ).c_str (), dependencies.c_str (), - GetDirectory ( TypeLibFilename ).c_str () ); + GetDirectory ( EmbeddedTypeLibFilename ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_WIDL)\n" ); fprintf ( fMakefile, - "\t%s %s %s -t -T $@ %s\n", + //"\t%s %s %s -t -T $@ %s\n", + "\t%s %s %s -t -T %s %s\n", "$(Q)$(WIDL_TARGET)", GetWidlFlags ( compilationUnit ).c_str (), widlflagsMacro.c_str (), + EmbeddedTypeLibFilename.c_str(), filename.c_str () ); } @@ -1366,8 +1369,8 @@ else if ( module.type == RpcClient ) GenerateWidlCommandsClient ( compilationUnit, widlflagsMacro ); - else if ( module.type == TypeLib ) - GenerateWidlCommandsTypeLib ( compilationUnit, + else if ( module.type == EmbeddedTypeLib ) + GenerateWidlCommandsEmbeddedTypeLib ( compilationUnit, widlflagsMacro ); else // applies also for other module.types which include idl files GenerateWidlCommandsIdlHeader ( compilationUnit, @@ -2492,7 +2495,7 @@ { } -MingwTypeLibModuleHandler::MingwTypeLibModuleHandler ( +MingwEmbeddedTypeLibModuleHandler::MingwEmbeddedTypeLibModuleHandler ( const Module& module_ ) : MingwModuleHandler ( module_ ) @@ -2500,7 +2503,7 @@ } void -MingwTypeLibModuleHandler::Process () +MingwEmbeddedTypeLibModuleHandler::Process () { GenerateRules (); } 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 (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Tue Jul 3 23:10:33 2007 @@ -172,7 +172,7 @@ void GenerateWidlCommandsIdlHeader ( const CompilationUnit& compilationUnit, const std::string& widlflagsMacro ); - void GenerateWidlCommandsTypeLib ( + void GenerateWidlCommandsEmbeddedTypeLib ( const CompilationUnit& compilationUnit, const std::string& widlflagsMacro ); void GenerateWidlCommands ( const CompilationUnit& compilationUnit, @@ -505,10 +505,10 @@ virtual void Process (); }; -class MingwTypeLibModuleHandler : public MingwModuleHandler -{ -public: - MingwTypeLibModuleHandler ( const Module& module ); +class MingwEmbeddedTypeLibModuleHandler : public MingwModuleHandler +{ +public: + MingwEmbeddedTypeLibModuleHandler ( const Module& module ); virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); }; Modified: trunk/reactos/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/bootstrap.cpp… ============================================================================== --- trunk/reactos/tools/rbuild/bootstrap.cpp (original) +++ trunk/reactos/tools/rbuild/bootstrap.cpp Tue Jul 3 23:10:33 2007 @@ -68,7 +68,7 @@ case RpcClient: case Alias: case IdlHeader: - case TypeLib: + case EmbeddedTypeLib: return false; } throw InvalidOperationException ( __FILE__, Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Tue Jul 3 23:10:33 2007 @@ -839,8 +839,8 @@ return Alias; if ( attribute.value == "idlheader" ) return IdlHeader; - if ( attribute.value == "typelib" ) - return TypeLib; + if ( attribute.value == "embeddedtypelib" ) + return EmbeddedTypeLib; throw InvalidAttributeValueException ( location, attribute.name, attribute.value ); @@ -892,7 +892,7 @@ case BootProgram: case IdlHeader: return ""; - case TypeLib: + case EmbeddedTypeLib: return ".tlb"; } throw InvalidOperationException ( __FILE__, @@ -943,7 +943,7 @@ case Alias: case BootProgram: case IdlHeader: - case TypeLib: + case EmbeddedTypeLib: return ""; } throw InvalidOperationException ( __FILE__, @@ -986,7 +986,7 @@ case Alias: case BootProgram: case IdlHeader: - case TypeLib: + case EmbeddedTypeLib: return ""; } throw InvalidOperationException ( __FILE__, @@ -1031,7 +1031,7 @@ case RpcClient: case Alias: case IdlHeader: - case TypeLib: + case EmbeddedTypeLib: return false; } throw InvalidOperationException ( __FILE__, @@ -1063,7 +1063,7 @@ case LiveIso: case IsoRegTest: case LiveIsoRegTest: - case TypeLib: + case EmbeddedTypeLib: return true; case StaticLibrary: case ObjectLibrary: @@ -1565,7 +1565,7 @@ case RpcClient: case Alias: case IdlHeader: - case TypeLib: + case EmbeddedTypeLib: return false; } throw InvalidOperationException ( __FILE__, 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 (original) +++ trunk/reactos/tools/rbuild/rbuild.h Tue Jul 3 23:10:33 2007 @@ -274,7 +274,7 @@ IdlHeader = 23, IsoRegTest = 24, LiveIsoRegTest = 25, - TypeLib = 26 + EmbeddedTypeLib = 26 }; enum HostType

1 0

[cwittich] 27373: Copied remotely
by cwittich＠svn.reactos.org 03 Jul '07

03 Jul '07

Author: cwittich Date: Tue Jul 3 23:09:50 2007 New Revision: 27373 URL: http://svn.reactos.org/svn/reactos?rev=27373&view=rev Log: Copied remotely Added: trunk/reactos/dll/win32/stdole2.tlb/ - copied from r27372, vendor/wine/dlls/stdole2.tlb/current/

1 0

[cwittich] 27372: Copied remotely
by cwittich＠svn.reactos.org 03 Jul '07

03 Jul '07

Author: cwittich Date: Tue Jul 3 23:08:00 2007 New Revision: 27372 URL: http://svn.reactos.org/svn/reactos?rev=27372&view=rev Log: Copied remotely Added: vendor/wine/dlls/stdole2.tlb/Wine-0_9_40/ - copied from r27371, vendor/wine/dlls/stdole2.tlb/current/

1 0

[cwittich] 27371: delete old stdole in vendor dir
by cwittich＠svn.reactos.org 03 Jul '07

03 Jul '07

Author: cwittich Date: Tue Jul 3 23:07:05 2007 New Revision: 27371 URL: http://svn.reactos.org/svn/reactos?rev=27371&view=rev Log: delete old stdole in vendor dir Removed: vendor/wine/dlls/stdole2/

1 0

[cwittich] 27370: stdole2.tlb vendor drop
by cwittich＠svn.reactos.org 03 Jul '07

03 Jul '07

Author: cwittich Date: Tue Jul 3 23:05:33 2007 New Revision: 27370 URL: http://svn.reactos.org/svn/reactos?rev=27370&view=rev Log: stdole2.tlb vendor drop Added: vendor/wine/dlls/stdole2.tlb/ vendor/wine/dlls/stdole2.tlb/current/ vendor/wine/dlls/stdole2.tlb/current/rsrc.rc vendor/wine/dlls/stdole2.tlb/current/std_ole_v2.idl vendor/wine/dlls/stdole2.tlb/current/stdole2.tlb.spec Added: vendor/wine/dlls/stdole2.tlb/current/rsrc.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/stdole2.tlb/current/rsr… ============================================================================== --- vendor/wine/dlls/stdole2.tlb/current/rsrc.rc (added) +++ vendor/wine/dlls/stdole2.tlb/current/rsrc.rc Tue Jul 3 23:05:33 2007 @@ -1,0 +1,31 @@ +/* + * Resource file for stdole2 + * + * Copyright 2005 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winnls.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#include "wine/wine_common_ver.rc" + +1 TYPELIB LOADONCALL DISCARDABLE std_ole_v2.tlb Added: vendor/wine/dlls/stdole2.tlb/current/std_ole_v2.idl URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/stdole2.tlb/current/std… ============================================================================== --- vendor/wine/dlls/stdole2.tlb/current/std_ole_v2.idl (added) +++ vendor/wine/dlls/stdole2.tlb/current/std_ole_v2.idl Tue Jul 3 23:05:33 2007 @@ -1,0 +1,21 @@ +/* + * Copyright (C) 2003 Robert Shearman + * 2005 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "stdole2.idl" Added: vendor/wine/dlls/stdole2.tlb/current/stdole2.tlb.spec URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/stdole2.tlb/current/std… ============================================================================== --- vendor/wine/dlls/stdole2.tlb/current/stdole2.tlb.spec (added) +++ vendor/wine/dlls/stdole2.tlb/current/stdole2.tlb.spec Tue Jul 3 23:05:33 2007 @@ -1,0 +1,1 @@ +# no exported entry points

1 0

[fireball] 27369: - Add debug prints.
by fireball＠svn.reactos.org 03 Jul '07

03 Jul '07

Author: fireball Date: Tue Jul 3 21:59:35 2007 New Revision: 27369 URL: http://svn.reactos.org/svn/reactos?rev=27369&view=rev Log: - Add debug prints. Modified: trunk/reactos/ntoskrnl/ke/timerobj.c Modified: trunk/reactos/ntoskrnl/ke/timerobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/timerobj.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/timerobj.c (original) +++ trunk/reactos/ntoskrnl/ke/timerobj.c Tue Jul 3 21:59:35 2007 @@ -32,6 +32,8 @@ LONGLONG DueTime; LARGE_INTEGER InterruptTime, SystemTime, DifferenceTime; PKTIMER_TABLE_ENTRY TimerEntry; + + DPRINT("KiInsertTreeTimer(): Timer %p, Interval: %I64d\n", Timer, Interval.QuadPart); /* Convert to relative time if needed */ Timer->Header.Absolute = FALSE; @@ -109,6 +111,8 @@ PLIST_ENTRY ListHead, NextEntry; PKTIMER CurrentTimer; + DPRINT("KiInsertTimerTable(): Timer %p, Hand: %d\n", Timer, Hand); + /* Check if the period is zero */ if (!Timer->Period) Timer->Header.SignalState = FALSE; @@ -156,6 +160,8 @@ PKDPC Dpc = Timer->Dpc; ULONG Period = Timer->Period; LARGE_INTEGER Interval, SystemTime; + + DPRINT("KiSignalTimer(): Timer %p\n", Timer); /* Set default values */ Timer->Header.Inserted = FALSE; @@ -209,6 +215,8 @@ PKTIMER_TABLE_ENTRY TimerEntry; BOOLEAN RequestInterrupt = FALSE; + DPRINT("KiCompleteTimer(): Timer %p, LockQueue: %p\n", Timer, LockQueue); + /* Remove it from the timer list */ if (RemoveEntryList(&Timer->TimerListEntry)) { @@ -257,6 +265,8 @@ ASSERT_TIMER(Timer); ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); + DPRINT("KeCancelTimer(): Timer %p\n", Timer); + /* Lock the Database and Raise IRQL */ OldIrql = KiAcquireDispatcherLock(); @@ -290,6 +300,9 @@ KeInitializeTimerEx(OUT PKTIMER Timer, IN TIMER_TYPE Type) { + DPRINT("KeInitializeTimerEx(): Timer %p, Type %s\n", + Timer, (Type == NotificationTimer) ? "NotificationTimer" : "SynchronizationTimer"); + /* Initialize the Dispatch Header */ KeInitializeDispatcherHeader(&Timer->Header, TimerNotificationObject + Type, @@ -344,6 +357,9 @@ ASSERT_TIMER(Timer); ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); + DPRINT("KeSetTimerEx(): Timer %p, DueTime %I64d, Period %d, Dpc %p\n", + Timer, DueTime.QuadPart, Period, Dpc); + /* Lock the Database and Raise IRQL */ OldIrql = KiAcquireDispatcherLock();

1 0

[cwittich] 27368: -added support for TypeLibs
by cwittich＠svn.reactos.org 03 Jul '07

03 Jul '07

Author: cwittich Date: Tue Jul 3 19:27:43 2007 New Revision: 27368 URL: http://svn.reactos.org/svn/reactos?rev=27368&view=rev Log: -added support for TypeLibs Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h trunk/reactos/tools/rbuild/bootstrap.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h 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 (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Tue Jul 3 19:27:43 2007 @@ -265,6 +265,9 @@ case IdlHeader: handler = new MingwIdlHeaderModuleHandler ( module ); break; + case TypeLib: + handler = new MingwTypeLibModuleHandler ( module ); + break; default: throw UnknownModuleTypeException ( module.node.location, @@ -320,13 +323,17 @@ backend->intermediateDirectory ); return new FileLocation ( backend->intermediateDirectory, NormalizeFilename ( newname ) ); } - else //if ( module.type == IdlHeader ) + else if ( module.type == IdlHeader ) { newname = basename + ".h"; PassThruCacheDirectory ( NormalizeFilename ( newname ), backend->intermediateDirectory ); return new FileLocation ( fileLocation->directory, filename ); } + else + { + return new FileLocation ( fileLocation->directory, filename ); + } } else return new FileLocation ( fileLocation->directory, filename ); @@ -342,8 +349,10 @@ string basename = GetBasename ( filename ); if ( (module.type == RpcServer) || (module.type == RpcClient) ) return GetRpcServerHeaderFilename ( basename ) + " " + GetRpcClientHeaderFilename ( basename ); + else if ( module.type == IdlHeader ) + return GetIdlHeaderFilename ( basename ); else - return GetIdlHeaderFilename ( basename ); + return ""; } else return ""; @@ -1254,6 +1263,32 @@ } void +MingwModuleHandler::GenerateWidlCommandsTypeLib ( + const CompilationUnit& compilationUnit, + const string& widlflagsMacro ) +{ + FileLocation* sourceFileLocation = compilationUnit.GetFilename ( backend->intermediateDirectory ); + string filename = sourceFileLocation->filename; + string dependencies = filename; + dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); + + string TypeLibFilename = module.GetTargetName (); + + fprintf ( fMakefile, + "%s: %s $(WIDL_TARGET) | %s\n", + GetTargetMacro ( module ).c_str (), + dependencies.c_str (), + GetDirectory ( TypeLibFilename ).c_str () ); + fprintf ( fMakefile, "\t$(ECHO_WIDL)\n" ); + fprintf ( fMakefile, + "\t%s %s %s -t -T $@ %s\n", + "$(Q)$(WIDL_TARGET)", + GetWidlFlags ( compilationUnit ).c_str (), + widlflagsMacro.c_str (), + filename.c_str () ); +} + +void MingwModuleHandler::GenerateWidlCommandsClient ( const CompilationUnit& compilationUnit, const string& widlflagsMacro ) @@ -1331,7 +1366,10 @@ else if ( module.type == RpcClient ) GenerateWidlCommandsClient ( compilationUnit, widlflagsMacro ); - else + else if ( module.type == TypeLib ) + GenerateWidlCommandsTypeLib ( compilationUnit, + widlflagsMacro ); + else // applies also for other module.types which include idl files GenerateWidlCommandsIdlHeader ( compilationUnit, widlflagsMacro ); } @@ -2454,6 +2492,20 @@ { } +MingwTypeLibModuleHandler::MingwTypeLibModuleHandler ( + const Module& module_ ) + + : MingwModuleHandler ( module_ ) +{ +} + +void +MingwTypeLibModuleHandler::Process () +{ + GenerateRules (); +} + + void MingwKernelModeDLLModuleHandler::AddImplicitLibraries ( Module& module ) { 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 (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Tue Jul 3 19:27:43 2007 @@ -170,6 +170,9 @@ const CompilationUnit& compilationUnit, const std::string& widlflagsMacro ); void GenerateWidlCommandsIdlHeader ( + const CompilationUnit& compilationUnit, + const std::string& widlflagsMacro ); + void GenerateWidlCommandsTypeLib ( const CompilationUnit& compilationUnit, const std::string& widlflagsMacro ); void GenerateWidlCommands ( const CompilationUnit& compilationUnit, @@ -502,4 +505,12 @@ virtual void Process (); }; +class MingwTypeLibModuleHandler : public MingwModuleHandler +{ +public: + MingwTypeLibModuleHandler ( const Module& module ); + virtual HostType DefaultHost() { return HostFalse; } + virtual void Process (); +}; + #endif /* MINGW_MODULEHANDLER_H */ Modified: trunk/reactos/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/bootstrap.cpp… ============================================================================== --- trunk/reactos/tools/rbuild/bootstrap.cpp (original) +++ trunk/reactos/tools/rbuild/bootstrap.cpp Tue Jul 3 19:27:43 2007 @@ -68,6 +68,7 @@ case RpcClient: case Alias: case IdlHeader: + case TypeLib: return false; } throw InvalidOperationException ( __FILE__, Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Tue Jul 3 19:27:43 2007 @@ -839,6 +839,8 @@ return Alias; if ( attribute.value == "idlheader" ) return IdlHeader; + if ( attribute.value == "typelib" ) + return TypeLib; throw InvalidAttributeValueException ( location, attribute.name, attribute.value ); @@ -890,6 +892,8 @@ case BootProgram: case IdlHeader: return ""; + case TypeLib: + return ".tlb"; } throw InvalidOperationException ( __FILE__, __LINE__ ); @@ -939,6 +943,7 @@ case Alias: case BootProgram: case IdlHeader: + case TypeLib: return ""; } throw InvalidOperationException ( __FILE__, @@ -981,6 +986,7 @@ case Alias: case BootProgram: case IdlHeader: + case TypeLib: return ""; } throw InvalidOperationException ( __FILE__, @@ -1025,6 +1031,7 @@ case RpcClient: case Alias: case IdlHeader: + case TypeLib: return false; } throw InvalidOperationException ( __FILE__, @@ -1056,6 +1063,7 @@ case LiveIso: case IsoRegTest: case LiveIsoRegTest: + case TypeLib: return true; case StaticLibrary: case ObjectLibrary: @@ -1557,6 +1565,7 @@ case RpcClient: case Alias: case IdlHeader: + case TypeLib: return false; } throw InvalidOperationException ( __FILE__, 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 (original) +++ trunk/reactos/tools/rbuild/rbuild.h Tue Jul 3 19:27:43 2007 @@ -273,7 +273,8 @@ ExportDriver = 22, IdlHeader = 23, IsoRegTest = 24, - LiveIsoRegTest = 25 + LiveIsoRegTest = 25, + TypeLib = 26 }; enum HostType

1 0

[fireball] 27367: - Revert changes to CRT which were not supposed to happen at all (26820, 27200:27204), and were incorrect. - Remove artifacts from strtoul/strtoull source code (excessive line breaks).
by fireball＠svn.reactos.org 03 Jul '07

03 Jul '07

Author: fireball Date: Tue Jul 3 19:24:59 2007 New Revision: 27367 URL: http://svn.reactos.org/svn/reactos?rev=27367&view=rev Log: - Revert changes to CRT which were not supposed to happen at all (26820, 27200:27204), and were incorrect. - Remove artifacts from strtoul/strtoull source code (excessive line breaks). Added: trunk/reactos/lib/sdk/libcntpr/math/i386/atan_asm.s - copied unchanged from r27199, trunk/reactos/lib/sdk/libcntpr/math/i386/atan_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/cos_asm.s - copied unchanged from r27199, trunk/reactos/lib/sdk/libcntpr/math/i386/cos_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/sin_asm.s - copied unchanged from r27199, trunk/reactos/lib/sdk/libcntpr/math/i386/sin_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/tan_asm.s - copied unchanged from r27199, trunk/reactos/lib/sdk/libcntpr/math/i386/tan_asm.s Removed: trunk/reactos/lib/sdk/libcntpr/math/i386/trig_asm.s Modified: trunk/reactos/lib/sdk/crt/math/i386/atan_asm.s trunk/reactos/lib/sdk/crt/math/i386/log10_asm.s trunk/reactos/lib/sdk/libcntpr/libcntpr.rbuild trunk/reactos/lib/sdk/libcntpr/string/strtoul.c trunk/reactos/lib/sdk/libcntpr/string/strtoull.c Modified: trunk/reactos/lib/sdk/crt/math/i386/atan_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/atan… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/atan_asm.s (original) +++ trunk/reactos/lib/sdk/crt/math/i386/atan_asm.s Tue Jul 3 19:24:59 2007 @@ -14,6 +14,9 @@ /* FUNCTIONS ***************************************************************/ _atan: - fld qword ptr [esp+4] - fpatan + push ebp + mov ebp,esp + fld qword ptr [ebp+8] + fpatan + pop ebp ret Modified: trunk/reactos/lib/sdk/crt/math/i386/log10_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/log1… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/log10_asm.s (original) +++ trunk/reactos/lib/sdk/crt/math/i386/log10_asm.s Tue Jul 3 19:24:59 2007 @@ -15,8 +15,11 @@ /* FUNCTIONS ***************************************************************/ _log10: - fld qword ptr [esp+4] - fldlg2 - fyl2x + push ebp + mov ebp,esp + fld qword ptr [ebp+8] + fldlg2 + fyl2x + pop ebp ret Modified: trunk/reactos/lib/sdk/libcntpr/libcntpr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/libcntpr.… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/libcntpr.rbuild (original) +++ trunk/reactos/lib/sdk/libcntpr/libcntpr.rbuild Tue Jul 3 19:24:59 2007 @@ -26,18 +26,21 @@ <file>allrem_asm.s</file> <file>allshl_asm.s</file> <file>allshr_asm.s</file> + <file>atan_asm.s</file> <file>aulldiv_asm.s</file> <file>aulldvrm_asm.s</file> <file>aullrem_asm.s</file> <file>aullshr_asm.s</file> <file>ceil_asm.s</file> + <file>cos_asm.s</file> <file>fabs_asm.s</file> <file>floor_asm.s</file> <file>ftol_asm.s</file> <file>log_asm.s</file> <file>pow_asm.s</file> + <file>sin_asm.s</file> <file>sqrt_asm.s</file> - <file>trig_asm.s</file> + <file>tan_asm.s</file> </directory> </if> <file>abs.c</file> Removed: trunk/reactos/lib/sdk/libcntpr/math/i386/trig_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/trig_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/trig_asm.s (removed) @@ -1,53 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Run-Time Library - * FILE: lib/rtl/i386/trig_asm.s - * PROGRAMER: Aleksey Bragin (aleksey reactos org) - * - */ -.globl _atan -.globl _cos -.globl _sin -.globl _tan - -.intel_syntax noprefix - -/* FUNCTIONS ***************************************************************/ - -_atan: - push ebp - mov ebp,esp - fld qword ptr [ebp+8] - fld1 - fpatan - pop ebp - ret - -_cos: - push ebp - mov ebp,esp - fld qword ptr [ebp+8] - fcos - pop ebp - ret - -_sin: - push ebp - mov ebp,esp - fld qword ptr [ebp+8] - fsin - pop ebp - ret - -_tan: - push ebp - mov ebp,esp - sub esp,4 - fld qword ptr [ebp+8] - fptan - fstp dword ptr [ebp-4] - mov esp,ebp - pop ebp - ret - Modified: trunk/reactos/lib/sdk/libcntpr/string/strtoul.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/string/st… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/string/strtoul.c (original) +++ trunk/reactos/lib/sdk/libcntpr/string/strtoul.c Tue Jul 3 19:24:59 2007 @@ -3,7 +3,6 @@ #include <errno.h> #include <limits.h> #include <ctype.h> - /* * Convert a string to an unsigned long integer. @@ -67,7 +66,6 @@ if (any < 0) { acc = ULONG_MAX; - } else if (neg) acc = -acc; Modified: trunk/reactos/lib/sdk/libcntpr/string/strtoull.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/string/st… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/string/strtoull.c (original) +++ trunk/reactos/lib/sdk/libcntpr/string/strtoull.c Tue Jul 3 19:24:59 2007 @@ -3,7 +3,6 @@ #include <fcntl.h> #include <limits.h> #include <ctype.h> - unsigned long long strtoull(const char *nptr, char **endptr, int base) @@ -59,7 +58,6 @@ if (any < 0) { acc = ULLONG_MAX; - } else if (neg) acc = -acc; @@ -67,5 +65,3 @@ *endptr = any ? (char *)((size_t)(s - 1)) : (char *)((size_t)nptr); return acc; } - -

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 July 2007