Ros-diffs March 2007

ros-diffs@reactos.org

20 participants
287 discussions

[cwittich] 25959: fix the msvc backend on linux hosts
by cwittich＠svn.reactos.org 02 Mar '07

02 Mar '07

Author: cwittich Date: Fri Mar 2 23:53:41 2007 New Revision: 25959 URL: http://svn.reactos.org/svn/reactos?rev=25959&view=rev Log: fix the msvc backend on linux hosts Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp trunk/reactos/tools/rbuild/backend/msvc/msvc.h trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp Fri Mar 2 23:53:41 2007 @@ -224,7 +224,7 @@ std::string MSVCBackend::OptFileName ( const Module& module ) const { - return DosSeparator( + return FixSeparatorForSystemCommand( ReplaceExtension ( module.GetPath(), "_" + _get_vc_dir() + "_auto.opt" ) ); } @@ -232,7 +232,7 @@ std::string MSVCBackend::SuoFileName ( const Module& module ) const { - return DosSeparator( + return FixSeparatorForSystemCommand( ReplaceExtension ( module.GetPath(), "_" + _get_vc_dir() + "_auto.suo" ) ); } @@ -240,7 +240,7 @@ std::string MSVCBackend::DswFileName ( const Module& module ) const { - return DosSeparator( + return FixSeparatorForSystemCommand( ReplaceExtension ( module.GetPath(), "_auto.dsw" ) ); } @@ -248,7 +248,7 @@ std::string MSVCBackend::SlnFileName ( const Module& module ) const { - return DosSeparator( + return FixSeparatorForSystemCommand( ReplaceExtension ( module.GetPath(), "_" + _get_vc_dir() + "_auto.sln" ) ); } @@ -256,7 +256,7 @@ std::string MSVCBackend::NcbFileName ( const Module& module ) const { - return DosSeparator( + return FixSeparatorForSystemCommand( ReplaceExtension ( module.GetPath(), "_" + _get_vc_dir() + "_auto.ncb" ) ); } @@ -264,7 +264,7 @@ std::string MSVCBackend::DspFileName ( const Module& module ) const { - return DosSeparator( + return FixSeparatorForSystemCommand( ReplaceExtension ( module.GetPath(), "_auto.dsp" ) ); } @@ -272,7 +272,7 @@ std::string MSVCBackend::VcprojFileName ( const Module& module ) const { - return DosSeparator( + return FixSeparatorForSystemCommand( ReplaceExtension ( module.GetPath(), "_" + _get_vc_dir() + "_auto.vcproj" ) ); } @@ -297,13 +297,13 @@ string basepath = module.GetBasePath (); string vcdir = _get_vc_dir (); size_t i; - string intenv = Environment::GetIntermediatePath () + "\\" + basepath + "\\"; - string outenv = Environment::GetOutputPath () + "\\" + basepath + "\\"; + string intenv = Environment::GetIntermediatePath () + DEF_SSEP + basepath + DEF_SSEP; + string outenv = Environment::GetOutputPath () + DEF_SSEP + basepath + DEF_SSEP; if ( configuration.UseVSVersionInPath ) { - intenv += vcdir + "\\"; - outenv += vcdir + "\\"; + intenv += vcdir + DEF_SSEP; + outenv += vcdir + DEF_SSEP; } string dbg = vcdir.substr ( 0, 3 ); @@ -336,7 +336,7 @@ for ( i = 0; i < files.size (); i++ ) { string file = files[i]->name; - string::size_type pos = file.find_last_of ("\\"); + string::size_type pos = file.find_last_of (DEF_SSEP); if ( pos != string::npos ) file.erase ( 0, pos+1 ); if ( !stricmp ( Right(file,3).c_str(), ".rc" ) ) @@ -379,7 +379,7 @@ { file.insert (pos, "_msvc"); } - modulename += "\\" + file; + modulename += DEF_SSEP + file; out.push_back (modulename); } } @@ -460,8 +460,8 @@ if ( module.installBase == "" || module.installName == "" ) continue; - string inputname = Environment::GetOutputPath () + "\\" + module.GetBasePath () + "\\" + vcdir + "\\" + config + "\\" + module.GetTargetName (); - string installdir = Environment::GetInstallPath () + "\\" + module.installBase + "\\" + module.installName; + string inputname = Environment::GetOutputPath () + DEF_SSEP + module.GetBasePath () + DEF_SSEP + vcdir + DEF_SSEP + config + DEF_SSEP + module.GetTargetName (); + string installdir = Environment::GetInstallPath () + DEF_SSEP + module.installBase + DEF_SSEP + module.installName; if ( _copy_file( inputname, installdir ) ) printf ("Installed File :'%s'\n",installdir.c_str () ); } Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvc.h (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.h Fri Mar 2 23:53:41 2007 @@ -112,7 +112,7 @@ // functions in vcprojmaker.cpp: - std::string _get_solution_verion ( void ); + std::string _get_solution_version ( void ); std::string _gen_guid(); std::string _replace_str( std::string string1, Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Fri Mar 2 23:53:41 2007 @@ -116,7 +116,7 @@ if ( configuration.UseVSVersionInPath ) { - vcdir = "\\" + _get_vc_dir(); + vcdir = DEF_SSEP + _get_vc_dir(); } // TODO FIXME - need more checks here for 'sys' and possibly 'drv'? @@ -758,7 +758,7 @@ } std::string -MSVCBackend::_get_solution_verion ( void ) +MSVCBackend::_get_solution_version ( void ) { string version; @@ -780,7 +780,7 @@ void MSVCBackend::_generate_sln_header ( FILE* OUT ) { - fprintf ( OUT, "Microsoft Visual Studio Solution File, Format Version %s\r\n", _get_solution_verion().c_str() ); + fprintf ( OUT, "Microsoft Visual Studio Solution File, Format Version %s\r\n", _get_solution_version().c_str() ); fprintf ( OUT, "# Visual Studio 2005\r\n" ); fprintf ( OUT, "\r\n" ); }

1 0

[ion] 25958: -Fix build
by ion＠svn.reactos.org 02 Mar '07

02 Mar '07

Author: ion Date: Fri Mar 2 23:40:48 2007 New Revision: 25958 URL: http://svn.reactos.org/svn/reactos?rev=25958&view=rev Log: -Fix build Modified: trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h (original) +++ trunk/reactos/include/ndk/pstypes.h Fri Mar 2 23:40:48 2007 @@ -160,8 +160,8 @@ // TLS Slots // #define TLS_MINIMUM_AVAILABLE 64 +#endif #define TLS_EXPANSION_SLOTS 1024 -#endif // // Job Access Types

1 0

[cwittich] 25957: fix a crash in the msvc8 backend
by cwittich＠svn.reactos.org 02 Mar '07

02 Mar '07

Author: cwittich Date: Fri Mar 2 23:30:12 2007 New Revision: 25957 URL: http://svn.reactos.org/svn/reactos?rev=25957&view=rev Log: fix a crash in the msvc8 backend Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Fri Mar 2 23:30:12 2007 @@ -71,9 +71,16 @@ size_t i; string vcproj_file = VcprojFileName(module); - - string username = getenv ( "USERNAME" ); - string computername = getenv ( "COMPUTERNAME" ); + string computername; + string username; + + if (getenv ( "USERNAME" ) != NULL) + username = getenv ( "USERNAME" ); + if (getenv ( "COMPUTERNAME" ) != NULL) + computername = getenv ( "COMPUTERNAME" ); + else if (getenv ( "HOSTNAME" ) != NULL) + computername = getenv ( "HOSTNAME" ); + string vcproj_file_user = ""; if ((computername != "") && (username != ""))

1 0

[ion] 25956: - Fix various ntoskrnl/wdk compilation issues in rossym, cmlib, kdcom, rtl. - Rename one more duplicated file in the kernel which wasn't caught previously. - pseh, rossym, cmlib, kdcom, bootvid, rtl compile & link, and ntoskrnl is now down to only 23 linker errors.
by ion＠svn.reactos.org 02 Mar '07

02 Mar '07

Author: ion Date: Fri Mar 2 22:52:29 2007 New Revision: 25956 URL: http://svn.reactos.org/svn/reactos?rev=25956&view=rev Log: - Fix various ntoskrnl/wdk compilation issues in rossym, cmlib, kdcom, rtl. - Rename one more duplicated file in the kernel which wasn't caught previously. - pseh, rossym, cmlib, kdcom, bootvid, rtl compile & link, and ntoskrnl is now down to only 23 linker errors. Added: trunk/reactos/ntoskrnl/ps/psnotify.c - copied unchanged from r25926, trunk/reactos/ntoskrnl/ps/notify.c Removed: trunk/reactos/ntoskrnl/ps/notify.c Modified: trunk/reactos/drivers/base/kdcom/kdbg.c trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/lib/rossym/fromfile.c trunk/reactos/lib/rossym/frommem.c trunk/reactos/lib/rtl/austin/avl.c trunk/reactos/lib/rtl/austin/tree.c trunk/reactos/lib/rtl/qsort.c trunk/reactos/lib/rtl/rtl.h trunk/reactos/lib/rtl/sprintf.c trunk/reactos/lib/rtl/srw.c trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/drivers/base/kdcom/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdbg.c?… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdbg.c (original) +++ trunk/reactos/drivers/base/kdcom/kdbg.c Fri Mar 2 22:52:29 2007 @@ -12,6 +12,7 @@ /* INCLUDES *****************************************************************/ +#define NOEXTAPI #include <ntddk.h> #define NDEBUG #include <halfuncs.h> Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=2595… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h (original) +++ trunk/reactos/lib/cmlib/cmlib.h Fri Mar 2 22:52:29 2007 @@ -8,7 +8,7 @@ #ifndef CMLIB_H #define CMLIB_H -#define WIN32_NO_STATUS +//#define WIN32_NO_STATUS #include <ntddk.h> #include "hivedata.h" #include "cmdata.h" Modified: trunk/reactos/lib/rossym/fromfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym/fromfile.c?rev=… ============================================================================== --- trunk/reactos/lib/rossym/fromfile.c (original) +++ trunk/reactos/lib/rossym/fromfile.c Fri Mar 2 22:52:29 2007 @@ -11,6 +11,9 @@ #include <ntddk.h> #include <reactos/rossym.h> #include "rossympriv.h" +#ifdef _MSC_VER +#include "ntimage.h" +#endif #define NDEBUG #include <debug.h> Modified: trunk/reactos/lib/rossym/frommem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym/frommem.c?rev=2… ============================================================================== --- trunk/reactos/lib/rossym/frommem.c (original) +++ trunk/reactos/lib/rossym/frommem.c Fri Mar 2 22:52:29 2007 @@ -11,6 +11,9 @@ #include <ntddk.h> #include <reactos/rossym.h> #include "rossympriv.h" +#ifdef _MSC_VER +#include "ntimage.h" +#endif #define NDEBUG #include <debug.h> Modified: trunk/reactos/lib/rtl/austin/avl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/austin/avl.c?rev=2… ============================================================================== --- trunk/reactos/lib/rtl/austin/avl.c (original) +++ trunk/reactos/lib/rtl/austin/avl.c Fri Mar 2 22:52:29 2007 @@ -21,7 +21,7 @@ /* * Modified for use in ReactOS by arty */ - +#include "rtl.h" #include "udict.h" #include "tree.h" #include "macros.h" Modified: trunk/reactos/lib/rtl/austin/tree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/austin/tree.c?rev=… ============================================================================== --- trunk/reactos/lib/rtl/austin/tree.c (original) +++ trunk/reactos/lib/rtl/austin/tree.c Fri Mar 2 22:52:29 2007 @@ -20,7 +20,7 @@ /* * Modified for use in ReactOS by arty */ - +#include "rtl.h" #include "udict.h" #include "tree.h" #include "macros.h" Modified: trunk/reactos/lib/rtl/qsort.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/qsort.c?rev=25956&… ============================================================================== --- trunk/reactos/lib/rtl/qsort.c (original) +++ trunk/reactos/lib/rtl/qsort.c Fri Mar 2 22:52:29 2007 @@ -41,7 +41,7 @@ /* FIXME: these types should be from the default includes */ -typedef int (* _pfunccmp_t) (const void *, const void *); +typedef int (__cdecl* _pfunccmp_t) (const void *, const void *); /* * Qsort routine from Bentley & McIlroy's "Engineering a Sort Function". @@ -100,6 +100,7 @@ /* EXPORTED */ void +__cdecl qsort ( void * a, size_t n, Modified: trunk/reactos/lib/rtl/rtl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.h?rev=25956&r1… ============================================================================== --- trunk/reactos/lib/rtl/rtl.h (original) +++ trunk/reactos/lib/rtl/rtl.h Fri Mar 2 22:52:29 2007 @@ -16,6 +16,7 @@ #define _INC_SWPRINTF_INL_ /* C Headers */ +#include <stdlib.h> #include <stdio.h> /* PSDK/NDK Headers */ Modified: trunk/reactos/lib/rtl/sprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sprintf.c?rev=2595… ============================================================================== --- trunk/reactos/lib/rtl/sprintf.c (original) +++ trunk/reactos/lib/rtl/sprintf.c Fri Mar 2 22:52:29 2007 @@ -383,7 +383,7 @@ /* * @implemented */ -int _vsnprintf(char *buf, size_t cnt, const char *fmt, va_list args) +int __cdecl _vsnprintf(char *buf, size_t cnt, const char *fmt, va_list args) { int len; unsigned long long num; @@ -742,7 +742,7 @@ /* * @implemented */ -int vsprintf(char *buf, const char *fmt, va_list args) +int __cdecl vsprintf(char *buf, const char *fmt, va_list args) { return _vsnprintf(buf,MAXLONG,fmt,args); } Modified: trunk/reactos/lib/rtl/srw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/srw.c?rev=25956&r1… ============================================================================== --- trunk/reactos/lib/rtl/srw.c (original) +++ trunk/reactos/lib/rtl/srw.c Fri Mar 2 22:52:29 2007 @@ -173,8 +173,7 @@ } } - (void)_InterlockedExchangePointer(&SRWLock->Ptr, - (PVOID)NewValue); + (void)_InterlockedExchange((PLONG)&SRWLock->Ptr, NewValue); if (FirstWaitBlock->Exclusive) { @@ -229,8 +228,7 @@ NewValue = RTL_SRWLOCK_OWNED; } - (void)_InterlockedExchangePointer(&SRWLock->Ptr, - (PVOID)NewValue); + (void)_InterlockedExchange((PLONG)&SRWLock->Ptr, NewValue); (void)InterlockedOr(&FirstWaitBlock->Wake, TRUE); @@ -464,9 +462,9 @@ NewValue = (CurrentValue >> RTL_SRWLOCK_BITS) + 1; NewValue = (NewValue << RTL_SRWLOCK_BITS) | (CurrentValue & RTL_SRWLOCK_MASK); - if (_InterlockedCompareExchangePointer(&SRWLock->Ptr, - (PVOID)NewValue, - (PVOID)CurrentValue) == (PVOID)CurrentValue) + if (_InterlockedCompareExchange((PLONG)&SRWLock->Ptr, + NewValue, + CurrentValue) == CurrentValue) { /* Successfully incremented the shared count, we acquired the lock */ break; @@ -543,9 +541,9 @@ ASSERT_SRW_WAITBLOCK(&StackWaitBlock); NewValue = (ULONG_PTR)&StackWaitBlock | RTL_SRWLOCK_OWNED | RTL_SRWLOCK_CONTENDED; - if (_InterlockedCompareExchangePointer(&SRWLock->Ptr, - (PVOID)NewValue, - (PVOID)CurrentValue) == (PVOID)CurrentValue) + if (_InterlockedCompareExchange((PLONG)&SRWLock->Ptr, + NewValue, + CurrentValue) == CurrentValue) { RtlpAcquireSRWLockSharedWait(SRWLock, &StackWaitBlock, @@ -565,9 +563,9 @@ RTL_SRWLOCK_SHARED nor the RTL_SRWLOCK_OWNED bit is set */ ASSERT(!(CurrentValue & RTL_SRWLOCK_CONTENDED)); - if (_InterlockedCompareExchangePointer(&SRWLock->Ptr, - (PVOID)NewValue, - (PVOID)CurrentValue) == (PVOID)CurrentValue) + if (_InterlockedCompareExchange((PLONG)&SRWLock->Ptr, + NewValue, + CurrentValue) == CurrentValue) { /* Successfully set the shared count, we acquired the lock */ break; @@ -624,9 +622,9 @@ NewValue = (NewValue << RTL_SRWLOCK_BITS) | RTL_SRWLOCK_SHARED | RTL_SRWLOCK_OWNED; } - if (_InterlockedCompareExchangePointer(&SRWLock->Ptr, - (PVOID)NewValue, - (PVOID)CurrentValue) == (PVOID)CurrentValue) + if (_InterlockedCompareExchange((PLONG)&SRWLock->Ptr, + NewValue, + CurrentValue) == CurrentValue) { /* Successfully released the lock */ break; @@ -683,9 +681,9 @@ NewValue = (ULONG_PTR)&StackWaitBlock | RTL_SRWLOCK_SHARED | RTL_SRWLOCK_CONTENDED | RTL_SRWLOCK_OWNED; - if (_InterlockedCompareExchangePointer(&SRWLock->Ptr, - (PVOID)NewValue, - (PVOID)CurrentValue) == (PVOID)CurrentValue) + if (_InterlockedCompareExchange((PLONG)&SRWLock->Ptr, + NewValue, + CurrentValue) == CurrentValue) { RtlpAcquireSRWLockExclusiveWait(SRWLock, &StackWaitBlock); @@ -741,9 +739,9 @@ ASSERT_SRW_WAITBLOCK(&StackWaitBlock); NewValue = (ULONG_PTR)&StackWaitBlock | RTL_SRWLOCK_OWNED | RTL_SRWLOCK_CONTENDED; - if (_InterlockedCompareExchangePointer(&SRWLock->Ptr, - (PVOID)NewValue, - (PVOID)CurrentValue) == (PVOID)CurrentValue) + if (_InterlockedCompareExchange((PLONG)&SRWLock->Ptr, + NewValue, + CurrentValue) == CurrentValue) { RtlpAcquireSRWLockExclusiveWait(SRWLock, &StackWaitBlock); @@ -811,9 +809,9 @@ ASSERT(!(CurrentValue & ~RTL_SRWLOCK_OWNED)); NewValue = 0; - if (_InterlockedCompareExchangePointer(&SRWLock->Ptr, - (PVOID)NewValue, - (PVOID)CurrentValue) == (PVOID)CurrentValue) + if (_InterlockedCompareExchange((PLONG)&SRWLock->Ptr, + NewValue, + CurrentValue) == CurrentValue) { /* We released the lock */ break; Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Fri Mar 2 22:52:29 2007 @@ -140,9 +140,9 @@ extern PKPRCB KiProcessorBlock[]; extern ULONG KiMask32Array[MAXIMUM_PRIORITY]; extern ULONG KiIdleSummary; -extern VOID KiTrap8(VOID); -extern VOID KiTrap2(VOID); -extern VOID KiFastCallEntry(VOID); +extern VOID __cdecl KiTrap8(VOID); +extern VOID __cdecl KiTrap2(VOID); +extern VOID __cdecl KiFastCallEntry(VOID); extern PVOID KeUserApcDispatcher; extern PVOID KeUserCallbackDispatcher; extern PVOID KeUserExceptionDispatcher; Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Fri Mar 2 22:52:29 2007 @@ -299,7 +299,7 @@ <file>debug.c</file> <file>job.c</file> <file>kill.c</file> - <file>notify.c</file> + <file>psnotify.c</file> <file>process.c</file> <file>psmgr.c</file> <file>query.c</file> Removed: trunk/reactos/ntoskrnl/ps/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/notify.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/notify.c (original) +++ trunk/reactos/ntoskrnl/ps/notify.c (removed) @@ -1,292 +1,0 @@ -/* - * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/ps/notify.c - * PURPOSE: Process Manager: Callbacks to Registered Clients (Drivers) - * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) - * Thomas Weidenmueller (w3seek(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <debug.h> - -/* GLOBALS *******************************************************************/ - -BOOLEAN PsImageNotifyEnabled = FALSE; -ULONG PspThreadNotifyRoutineCount, PspProcessNotifyRoutineCount; -ULONG PspLoadImageNotifyRoutineCount; -EX_CALLBACK PspThreadNotifyRoutine[PSP_MAX_CREATE_THREAD_NOTIFY]; -EX_CALLBACK PspProcessNotifyRoutine[PSP_MAX_CREATE_PROCESS_NOTIFY]; -EX_CALLBACK PspLoadImageNotifyRoutine[PSP_MAX_LOAD_IMAGE_NOTIFY]; -PLEGO_NOTIFY_ROUTINE PspLegoNotifyRoutine; - -/* PUBLIC FUNCTIONS **********************************************************/ - -/* - * @implemented - */ -NTSTATUS -NTAPI -PsSetCreateProcessNotifyRoutine(IN PCREATE_PROCESS_NOTIFY_ROUTINE NotifyRoutine, - IN BOOLEAN Remove) -{ - ULONG i; - PEX_CALLBACK_ROUTINE_BLOCK CallBack; - PAGED_CODE(); - - /* Check if we're removing */ - if (Remove) - { - /* Loop all the routines */ - for (i = 0; i < PSP_MAX_CREATE_PROCESS_NOTIFY; i++) - { - /* Reference the callback block */ - CallBack = ExReferenceCallBackBlock(&PspProcessNotifyRoutine[i]); - if (!CallBack) continue; - - /* Check it this is a matching block */ - if (ExGetCallBackBlockRoutine(CallBack) != (PVOID)NotifyRoutine) - { - /* It's not, try the next one */ - continue; - } - - /* It is, clear the current routine */ - if (ExCompareExchangeCallBack(&PspProcessNotifyRoutine[i], - NULL, - CallBack)) - { - /* Decrement the number of routines */ - InterlockedDecrement((PLONG)&PspProcessNotifyRoutineCount); - - /* Dereference the block */ - ExDereferenceCallBackBlock(&PspProcessNotifyRoutine[i], - CallBack); - - /* Wait for actice callbacks */ - ExWaitForCallBacks(CallBack); - - /* Free the callback and exit */ - ExFreeCallBack (CallBack); - return STATUS_SUCCESS; - } - - /* Dereference the block */ - ExDereferenceCallBackBlock(&PspProcessNotifyRoutine[i], - CallBack); - } - - /* We didn't find any matching block */ - return STATUS_PROCEDURE_NOT_FOUND; - } - else - { - /* Allocate a callback */ - CallBack = ExAllocateCallBack((PVOID)NotifyRoutine, NULL); - if (!CallBack) return STATUS_INSUFFICIENT_RESOURCES; - - /* Loop all callbacks */ - for (i = 0; i < PSP_MAX_CREATE_PROCESS_NOTIFY; i++) - { - /* Add this routine if it's an empty slot */ - if (ExCompareExchangeCallBack(&PspProcessNotifyRoutine[i], - CallBack, - NULL)) - { - /* Found and inserted into an empty slot, return */ - InterlockedIncrement((PLONG)&PspProcessNotifyRoutineCount); - return STATUS_SUCCESS; - } - } - - /* We didn't find a free slot, free the callback and fail */ - ExFreeCallBack(CallBack); - return STATUS_INVALID_PARAMETER; - } -} - -/* - * @implemented - */ -ULONG -NTAPI -PsSetLegoNotifyRoutine(PVOID LegoNotifyRoutine) -{ - /* Set the System-Wide Lego Routine */ - PspLegoNotifyRoutine = LegoNotifyRoutine; - - /* Return the location to the Lego Data */ - return FIELD_OFFSET(KTHREAD, LegoData); -} - -/* - * @implemented - */ -NTSTATUS -NTAPI -PsRemoveLoadImageNotifyRoutine(IN PLOAD_IMAGE_NOTIFY_ROUTINE NotifyRoutine) -{ - ULONG i; - PEX_CALLBACK_ROUTINE_BLOCK CallBack; - PAGED_CODE(); - - /* Loop all callbacks */ - for (i = 0; i < PSP_MAX_LOAD_IMAGE_NOTIFY; i++) - { - /* Reference this slot */ - CallBack = ExReferenceCallBackBlock(&PspLoadImageNotifyRoutine[i]); - if (CallBack) - { - /* Check for a match */ - if (ExGetCallBackBlockRoutine(CallBack) == (PVOID)NotifyRoutine) - { - /* Try removing it if it matches */ - if (ExCompareExchangeCallBack(&PspLoadImageNotifyRoutine[i], - NULL, - CallBack)) - { - /* We removed it, now dereference the block */ - InterlockedDecrement((PLONG)&PspLoadImageNotifyRoutineCount); - ExDereferenceCallBackBlock(&PspLoadImageNotifyRoutine[i], - CallBack); - - /* Wait for active callbacks */ - ExWaitForCallBacks(CallBack); - - /* Free the callback and return */ - ExFreeCallBack(CallBack); - return STATUS_SUCCESS; - } - } - - /* Dereference the callback */ - ExDereferenceCallBackBlock(&PspLoadImageNotifyRoutine[i], CallBack); - } - } - - /* Nothing found to remove */ - return STATUS_PROCEDURE_NOT_FOUND; -} - -/* - * @implemented - */ -NTSTATUS -NTAPI -PsSetLoadImageNotifyRoutine(IN PLOAD_IMAGE_NOTIFY_ROUTINE NotifyRoutine) -{ - ULONG i; - PEX_CALLBACK_ROUTINE_BLOCK CallBack; - PAGED_CODE(); - - /* Allocate a callback */ - CallBack = ExAllocateCallBack((PVOID)NotifyRoutine, NULL); - if (!CallBack) return STATUS_INSUFFICIENT_RESOURCES; - - /* Loop callbacks */ - for (i = 0; i < PSP_MAX_LOAD_IMAGE_NOTIFY; i++) - { - /* Add this entry if the slot is empty */ - if (ExCompareExchangeCallBack(&PspLoadImageNotifyRoutine[i], - CallBack, - NULL)) - { - /* Return success */ - InterlockedIncrement((PLONG)&PspLoadImageNotifyRoutineCount); - PsImageNotifyEnabled = TRUE; - return STATUS_SUCCESS; - } - } - - /* No free space found, fail */ - ExFreeCallBack(CallBack); - return STATUS_INSUFFICIENT_RESOURCES; -} - -/* - * @implemented - */ -NTSTATUS -NTAPI -PsRemoveCreateThreadNotifyRoutine(IN PCREATE_THREAD_NOTIFY_ROUTINE NotifyRoutine) -{ - ULONG i; - PEX_CALLBACK_ROUTINE_BLOCK CallBack; - PAGED_CODE(); - - /* Loop all callbacks */ - for (i = 0; i < PSP_MAX_CREATE_THREAD_NOTIFY; i++) - { - /* Reference this slot */ - CallBack = ExReferenceCallBackBlock(&PspThreadNotifyRoutine[i]); - if (CallBack) - { - /* Check for a match */ - if (ExGetCallBackBlockRoutine(CallBack) == (PVOID)NotifyRoutine) - { - /* Try removing it if it matches */ - if (ExCompareExchangeCallBack(&PspThreadNotifyRoutine[i], - NULL, - CallBack)) - { - /* We removed it, now dereference the block */ - InterlockedDecrement((PLONG)&PspThreadNotifyRoutineCount); - ExDereferenceCallBackBlock(&PspThreadNotifyRoutine[i], - CallBack); - - /* Wait for active callbacks */ - ExWaitForCallBacks(CallBack); - - /* Free the callback and return */ - ExFreeCallBack(CallBack); - return STATUS_SUCCESS; - } - } - - /* Dereference the callback */ - ExDereferenceCallBackBlock(&PspThreadNotifyRoutine[i], CallBack); - } - } - - /* Nothing found to remove */ - return STATUS_PROCEDURE_NOT_FOUND; -} - -/* - * @implemented - */ -NTSTATUS -NTAPI -PsSetCreateThreadNotifyRoutine(IN PCREATE_THREAD_NOTIFY_ROUTINE NotifyRoutine) -{ - ULONG i; - PEX_CALLBACK_ROUTINE_BLOCK CallBack; - PAGED_CODE(); - - /* Allocate a callback */ - CallBack = ExAllocateCallBack((PVOID)NotifyRoutine, NULL); - if (!CallBack) return STATUS_INSUFFICIENT_RESOURCES; - - /* Loop callbacks */ - for (i = 0; i < PSP_MAX_CREATE_THREAD_NOTIFY; i++) - { - /* Add this entry if the slot is empty */ - if (ExCompareExchangeCallBack(&PspThreadNotifyRoutine[i], - CallBack, - NULL)) - { - /* Return success */ - InterlockedIncrement((PLONG)&PspThreadNotifyRoutineCount); - return STATUS_SUCCESS; - } - } - - /* No free space found, fail */ - ExFreeCallBack(CallBack); - return STATUS_INSUFFICIENT_RESOURCES; -} - -/* EOF */

1 0

[greatlrd] 25955: almost every endless loop for pseh are gone. after I merge down follow changes some part of 25938 (alex trunk changes) 25953 (dprint msg to detect if pseh goes into endless loop or not) 25915-25917 kjk fix for pseh
by greatlrd＠svn.reactos.org 02 Mar '07

02 Mar '07

Author: greatlrd Date: Fri Mar 2 22:07:42 2007 New Revision: 25955 URL: http://svn.reactos.org/svn/reactos?rev=25955&view=rev Log: almost every endless loop for pseh are gone. after I merge down follow changes some part of 25938 (alex trunk changes) 25953 (dprint msg to detect if pseh goes into endless loop or not) 25915-25917 kjk fix for pseh Modified: branches/ros-branch-0_3_1/reactos/include/ndk/asm.h branches/ros-branch-0_3_1/reactos/include/reactos/libs/pseh/framebased.h branches/ros-branch-0_3_1/reactos/include/reactos/libs/pseh/framebased/internal.h branches/ros-branch-0_3_1/reactos/lib/pseh/framebased.c branches/ros-branch-0_3_1/reactos/ntoskrnl/include/internal/i386/asmmacro.S Modified: branches/ros-branch-0_3_1/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/includ… ============================================================================== --- branches/ros-branch-0_3_1/reactos/include/ndk/asm.h (original) +++ branches/ros-branch-0_3_1/reactos/include/ndk/asm.h Fri Mar 2 22:07:42 2007 @@ -144,7 +144,7 @@ #define KPRCB_DR2 0x300 #define KPRCB_DR3 0x304 #define KPRCB_DR6 0x308 -#define KPRCB_DR7 0x20C +#define KPRCB_DR7 0x30C // // KPCR Offsets Modified: branches/ros-branch-0_3_1/reactos/include/reactos/libs/pseh/framebased.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/includ… ============================================================================== --- branches/ros-branch-0_3_1/reactos/include/reactos/libs/pseh/framebased.h (original) +++ branches/ros-branch-0_3_1/reactos/include/reactos/libs/pseh/framebased.h Fri Mar 2 22:07:42 2007 @@ -29,7 +29,7 @@ #ifndef offsetof # include <stddef.h> #endif - +unsigned long __cdecl DbgPrint(const char * format, ...); /* Fall back to non-optimal, non-native NLG implementation for environments without their own (e.g., currently, kernel-mode ReactOS/Windows). THIS IS NOT @@ -46,6 +46,12 @@ # define _SEHJmpBuf_t jmp_buf #endif +#ifdef __cplusplus +# define _SEH_INIT_CONST static const +#else +# define _SEH_INIT_CONST register const +#endif + typedef struct __SEHFrame { _SEHPortableFrame_t SEH_Header; @@ -65,9 +71,10 @@ _SEHPortableTryLevel_t * trylevel ) { - _SEHTryLevel_t * mytrylevel; - mytrylevel = _SEH_CONTAINING_RECORD(trylevel, _SEHTryLevel_t, ST_Header); - _SEHLongJmp(mytrylevel->ST_JmpBuf, 1); + // DbgPrint("_SEHCompilerSpecificHandler(%p)\n", trylevel); + _SEHTryLevel_t * mytrylevel; + mytrylevel = _SEH_CONTAINING_RECORD(trylevel, _SEHTryLevel_t, ST_Header); + _SEHLongJmp(mytrylevel->ST_JmpBuf, 1); } static const int _SEHScopeKind = 1; @@ -193,7 +200,7 @@ _SEHEnterTry(&_SEHTryLevel.ST_Header); \ \ { \ - static const int _SEHScopeKind = 0; \ + _SEH_INIT_CONST int _SEHScopeKind = 0; \ (void)_SEHScopeKind; \ \ if(_SEHSetJmp(_SEHTryLevel.ST_JmpBuf) == 0) \ @@ -232,35 +239,29 @@ /* New syntax */ -#ifdef __cplusplus -# define _SEH2_INIT_CONST static const -#else -# define _SEH2_INIT_CONST register const -#endif - #define _SEH_LEAVE break #define _SEH_TRY \ { \ - _SEH2_INIT_CONST int _SEH2TopTryLevel = (_SEHScopeKind != 0); \ - _SEHPortableFrame_t * const _SEH2CurPortableFrame = _SEHPortableFrame; \ + _SEH_INIT_CONST int _SEHTopTryLevel = (_SEHScopeKind != 0); \ + _SEHPortableFrame_t * const _SEHCurPortableFrame = _SEHPortableFrame; \ \ { \ - static const int _SEHScopeKind = 0; \ - register int _SEH2State = 0; \ - register int _SEH2Handle = 0; \ - _SEHFrame_t _SEH2Frame; \ - _SEHTryLevel_t _SEH2TryLevel; \ + _SEH_INIT_CONST int _SEHScopeKind = 0; \ + volatile register int _SEHState = 0; \ + register int _SEHHandle = 0; \ + _SEHFrame_t _SEHFrame; \ + _SEHTryLevel_t _SEHTryLevel; \ _SEHPortableFrame_t * const _SEHPortableFrame = \ - _SEH2TopTryLevel ? &_SEH2Frame.SEH_Header : _SEH2CurPortableFrame; \ + _SEHTopTryLevel ? &_SEHFrame.SEH_Header : _SEHCurPortableFrame; \ \ (void)_SEHScopeKind; \ (void)_SEHPortableFrame; \ - (void)_SEH2Handle; \ + (void)_SEHHandle; \ \ for(;;) \ { \ - if(_SEH2State) \ + if(_SEHState) \ { \ for(;;) \ { \ @@ -278,22 +279,23 @@ { \ _SEH_DECLARE_HANDLERS((FILTER_), 0); \ \ - _SEH2TryLevel.ST_Header.SPT_Handlers = &_SEHHandlers; \ - \ - if(_SEH2TopTryLevel) \ + _SEHTryLevel.ST_Header.SPT_Handlers = &_SEHHandlers; \ + \ + if(_SEHTopTryLevel) \ { \ if(&_SEHLocals != _SEHDummyLocals) \ - _SEH2Frame.SEH_Locals = &_SEHLocals; \ - \ - _SEH2Frame.SEH_Header.SPF_Handler = _SEHCompilerSpecificHandler; \ - _SEHEnterFrame(&_SEH2Frame.SEH_Header, &_SEH2TryLevel.ST_Header); \ + _SEHFrame.SEH_Locals = &_SEHLocals; \ + \ + _SEH_EnableTracing(_SEH_DO_DEFAULT_TRACING); \ + _SEHFrame.SEH_Header.SPF_Handler = _SEHCompilerSpecificHandler; \ + _SEHEnterFrame(&_SEHFrame.SEH_Header, &_SEHTryLevel.ST_Header); \ } \ else \ - _SEHEnterTry(&_SEH2TryLevel.ST_Header); \ - \ - if((_SEH2Handle = _SEHSetJmp(_SEH2TryLevel.ST_JmpBuf)) == 0) \ - { \ - _SEH2State++; \ + _SEHEnterTry(&_SEHTryLevel.ST_Header); \ + \ + if((_SEHHandle = _SEHSetJmp(_SEHTryLevel.ST_JmpBuf)) == 0) \ + { \ + ++ _SEHState; \ continue; \ } \ else \ @@ -307,7 +309,7 @@ \ _SEHLeave(); \ \ - if(_SEH2Handle) \ + if(_SEHHandle) \ { #define _SEH_FINALLY(FINALLY_) \ @@ -323,27 +325,29 @@ { \ _SEH_DECLARE_HANDLERS(0, (FINALLY_)); \ \ - _SEH2TryLevel.ST_Header.SPT_Handlers = &_SEHHandlers; \ - \ - if(_SEH2TopTryLevel) \ + _SEHTryLevel.ST_Header.SPT_Handlers = &_SEHHandlers; \ + \ + if(_SEHTopTryLevel) \ { \ if(&_SEHLocals != _SEHDummyLocals) \ - _SEH2Frame.SEH_Locals = &_SEHLocals; \ - \ - _SEH2Frame.SEH_Header.SPF_Handler = 0; \ - _SEHEnterFrame(&_SEH2Frame.SEH_Header, &_SEH2TryLevel.ST_Header); \ + _SEHFrame.SEH_Locals = &_SEHLocals; \ + \ + _SEH_EnableTracing(_SEH_DO_DEFAULT_TRACING); \ + _SEHFrame.SEH_Header.SPF_Handler = 0; \ + _SEHEnterFrame(&_SEHFrame.SEH_Header, &_SEHTryLevel.ST_Header); \ } \ else \ - _SEHEnterTry(&_SEH2TryLevel.ST_Header); \ - \ - ++ _SEH2State; \ + _SEHEnterTry(&_SEHTryLevel.ST_Header); \ + \ + ++ _SEHState; \ continue; \ } \ \ break; \ } \ \ - (FINALLY_)(&_SEH2Frame.SEH_Header); \ + (FINALLY_)(&_SEHFrame.SEH_Header); \ + \ if(0) \ { @@ -358,6 +362,9 @@ #define _SEH_GetExceptionPointers _SEHX_GetExceptionPointers #define _SEH_AbnormalTermination _SEHX_AbnormalTermination +#define _SEH_EnableTracing(LEVEL_) ((void)(_SEHPortableFrame->SPF_Tracing = (LEVEL_))) +#define _SEH_DisableTracing() ((void)(_SEHPortableFrame->SPF_Tracing = _SEH_DO_TRACE_NONE)) + #endif /* EOF */ Modified: branches/ros-branch-0_3_1/reactos/include/reactos/libs/pseh/framebased/internal.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/includ… ============================================================================== --- branches/ros-branch-0_3_1/reactos/include/reactos/libs/pseh/framebased/internal.h (original) +++ branches/ros-branch-0_3_1/reactos/include/reactos/libs/pseh/framebased/internal.h Fri Mar 2 22:07:42 2007 @@ -22,6 +22,23 @@ #ifndef KJK_PSEH_FRAMEBASED_INTERNAL_H_ #define KJK_PSEH_FRAMEBASED_INTERNAL_H_ + +#define _SEH_DO_TRACE_ENTER_LEAVE (1 << 0) +#define _SEH_DO_TRACE_EXCEPTION_RECORD (1 << 1) +#define _SEH_DO_TRACE_CONTEXT (1 << 2) +#define _SEH_DO_TRACE_UNWIND (1 << 3) +#define _SEH_DO_TRACE_TRYLEVEL (1 << 4) +#define _SEH_DO_TRACE_CALL_FILTER (1 << 5) +#define _SEH_DO_TRACE_FILTER (1 << 6) +#define _SEH_DO_TRACE_CALL_HANDLER (1 << 7) +#define _SEH_DO_TRACE_CALL_FINALLY (1 << 8) + +#define _SEH_DO_TRACE_NONE (0) +#define _SEH_DO_TRACE_ALL (-1) + +#ifndef _SEH_DO_DEFAULT_TRACING +#define _SEH_DO_DEFAULT_TRACING _SEH_DO_TRACE_NONE +#endif struct _EXCEPTION_RECORD; struct _EXCEPTION_POINTERS; @@ -81,6 +98,7 @@ unsigned long SPF_Code; _SEHHandler_t SPF_Handler; _SEHPortableTryLevel_t * SPF_TopTryLevel; + int SPF_Tracing; } _SEHPortableFrame_t; Modified: branches/ros-branch-0_3_1/reactos/lib/pseh/framebased.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/lib/ps… ============================================================================== --- branches/ros-branch-0_3_1/reactos/lib/pseh/framebased.c (original) +++ branches/ros-branch-0_3_1/reactos/lib/pseh/framebased.c Fri Mar 2 22:07:42 2007 @@ -31,6 +31,248 @@ #include <excpt.h> +/* Tracing */ +#ifdef _SEH_ENABLE_TRACE +extern unsigned long __cdecl DbgPrint(const char * format, ...); + +#define _SEH_TRACE_HEADER_(FRAME_) \ + DbgPrint("[PSEH:%p]%s:%d:", FRAME_, __FILE__, __LINE__); + +#define _SEH_TRACE_TRAILER_ \ + DbgPrint("\n"); + +#define _SEH_FILTER_RET_STRING_(RET_) \ + (((int)(RET_) < 0) ? "_SEH_CONTINUE_EXECUTION" : (((int)(RET_) > 0) ? "_SEH_EXECUTE_HANDLER" : "_SEH_CONTINUE_SEARCH")) + +#define _SEH_TRACE_LINE_(FRAME_, ARGS_) \ +{ \ + _SEH_TRACE_HEADER_(FRAME_); \ + DbgPrint ARGS_; \ + _SEH_TRACE_TRAILER_; \ +} + +#define _SEH_TRACE_ENTER(FRAME_, FUNCNAME_, ARGS_) \ +{ \ + if((FRAME_)->SPF_Tracing & _SEH_DO_TRACE_ENTER_LEAVE) \ + { \ + _SEH_TRACE_HEADER_(FRAME_); \ + DbgPrint(">>> %s(", (FUNCNAME_)); \ + DbgPrint ARGS_; \ + DbgPrint(")"); \ + _SEH_TRACE_TRAILER_; \ + } \ +} + +#define _SEH_TRACE_LEAVE(FRAME_, FUNCNAME_, ARGS_) \ +{ \ + if((FRAME_)->SPF_Tracing & _SEH_DO_TRACE_ENTER_LEAVE) \ + { \ + _SEH_TRACE_HEADER_(FRAME_); \ + DbgPrint("<<< %s => ", (FUNCNAME_)); \ + DbgPrint ARGS_; \ + _SEH_TRACE_TRAILER_; \ + } \ +} + +#define _SEH_TRACE_EXCEPTION_RECORD(FRAME_, ER_) \ +{ \ + if((FRAME_)->SPF_Tracing & _SEH_DO_TRACE_EXCEPTION_RECORD) \ + { \ + _SEH_TRACE_LINE_ \ + ( \ + (FRAME_), \ + ( \ + "ExceptionRecord %p = { ExceptionCode : %08X, ExceptionFlags : %08X, ExceptionRecord : %p, ExceptionAddress : %p }", \ + (ER_), \ + (ER_)->ExceptionCode, \ + (ER_)->ExceptionFlags, \ + (ER_)->ExceptionRecord, \ + (ER_)->ExceptionAddress \ + ) \ + ); \ + } \ +} + +#ifdef _X86_ +#define _SEH_TRACE_CONTEXT(FRAME_, CONTEXT_) \ +{ \ + if((FRAME_)->SPF_Tracing & _SEH_DO_TRACE_CONTEXT) \ + { \ + if(((CONTEXT_)->ContextFlags & CONTEXT_INTEGER) == CONTEXT_INTEGER) \ + { \ + _SEH_TRACE_LINE_ \ + ( \ + (FRAME_), \ + ( \ + "eax=%08X ebx=%08X ecx=%08X edx=%08X esi=%08X edi=%08X", \ + (CONTEXT_)->Eax, \ + (CONTEXT_)->Ebx, \ + (CONTEXT_)->Ecx, \ + (CONTEXT_)->Edx, \ + (CONTEXT_)->Esi, \ + (CONTEXT_)->Edi \ + ) \ + ); \ + } \ + \ + if(((CONTEXT_)->ContextFlags & CONTEXT_CONTROL) == CONTEXT_CONTROL) \ + { \ + _SEH_TRACE_LINE_ \ + ( \ + (FRAME_), \ + ( \ + "eip=%08X esp=%08X ebp=%08X efl=%08X cs=%08X ss=%08X", \ + (CONTEXT_)->Eip, \ + (CONTEXT_)->Esp, \ + (CONTEXT_)->Ebp, \ + (CONTEXT_)->EFlags, \ + (CONTEXT_)->SegCs, \ + (CONTEXT_)->SegSs \ + ) \ + ); \ + } \ + \ + if(((CONTEXT_)->ContextFlags & CONTEXT_SEGMENTS) == CONTEXT_SEGMENTS) \ + { \ + _SEH_TRACE_LINE_ \ + ( \ + (FRAME_), \ + ( \ + "ds=%08X es=%08X fs=%08X gs=%08X", \ + (CONTEXT_)->SegDs, \ + (CONTEXT_)->SegEs, \ + (CONTEXT_)->SegFs, \ + (CONTEXT_)->SegGs \ + ) \ + ); \ + } \ + } \ +} +#else +#error Unsupported platform. +#endif + +#define _SEH_TRACE_UNWIND(FRAME_, ARGS_) \ +{ \ + if((FRAME_)->SPF_Tracing & _SEH_DO_TRACE_UNWIND) \ + { \ + _SEH_TRACE_LINE_((FRAME_), ARGS_); \ + } \ +} + +#define _SEH_TRACE_TRYLEVEL(FRAME_, TRYLEVEL_) \ +{ \ + if((FRAME_)->SPF_Tracing & _SEH_DO_TRACE_TRYLEVEL) \ + { \ + _SEH_TRACE_LINE_((FRAME_), ("trylevel %p, filter %p", (TRYLEVEL_), (TRYLEVEL_)->SPT_Handlers->SH_Filter)); \ + } \ +} + +#define _SEH_TRACE_ENTER_CALL_FILTER(FRAME_, TRYLEVEL_, ER_) \ +{ \ + if((FRAME_)->SPF_Tracing & _SEH_DO_TRACE_CALL_FILTER) \ + { \ + _SEH_TRACE_LINE_ \ + ( \ + (FRAME_), \ + ( \ + "trylevel %p, calling filter %p, ExceptionCode %08X", \ + (TRYLEVEL_), \ + (TRYLEVEL_)->SPT_Handlers->SH_Filter, \ + (ER_)->ExceptionCode \ + ) \ + ); \ + } \ +} + +#define _SEH_TRACE_LEAVE_CALL_FILTER(FRAME_, TRYLEVEL_, RET_) \ +{ \ + if((FRAME_)->SPF_Tracing & _SEH_DO_TRACE_CALL_FILTER) \ + { \ + _SEH_TRACE_LINE_ \ + ( \ + (FRAME_), \ + ( \ + "trylevel %p, filter %p => %s", \ + (TRYLEVEL_), \ + (TRYLEVEL_)->SPT_Handlers->SH_Filter, \ + _SEH_FILTER_RET_STRING_(RET_) \ + ) \ + ); \ + } \ +} + +#define _SEH_TRACE_FILTER(FRAME_, TRYLEVEL_, RET_) \ +{ \ + if((FRAME_)->SPF_Tracing & _SEH_DO_TRACE_FILTER) \ + { \ + _SEH_TRACE_LINE_ \ + ( \ + (FRAME_), \ + ( \ + "trylevel %p => %s", \ + (TRYLEVEL_), \ + _SEH_FILTER_RET_STRING_(RET_) \ + ) \ + ); \ + } \ +} + +#define _SEH_TRACE_ENTER_CALL_HANDLER(FRAME_, TRYLEVEL_) \ +{ \ + if((FRAME_)->SPF_Tracing & _SEH_DO_TRACE_CALL_HANDLER) \ + { \ + _SEH_TRACE_LINE_((FRAME_), ("trylevel %p, handling", (TRYLEVEL_))); \ + } \ +} + +#define _SEH_TRACE_ENTER_CALL_FINALLY(FRAME_, TRYLEVEL_) \ +{ \ + if((FRAME_)->SPF_Tracing & _SEH_DO_TRACE_CALL_FINALLY) \ + { \ + _SEH_TRACE_LINE_ \ + ( \ + (FRAME_), \ + ( \ + "trylevel %p, calling exit routine %p", \ + (TRYLEVEL_), \ + (TRYLEVEL_)->SPT_Handlers->SH_Finally \ + ) \ + ); \ + } \ +} + +#define _SEH_TRACE_LEAVE_CALL_FINALLY(FRAME_, TRYLEVEL_) \ +{ \ + if((FRAME_)->SPF_Tracing & _SEH_DO_TRACE_CALL_FINALLY) \ + { \ + _SEH_TRACE_LINE_ \ + ( \ + (FRAME_), \ + ( \ + "trylevel %p, exit routine %p returned", \ + (TRYLEVEL_), \ + (TRYLEVEL_)->SPT_Handlers->SH_Finally \ + ) \ + ); \ + } \ +} + +#else +#define _SEH_TRACE_ENTER(FRAME_, FUNCNAME_, ARGS_) +#define _SEH_TRACE_LEAVE(FRAME_, FUNCNAME_, ARGS_) +#define _SEH_TRACE_EXCEPTION_RECORD(FRAME_, ER_) +#define _SEH_TRACE_CONTEXT(FRAME_, CONTEXT_) +#define _SEH_TRACE_UNWIND(FRAME_, ARGS_) +#define _SEH_TRACE_TRYLEVEL(FRAME_, TRYLEVEL_) +#define _SEH_TRACE_ENTER_CALL_FILTER(FRAME_, TRYLEVEL_, ER_) +#define _SEH_TRACE_LEAVE_CALL_FILTER(FRAME_, TRYLEVEL_, RET_) +#define _SEH_TRACE_FILTER(FRAME_, TRYLEVEL_, RET_) +#define _SEH_TRACE_ENTER_CALL_HANDLER(FRAME_, TRYLEVEL_) +#define _SEH_TRACE_ENTER_CALL_FINALLY(FRAME_, TRYLEVEL_) +#define _SEH_TRACE_LEAVE_CALL_FINALLY(FRAME_, TRYLEVEL_) +#endif + /* Assembly helpers, see i386/framebased.asm */ extern void __cdecl _SEHCleanHandlerEnvironment(void); extern struct __SEHRegistration * __cdecl _SEHRegisterFrame(_SEHRegistration_t *); @@ -49,6 +291,8 @@ ) { _SEHPortableTryLevel_t * trylevel; + + _SEH_TRACE_UNWIND(frame, ("enter local unwind from %p to %p", frame->SPF_TopTryLevel, dsttrylevel)); for ( @@ -64,8 +308,14 @@ pfnFinally = trylevel->SPT_Handlers->SH_Finally; if(pfnFinally) + { + _SEH_TRACE_ENTER_CALL_FINALLY(frame, trylevel); pfnFinally(frame); + _SEH_TRACE_LEAVE_CALL_FINALLY(frame, trylevel); + } } + + _SEH_TRACE_UNWIND(frame, ("leave local unwind from %p to %p", frame->SPF_TopTryLevel, dsttrylevel)); } static void __cdecl _SEHCallHandler @@ -76,7 +326,9 @@ { _SEHGlobalUnwind(frame); _SEHLocalUnwind(frame, trylevel); + _SEH_TRACE_ENTER_CALL_HANDLER(frame, trylevel); frame->SPF_Handler(trylevel); + /* ASSERT(0); */ } static int __cdecl _SEHFrameHandler @@ -93,9 +345,29 @@ frame = EstablisherFrame; + _SEH_TRACE_ENTER + ( + frame, + "_SEHFrameHandler", + ( + "%p, %p, %p, %p", + ExceptionRecord, + EstablisherFrame, + ContextRecord, + DispatcherContext + ) + ); + + _SEH_TRACE_EXCEPTION_RECORD(frame, ExceptionRecord); + _SEH_TRACE_CONTEXT(frame, ContextRecord); + /* Unwinding */ if(ExceptionRecord->ExceptionFlags & (4 | 2)) + { + _SEH_TRACE_UNWIND(frame, ("enter forced unwind")); _SEHLocalUnwind(frame, NULL); + _SEH_TRACE_UNWIND(frame, ("leave forced unwind")); + } /* Handling */ else { @@ -115,6 +387,8 @@ ) { _SEHFilter_t pfnFilter = trylevel->SPT_Handlers->SH_Filter; + + _SEH_TRACE_TRYLEVEL(frame, trylevel); switch((UINT_PTR)pfnFilter) { @@ -135,7 +409,9 @@ ep.ExceptionRecord = ExceptionRecord; ep.ContextRecord = ContextRecord; + _SEH_TRACE_ENTER_CALL_FILTER(frame, trylevel, ExceptionRecord); ret = pfnFilter(&ep, frame); + _SEH_TRACE_LEAVE_CALL_FILTER(frame, trylevel, ret); } else ret = _SEH_CONTINUE_SEARCH; @@ -144,9 +420,14 @@ } } + _SEH_TRACE_FILTER(frame, trylevel, ret); + /* _SEH_CONTINUE_EXECUTION */ if(ret < 0) + { + _SEH_TRACE_LEAVE(frame, "_SEHFrameHandler", ("ExceptionContinueExecution")); return ExceptionContinueExecution; + } /* _SEH_EXECUTE_HANDLER */ else if(ret > 0) _SEHCallHandler(frame, trylevel); @@ -158,6 +439,7 @@ /* FALLTHROUGH */ } + _SEH_TRACE_LEAVE(frame, "_SEHFrameHandler", ("ExceptionContinueSearch")); return ExceptionContinueSearch; } Modified: branches/ros-branch-0_3_1/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_3_1/reactos/ntoskrnl/include/internal/i386/asmmacro.S (original) +++ branches/ros-branch-0_3_1/reactos/ntoskrnl/include/internal/i386/asmmacro.S Fri Mar 2 22:07:42 2007 @@ -265,9 +265,9 @@ mov [ebp+KTRAP_FRAME_DR2], edi /* Get DR3, 6, 7 */ - mov ebx, dr0 - mov ecx, dr1 - mov edi, dr2 + mov ebx, dr3 + mov ecx, dr6 + mov edi, dr7 /* Save them */ mov [ebp+KTRAP_FRAME_DR3], ebx

1 0

[ion] 25954: - Do massive renames in the ntoskrnl tree to make sure we don't have multiple files with the same name (this makes msvc very, very, sad). - Add _IN_KERNEL_ define for WDK compatibility when using resstr.h - The entire kernel can now be compiled with MSVC (read this sentence carefully before throwing out the champagne).
by ion＠svn.reactos.org 02 Mar '07

02 Mar '07

Author: ion Date: Fri Mar 2 21:25:23 2007 New Revision: 25954 URL: http://svn.reactos.org/svn/reactos?rev=25954&view=rev Log: - Do massive renames in the ntoskrnl tree to make sure we don't have multiple files with the same name (this makes msvc very, very, sad). - Add _IN_KERNEL_ define for WDK compatibility when using resstr.h - The entire kernel can now be compiled with MSVC (read this sentence carefully before throwing out the champagne). Added: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c - copied unchanged from r25926, trunk/reactos/ntoskrnl/dbgk/debug.c trunk/reactos/ntoskrnl/ex/harderr.c - copied unchanged from r25926, trunk/reactos/ntoskrnl/ex/error.c trunk/reactos/ntoskrnl/ex/shutdown.c - copied unchanged from r25926, trunk/reactos/ntoskrnl/ex/power.c trunk/reactos/ntoskrnl/io/iomgr/ioevent.c - copied unchanged from r25926, trunk/reactos/ntoskrnl/io/iomgr/event.c trunk/reactos/ntoskrnl/io/iomgr/iomdl.c - copied unchanged from r25926, trunk/reactos/ntoskrnl/io/iomgr/mdl.c trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c - copied unchanged from r25953, trunk/reactos/ntoskrnl/io/iomgr/resource.c trunk/reactos/ntoskrnl/io/iomgr/iotimer.c - copied unchanged from r25926, trunk/reactos/ntoskrnl/io/iomgr/timer.c trunk/reactos/ntoskrnl/ke/eventobj.c - copied unchanged from r25926, trunk/reactos/ntoskrnl/ke/event.c trunk/reactos/ntoskrnl/ke/i386/irqobj.c - copied unchanged from r25926, trunk/reactos/ntoskrnl/ke/i386/irq.c trunk/reactos/ntoskrnl/ke/i386/systimer.S - copied unchanged from r25926, trunk/reactos/ntoskrnl/ke/i386/clock.S trunk/reactos/ntoskrnl/ke/i386/thrdini.c - copied unchanged from r25926, trunk/reactos/ntoskrnl/ke/i386/thread.c trunk/reactos/ntoskrnl/ke/procobj.c - copied unchanged from r25926, trunk/reactos/ntoskrnl/ke/process.c trunk/reactos/ntoskrnl/ke/profobj.c - copied unchanged from r25926, trunk/reactos/ntoskrnl/ke/profile.c trunk/reactos/ntoskrnl/ke/semphobj.c - copied unchanged from r25926, trunk/reactos/ntoskrnl/ke/sem.c trunk/reactos/ntoskrnl/ke/timerobj.c - copied unchanged from r25926, trunk/reactos/ntoskrnl/ke/timer.c trunk/reactos/ntoskrnl/mm/mdlsup.c - copied unchanged from r25926, trunk/reactos/ntoskrnl/mm/mdl.c trunk/reactos/ntoskrnl/mm/procsup.c - copied unchanged from r25937, trunk/reactos/ntoskrnl/mm/process.c trunk/reactos/ntoskrnl/ob/oblink.c - copied unchanged from r25926, trunk/reactos/ntoskrnl/ob/symlink.c Removed: trunk/reactos/ntoskrnl/dbgk/debug.c trunk/reactos/ntoskrnl/ex/error.c trunk/reactos/ntoskrnl/ex/power.c trunk/reactos/ntoskrnl/io/iomgr/disk.c trunk/reactos/ntoskrnl/io/iomgr/event.c trunk/reactos/ntoskrnl/io/iomgr/mdl.c trunk/reactos/ntoskrnl/io/iomgr/resource.c trunk/reactos/ntoskrnl/io/iomgr/timer.c trunk/reactos/ntoskrnl/ke/event.c trunk/reactos/ntoskrnl/ke/i386/clock.S trunk/reactos/ntoskrnl/ke/i386/irq.c trunk/reactos/ntoskrnl/ke/i386/thread.c trunk/reactos/ntoskrnl/ke/process.c trunk/reactos/ntoskrnl/ke/profile.c trunk/reactos/ntoskrnl/ke/sem.c trunk/reactos/ntoskrnl/ke/timer.c trunk/reactos/ntoskrnl/mm/mdl.c trunk/reactos/ntoskrnl/mm/process.c trunk/reactos/ntoskrnl/ob/symlink.c Modified: trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/mm/elf.inc.h trunk/reactos/ntoskrnl/mm/elf32.c trunk/reactos/ntoskrnl/mm/elf64.c trunk/reactos/ntoskrnl/mm/rmap.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild trunk/reactos/ntoskrnl/po/events.c [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/ntoskrnl/dbgk/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/debug.c?rev=… Removed: trunk/reactos/ntoskrnl/ex/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/error.c?rev=25… Removed: trunk/reactos/ntoskrnl/ex/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/power.c?rev=25… Removed: trunk/reactos/ntoskrnl/io/iomgr/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/disk.c?r… Removed: trunk/reactos/ntoskrnl/io/iomgr/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/event.c?… Removed: trunk/reactos/ntoskrnl/io/iomgr/mdl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/mdl.c?re… Removed: trunk/reactos/ntoskrnl/io/iomgr/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/resource… Removed: trunk/reactos/ntoskrnl/io/iomgr/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/timer.c?… Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=2… Removed: trunk/reactos/ntoskrnl/ke/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/event.c?rev=25… Removed: trunk/reactos/ntoskrnl/ke/i386/clock.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/clock.S?r… Removed: trunk/reactos/ntoskrnl/ke/i386/irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irq.c?rev… Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… Removed: trunk/reactos/ntoskrnl/ke/i386/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/thread.c?… Removed: trunk/reactos/ntoskrnl/ke/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/process.c?rev=… Removed: trunk/reactos/ntoskrnl/ke/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/profile.c?rev=… Removed: trunk/reactos/ntoskrnl/ke/sem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/sem.c?rev=2595… Removed: trunk/reactos/ntoskrnl/ke/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/timer.c?rev=25… Modified: trunk/reactos/ntoskrnl/mm/elf.inc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/elf.inc.h?rev=… Modified: trunk/reactos/ntoskrnl/mm/elf32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/elf32.c?rev=25… Modified: trunk/reactos/ntoskrnl/mm/elf64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/elf64.c?rev=25… Removed: trunk/reactos/ntoskrnl/mm/mdl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mdl.c?rev=2595… Removed: trunk/reactos/ntoskrnl/mm/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/process.c?rev=… Modified: trunk/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=259… Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… Removed: trunk/reactos/ntoskrnl/ob/symlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/symlink.c?rev=… Modified: trunk/reactos/ntoskrnl/po/events.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/events.c?rev=2…

1 0

[greatlrd] 25953: adding a small debugprint to detect if pseh going into a endless loop, if we see same msg from it repate it self whole time, we known then pseh have gone into endless loop.
by greatlrd＠svn.reactos.org 02 Mar '07

02 Mar '07

Author: greatlrd Date: Fri Mar 2 20:49:47 2007 New Revision: 25953 URL: http://svn.reactos.org/svn/reactos?rev=25953&view=rev Log: adding a small debugprint to detect if pseh going into a endless loop, if we see same msg from it repate it self whole time, we known then pseh have gone into endless loop. Modified: trunk/reactos/include/reactos/libs/pseh/framebased.h Modified: trunk/reactos/include/reactos/libs/pseh/framebased.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/framebased.h (original) +++ trunk/reactos/include/reactos/libs/pseh/framebased.h Fri Mar 2 20:49:47 2007 @@ -29,6 +29,8 @@ #ifndef offsetof # include <stddef.h> #endif + +unsigned long __cdecl DbgPrint(const char * format, ...); /* Fall back to non-optimal, non-native NLG implementation for environments @@ -71,6 +73,13 @@ _SEHPortableTryLevel_t * trylevel ) { + /* + * help detetct if pseh going into endless loop + * if we see this debug msg repet never break + * we known something cause pseh going into + * endless loop, but it should never happen + */ + DbgPrint("_SEHCompilerSpecificHandler(%p)\n", trylevel); _SEHTryLevel_t * mytrylevel; mytrylevel = _SEH_CONTAINING_RECORD(trylevel, _SEHTryLevel_t, ST_Header); _SEHLongJmp(mytrylevel->ST_JmpBuf, 1);

1 0

[mbosma] 25952: Lester Kortenhoeven (lester(at)kortenhoeven(dot)de): Implement scripting.
by mbosma＠svn.reactos.org 02 Mar '07

02 Mar '07

Author: mbosma Date: Fri Mar 2 20:27:39 2007 New Revision: 25952 URL: http://svn.reactos.org/svn/reactos?rev=25952&view=rev Log: Lester Kortenhoeven (lester(at)kortenhoeven(dot)de): Implement scripting. Added: trunk/reactos/base/applications/downloader/packagetree/ trunk/reactos/base/applications/downloader/packagetree/internet/ trunk/reactos/base/applications/downloader/packagetree/internet/browser/ trunk/reactos/base/applications/downloader/packagetree/internet/browser/browser.rbuild trunk/reactos/base/applications/downloader/packagetree/internet/browser/firefox.1.5.0.9.dml trunk/reactos/base/applications/downloader/packagetree/internet/browser/firefox.2.0.0.1.dml trunk/reactos/base/applications/downloader/packagetree/internet/category.xml trunk/reactos/base/applications/downloader/packagetree/internet/internet.rbuild trunk/reactos/base/applications/downloader/packagetree/packagetree.rbuild trunk/reactos/base/applications/downloader/packagetree/script/ trunk/reactos/base/applications/downloader/packagetree/script/default.install.xml trunk/reactos/base/applications/downloader/packagetree/script/default.uninstall.xml trunk/reactos/base/applications/downloader/packagetree/script/script.rbuild trunk/reactos/base/applications/downloader/packagetree/tree.xml trunk/reactos/base/applications/downloader/script.c (with props) Removed: trunk/reactos/base/applications/downloader/downloader.xml Modified: trunk/reactos/base/applications/downloader/download.c trunk/reactos/base/applications/downloader/downloader.rbuild trunk/reactos/base/applications/downloader/main.c trunk/reactos/base/applications/downloader/resources.h trunk/reactos/base/applications/downloader/structures.h trunk/reactos/base/applications/downloader/translations/de.rc trunk/reactos/base/applications/downloader/translations/en.rc trunk/reactos/base/applications/downloader/translations/fr.rc trunk/reactos/base/applications/downloader/translations/id.rc trunk/reactos/base/applications/downloader/translations/it.rc trunk/reactos/base/applications/downloader/xml.c Modified: trunk/reactos/base/applications/downloader/download.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/download.c (original) +++ trunk/reactos/base/applications/downloader/download.c Fri Mar 2 20:27:39 2007 @@ -221,31 +221,11 @@ { //static const WCHAR szUrl[] = DownloadUrl; IBindStatusCallback *dl; - WCHAR path[MAX_PATH]; - LPWSTR p; - STARTUPINFOW si; - PROCESS_INFORMATION pi; - HWND Dlg = (HWND) Context; + HWND Dlg = ((struct lParamDownload*)Context)->Dlg; DWORD r; BOOL bCancelled = FALSE; - BOOL bTempfile = FALSE; - - /* built the path for the download */ - p = wcsrchr(SelectedApplication->Location, L'/'); - if (NULL == p) - { - goto end; - } - if (! GetTempPathW(MAX_PATH, path)) - { - goto end; - } - wcscat(path, p + 1); - - /* download it */ - bTempfile = TRUE; - dl = CreateDl(Context, &bCancelled); - r = URLDownloadToFileW(NULL, SelectedApplication->Location, path, 0, dl); + dl = CreateDl(Dlg, &bCancelled); + r = URLDownloadToFileW(NULL, ((struct lParamDownload*)Context)->URL, ((struct lParamDownload*)Context)->File, 0, dl); if (NULL != dl) { IBindStatusCallback_Release(dl); @@ -253,30 +233,6 @@ if (S_OK != r) { MessageBoxW(0,Strings[IDS_DOWNLOAD_ERROR],0,0); - goto end; - } - else if (bCancelled) - { - goto end; - } - ShowWindow(Dlg, SW_HIDE); - - /* run it */ - memset(&si, 0, sizeof(si)); - si.cb = sizeof(si); - r = CreateProcessW(path, NULL, NULL, NULL, 0, 0, NULL, NULL, &si, &pi); - if (0 == r) - { - goto end; - } - CloseHandle(pi.hThread); - WaitForSingleObject(pi.hProcess, INFINITE); - CloseHandle(pi.hProcess); - -end: - if (bTempfile) - { - DeleteFileW(path); } EndDialog(Dlg, 0); return 0; @@ -287,7 +243,7 @@ { HANDLE Thread; DWORD ThreadId; - HWND Item; + HWND Item;; switch (Msg) { @@ -320,7 +276,8 @@ ShowWindow(Item, SW_HIDE); } }*/ - Thread = CreateThread(NULL, 0, ThreadFunc, Dlg, 0, &ThreadId); + ((struct lParamDownload*)lParam)->Dlg = Dlg; + Thread = CreateThread(NULL, 0, ThreadFunc, (LPVOID)lParam, 0, &ThreadId); if (NULL == Thread) { return FALSE; Modified: trunk/reactos/base/applications/downloader/downloader.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/downloader.rbuild (original) +++ trunk/reactos/base/applications/downloader/downloader.rbuild Fri Mar 2 20:27:39 2007 @@ -1,6 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<installfile base="system32">downloader.xml</installfile> +<directory name="packagetree"> + <xi:include href="packagetree/packagetree.rbuild" /> +</directory> <module name="downloader" type="win32gui" installbase="system32" installname="downloader.exe"> <include base="downloader">.</include> <include base="expat">.</include> @@ -27,5 +29,6 @@ <file>main.c</file> <file>xml.c</file> <file>download.c</file> + <file>script.c</file> <file>downloader.rc</file> </module> Removed: trunk/reactos/base/applications/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/downloader.xml (original) +++ trunk/reactos/base/applications/downloader/downloader.xml (removed) @@ -1,182 +1,0 @@ -<tree Version="1">  - <category name="Internet & Network" icon="1"> - <application name="Firefox 1.5"> - <regname>Mozilla Firefox (1.5)</regname> - <licence>MPL/GPL/LGPL</licence> - <version>1.5.0.9</version> - <description>The most popular and one of the best free WebBrowsers out there.</description> - <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/firefox/releases/1.5.0.9/wi…</location> - </application> - <application name="Firefox 2.0"> - <regname>Mozilla Firefox (2.0.0.1)</regname> - <licence>MPL/GPL/LGPL</licence> - <version>2.0.0.1</version> - <description>The most popular and one of the best free WebBrowsers out there.</description> - <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/firefox/releases/latest/win…</location> - </application> - <application name="Thunderbird"> - <regname>Mozilla Thunderbird (1.5)</regname> - <licence>MPL/GPL/LGPL</licence> - <version>1.5.0.9</version> - <description>The most popular and one of the best free MailClients out there.</description> - <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/thunderbird/releases/latest…</location> - </application> - <application name="SeaMonkey"> - <regname>SeaMonkey (1.0.7)</regname> - <version>1.0.7</version> - <description>Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, Composer bundle you will ever need.</description> - <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/seamonkey/releases/1.0.7/se…</location> - </application> - <application name="Mozilla ActiveX Control"> - <regname>Mozilla ActiveX Control v1.7.12 (ReactOS special)</regname> - <version>1.7.12</version> - <description>Essential Component to get ReactOS Explorer's and other application's Internet Browsing feature running.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/MozillaControl1712-ReactO…</location> - </application> - <application name="Off By One Browser"> - <regname>The Off By One Web Browser</regname> - <description>The Off By One Browser is a very small and fast web browser with full HTML 3.2 support.</description> - <location>http://offbyone.com/offbyone/images/OffByOneSetup.exe</location> - </application> - <application name="Samba TNG"> - <description>This tool allows you to access your Windows shared folders/printers with ReactOS.</description> - <location>http://svn.reactos.org/packages/samba-tng.exe</location> - </application> - <application name="Miranda IM"> - <regname>Miranda IM</regname> - <version>0.5.1</version> - <description>Open source multiprotocol instant messaging application - May not work completely.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/miranda/miranda-im-v0.5.1-unicode…</location> - </application> - <application name="Putty"> - <regname>PuTTY version 0.59</regname> - <licence>MIT</licence> - <version>0.59</version> - <description>A free SSH, Telnet, rlogin, and raw TCP client.</description> - <location>http://the.earth.li/~sgtatham/putty/latest/x86/putty-0.59-installer.exe</location> - </application> - </category> - <category name="Office" icon="2"> - <application name="Abiword"> - <regname>"AbiWord 2.4.1 (remove only)"</regname> - <version>2.4.1</version> - <description>Word processor.</description> - <location>http://www.abiword.org/downloads/abiword/2.4.1/Windows/abiword-setup-2.4.1.…</location> - </application> - <application name="OpenOffice"> - <regname>OpenOffice.org 2.1</regname> - <version>2.1.0</version> - <description>THE Open Source Office Suite.</description> - <location>http://ftp.tu-chemnitz.de/pub/openoffice-extended//stable/2.1.0/OOo_2.1.0_W…</location> - </application> - </category> - <category name="Graphics" icon="3"> - <application name="IrfanView"> - <regname>IrfanView (remove only)</regname> - <version>3.99</version> - <description>Viewer for all kinds of graphics/audio files/video files.</description> - <location>http://gd.tuwien.ac.at/graphics/irfanview/iview399.exe</location> - </application> - <application name="IrfanView Plugins"> - <version>3.99</version> - <description>Additional Plugins for supporting more file types.</description> - <location>http://irfanview.tuwien.ac.at/plugins/irfanview_plugins_399.exe</location> - </application> - <application name="TuxPaint"> - <regname>Tux Paint 0.9.16</regname> - <version>0.9.16</version> - <description>An open source bitmap graphics editor geared towards young children.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/tuxpaint/tuxpaint-0.9.16-win32-in…</location> - </application> - </category> - <category name="Multimedia" icon="4"> - </category> - <category name="Development" icon="5"> - <application name="ReactOS Build Environment"> - <regname>ReactOS Build Environment 0.3.4</regname> - <version>0.3.4</version> - <description>Allows you to build the ReactOS Source. For more instructions see ReactOS wiki.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-0.3.4.exe</location> - </application> - <application name="MinGW"> - <regname>MinGW 5.1.3</regname> - <version>5.1.3</version> - <description>A Port of the GNU toolchain with GCC, GDB, GNU make, etc.</description> - <location>http://puzzle.dl.sourceforge.net/sourceforge/mingw/MinGW-5.1.3.exe</location> - </application> - <application name="FreeBASIC"> - <regname>FreeBASIC 0.16b</regname> - <version>0.16b</version> - <description>Open Source Basic Compiler. The Basic syntax is compatible to QBASIC.</description> - <location>http://switch.dl.sourceforge.net/sourceforge/fbc/FreeBASIC-v0.16b-win32.exe</location> - </application> - </category> - <category name="Games & Fun" icon="6"> - <application name="ScummVM"> - <regname>ScummVM 0.9.1</regname> - <version>0.9.1</version> - <description>SamNMax, Day of Tentacle, etc on ReactOS</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/scummvm/scummvm-0.9.1-win32.exe</location> - </application> - <application name="Tile World"> - <description>Nice Clone of Chip's Challenge originally made for the Atari Lynx. Includes free CCLP2 Graphics Pack, so you dont need the copyrighted Original.</description> - <location>http://www.muppetlabs.com/~breadbox/pub/software/tworld/tworld-1.3.0-win32-…</location> - </application> - <application name="OpenTTD"> - <regname>OpenTTD 0.5.0</regname> - <version>0.5.0-RC5</version> - <description>Open-source-clone of the "Transport Tycoon Deluxe" game-engine. You need a copy of Transport Tycoon.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/openttd/openttd-0.5.0-RC5-win32.e…</location> - </application> - <application name="LBreakout2">LBreakout2 2.4.1 - <regname>LBreakout2 2.4.1</regname> - <version>2.4.1</version> - <description>Breakout Clone using SDL libs.</description> - <location>http://switch.dl.sourceforge.net/sourceforge/lgames/lbreakout2-2.4.1-win32.…</location> - </application> - <application name="LGeneral"> - <regname>LGeneral 1.1</regname> - <version>1.1</version> - <description>Panzer General Clone using SDL libs.</description> - <location>http://kent.dl.sourceforge.net/sourceforge/lgames/lgeneral-1.1-win32.exe</location> - </application> - <application name="LMarbles"> - <regname>LMarbles 1.0.6</regname> - <version>1.0.6</version> - <description>Atomix Clone using SDL libs.</description> - <location>http://heanet.dl.sourceforge.net/sourceforge/lgames/lmarbles-1.0.6-win32.exe</location> - </application> - </category> - <category name="Tools" icon="7"> - <application name="7-Zip"> - <regname>7-Zip 4.42</regname> - <version>4.42</version> - <description>Utility to create and open 7zip, zip, tar, rar and other archive files.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/sevenzip/7z442.exe</location> - </application> - <application name="uTorrent"> - <regname>µTorrent</regname> - <version>1.6</version> - <description>Small and fast Torrent Client.</description> - <location>http://download.utorrent.com/1.6/uTorrent-1.6-install.exe</location> - </application> - <application name="Audio Grabber"> - <regname>Audiograbber 1.83 SE </regname> - <version>1.83 SE</version> - <description>A very good CD Ripper/Audio File Converter.</description> - <location>http://www.audiograbber.de/files/342677432/agsetup183se.exe</location> - </application> - </category> - <category name="Others" icon="8"> - <application name="Simple Direct Media Layer (SDL) Runtime"> - <version>1.2.11</version> - <description>Needed for many Open Source Games to run. You need 7-Zip or a similar Utility to extract it.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/libsdl/SDL-1.2.11-win32.zip</location> - </application> - <application name="DOSBox"> - <version>0.65</version> - <description>DOSBox is a DOS emulator.</description> - <location>http://puzzle.dl.sourceforge.net/sourceforge/dosbox/DOSBox0.65-win32-instal…</location> - </application> - </category> -</tree> Modified: trunk/reactos/base/applications/downloader/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/main.c (original) +++ trunk/reactos/base/applications/downloader/main.c Fri Mar 2 20:27:39 2007 @@ -10,46 +10,65 @@ #include <richedit.h> #include <stdio.h> #include <shlwapi.h> +#include <wchar.h> #include "resources.h" #include "structures.h" -#define XML_PATH "C:\\ReactOS\\system32\\downloader.xml" +#define XML_PATH "tree.xml" HWND hwnd, hCategories, hApps, hDownloadButton, hUninstallButton, hUpdateButton, hHelpButton; HBITMAP hLogo, hUnderline; +CHAR* CmdLine; WCHAR* DescriptionHeadline = L""; WCHAR* DescriptionText = L""; -WCHAR ApplicationText[700]; - +WCHAR ApplicationText[0xA04]; // MAX_STRING_LENGHT + Version + \n + MAX_STRING_LENGHT + Licence + \n + MAX_STRING_LENGHT + Maintainer + \n\n + Description + // 0x100 + 0x100 + 1 + 0x100 + 0x100 + 1 + 0x100 + 0x100 + 2 + 0x400 = 0xA04 struct Category Root; struct Application* SelectedApplication; INT_PTR CALLBACK DownloadProc (HWND, UINT, WPARAM, LPARAM); +DWORD WINAPI InstallThreadFunc(LPVOID); +DWORD WINAPI UninstallThreadFunc(LPVOID); BOOL ProcessXML (const char* filename, struct Category* Root); +char* addDML (const char*); VOID FreeTree (struct Category* Node); WCHAR Strings [STRING_COUNT][MAX_STRING_LENGHT]; - -BOOL getUninstaller(WCHAR* RegName, WCHAR* Uninstaller) { - - const DWORD ArraySize = 200; +BOOL getUninstaller(struct Application* CurrentApplication, WCHAR* Uninstaller) { + + DWORD ArraySize = 0x100; HKEY hKey1; HKEY hKey2; DWORD Type = 0; - DWORD Size = ArraySize; WCHAR Value[ArraySize]; WCHAR KeyName[ArraySize]; + DWORD Size = ArraySize; LONG i = 0; + if (CurrentApplication->RegName[0] == L'\0') { + return FALSE; + } + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall",0,KEY_READ,&hKey1) == ERROR_SUCCESS) { + if (RegOpenKeyExW(hKey1,CurrentApplication->RegName,0,KEY_READ,&hKey2) == ERROR_SUCCESS) { + if (RegQueryValueExW(hKey2,L"UninstallString",0,&Type,(LPBYTE)Uninstaller,&Size) == ERROR_SUCCESS) { + RegCloseKey(hKey2); + RegCloseKey(hKey1); + return TRUE; + } else { + RegCloseKey(hKey2); + RegCloseKey(hKey1); + return FALSE; + } + } while (RegEnumKeyExW(hKey1,i,KeyName,&Size,NULL,NULL,NULL,NULL) == ERROR_SUCCESS) { ++i; RegOpenKeyExW(hKey1,KeyName,0,KEY_READ,&hKey2); - Size = ArraySize; + Size = sizeof(Value); if (RegQueryValueExW(hKey2,L"DisplayName",0,&Type,(LPBYTE)Value,&Size) == ERROR_SUCCESS) { Size = ArraySize; - if (StrCmpW(Value,RegName) == 0) { + if (!wcscmp(Value,CurrentApplication->RegName)) { if (RegQueryValueExW(hKey2,L"UninstallString",0,&Type,(LPBYTE)Uninstaller,&Size) == ERROR_SUCCESS) { RegCloseKey(hKey2); RegCloseKey(hKey1); @@ -123,17 +142,16 @@ CurrentApplication = Category->Apps; - WCHAR Uninstaller[200]; while(CurrentApplication) { Insert.item.lParam = (UINT)CurrentApplication; Insert.item.pszText = CurrentApplication->Name; Insert.item.cchTextMax = lstrlenW(CurrentApplication->Name); - Insert.item.iImage = 10; - if(StrCmpW(CurrentApplication->RegName,L"")) { - if(getUninstaller(CurrentApplication->RegName, Uninstaller)) - Insert.item.iImage = 9; - } + if(getUninstaller(CurrentApplication, NULL)) { + Insert.item.iImage = 9; + } else { + Insert.item.iImage = 10; + } SendMessage(hwnd, TVM_INSERTITEM, 0, (LPARAM)&Insert); CurrentApplication = CurrentApplication->Next; } @@ -161,8 +179,8 @@ hHelpButton = CreateWindowW (L"Button", L"", WS_CHILD|WS_VISIBLE|BS_BITMAP, 550, 10, 40, 40, hwnd, 0, hInstance, NULL); hUpdateButton = CreateWindowW (L"Button", L"", WS_CHILD|WS_VISIBLE|BS_BITMAP, 500, 10, 40, 40, hwnd, 0, hInstance, NULL); - hDownloadButton = CreateWindowW (L"Button", L"", WS_CHILD|WS_VISIBLE|BS_BITMAP, 330, 505, 140, 33, hwnd, 0, hInstance, NULL); - hUninstallButton = CreateWindowW (L"Button", L"", WS_CHILD|WS_VISIBLE|BS_BITMAP, 260, 505, 140, 33, hwnd, 0, hInstance, NULL); + hDownloadButton = CreateWindowW (L"Button", L"", WS_CHILD|WS_VISIBLE|BS_BITMAP, 330, 505, 140, 35, hwnd, 0, hInstance, NULL); + hUninstallButton = CreateWindowW (L"Button", L"", WS_CHILD|WS_VISIBLE|BS_BITMAP, 260, 505, 140, 35, hwnd, 0, hInstance, NULL); SendMessageW(hHelpButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)(HANDLE)LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_HELP))); SendMessageW(hUpdateButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP,(LPARAM)(HANDLE)LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_UPDATE))); @@ -267,17 +285,41 @@ MoveWindow(hDownloadButton,(Split_Vertical+Rect.right-Rect.left)/2-70,Rect.bottom-Rect.top-45,140,35,TRUE); } -void startUninstaller(WCHAR* Uninstaller) { - STARTUPINFOW si; - PROCESS_INFORMATION pi; - - memset(&si, 0, sizeof(si)); - si.cb = sizeof(si); - CreateProcessW(NULL,Uninstaller,NULL,NULL,FALSE,0,NULL,NULL,&si,&pi); - CloseHandle(pi.hThread); - // WaitForSingleObject(pi.hProcess, INFINITE); // If you want to wait for the Unistaller - CloseHandle(pi.hProcess); - hideUninstaller(); +void searchApp(const WCHAR* AppName, struct Category* Node) { + struct Application* CurrentApplication; + if (Node->Children) + searchApp(AppName, Node->Children); + if (Node->Next) + searchApp(AppName, Node->Next); + CurrentApplication = Node->Apps; + while((SelectedApplication == NULL) && (CurrentApplication != NULL)) { + if(wcscmp(CurrentApplication->Name,AppName)==0) + SelectedApplication = CurrentApplication; + CurrentApplication = CurrentApplication->Next; + } +} + +void ShowSelectedApplication() { + ApplicationText[0]=L'\0'; + if(SelectedApplication->Version[0] != L'\0') { + StrCatW(ApplicationText, Strings[IDS_VERSION]); + StrCatW(ApplicationText, SelectedApplication->Version); + StrCatW(ApplicationText, L"\n"); + } + if(SelectedApplication->Licence[0] != L'\0') { + StrCatW(ApplicationText, Strings[IDS_LICENCE]); + StrCatW(ApplicationText, SelectedApplication->Licence); + StrCatW(ApplicationText, L"\n"); + } + if(SelectedApplication->Maintainer[0] != L'\0') { + StrCatW(ApplicationText, Strings[IDS_MAINTAINER]); + StrCatW(ApplicationText, SelectedApplication->Maintainer); + StrCatW(ApplicationText, L"\n"); + } + if((SelectedApplication->Licence[0] != L'\0') || (SelectedApplication->Version[0] != L'\0') || (SelectedApplication->Maintainer[0] != L'\0')) + StrCatW(ApplicationText, L"\n"); + StrCatW(ApplicationText, SelectedApplication->Description); + ShowMessage(SelectedApplication->Name, ApplicationText); } LRESULT CALLBACK WndProc (HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) @@ -288,9 +330,34 @@ { case WM_CREATE: { + WCHAR wAppName[0x100] = L""; + if (strncmp(CmdLine,"add ",4)==0) { + CmdLine = CmdLine+4; + if(CmdLine[0]==L'\"') { + CmdLine++; + CmdLine[strlen(CmdLine)-1]=L'\0'; + } + char* aAppName = addDML(CmdLine); + MultiByteToWideChar(CP_UTF8, 0, aAppName, -1, wAppName, 0x100); + } else if (strncmp(CmdLine,"show ",5)==0) { + MultiByteToWideChar(CP_UTF8, 0, CmdLine+5, -1, wAppName, 0x100); + } + if(!SetupControls(hwnd)) return -1; - ShowMessage(Strings[IDS_WELCOME_TITLE], Strings[IDS_WELCOME]); + + if(wAppName[0]!=L'\0') + searchApp(wAppName, &Root); + + if(SelectedApplication == NULL) { + ShowMessage(Strings[IDS_WELCOME_TITLE], Strings[IDS_WELCOME]); + } else { + ShowSelectedApplication(); + if(getUninstaller(SelectedApplication, NULL)) + showUninstaller(); + else + hideUninstaller(); + } } break; @@ -319,21 +386,20 @@ { if (lParam == (LPARAM)hDownloadButton) { - if(SelectedApplication) - DialogBoxW(GetModuleHandle(NULL), MAKEINTRESOURCEW(IDD_DOWNLOAD), 0, DownloadProc); - else + if(SelectedApplication) { + DWORD ThreadId; + CreateThread(NULL, 0, InstallThreadFunc, SelectedApplication, 0, &ThreadId); + } else ShowMessage(Strings[IDS_NO_APP_TITLE], Strings[IDS_NO_APP]); } else if (lParam == (LPARAM)hUninstallButton) { - if(SelectedApplication) - { - WCHAR Uninstaller[200]; - if(StrCmpW(SelectedApplication->RegName, L"")) { - if(getUninstaller(SelectedApplication->RegName, Uninstaller)) - startUninstaller(Uninstaller); - } - } + if(SelectedApplication) { + DWORD ThreadId; + CreateThread(NULL, 0, UninstallThreadFunc, SelectedApplication, 0, &ThreadId); + hideUninstaller(); + } else + ShowMessage(Strings[IDS_NO_APP_TITLE], Strings[IDS_NO_APP]); } else if (lParam == (LPARAM)hUpdateButton) { @@ -363,31 +429,9 @@ SelectedApplication = (struct Application*) ((LPNMTREEVIEW)lParam)->itemNew.lParam; if(SelectedApplication) { - ApplicationText[0]=L'\0'; - if(StrCmpW(SelectedApplication->Version, L"")) { - StrCatW(ApplicationText, Strings[IDS_VERSION]); - StrCatW(ApplicationText, SelectedApplication->Version); - StrCatW(ApplicationText, L"\n"); - } - if(StrCmpW(SelectedApplication->Licence, L"")) { - StrCatW(ApplicationText, Strings[IDS_LICENCE]); - StrCatW(ApplicationText, SelectedApplication->Licence); - StrCatW(ApplicationText, L"\n"); - } - if(StrCmpW(SelectedApplication->Maintainer, L"")) { - StrCatW(ApplicationText, Strings[IDS_MAINTAINER]); - StrCatW(ApplicationText, SelectedApplication->Maintainer); - StrCatW(ApplicationText, L"\n"); - } - if(StrCmpW(SelectedApplication->Licence, L"") || StrCmpW(SelectedApplication->Version, L"") || StrCmpW(SelectedApplication->Maintainer, L"")) - StrCatW(ApplicationText, L"\n"); - StrCatW(ApplicationText, SelectedApplication->Description); - ShowMessage(SelectedApplication->Name, ApplicationText); - WCHAR Uninstaller[200]; - if(StrCmpW(SelectedApplication->RegName, L"")) { - if(getUninstaller(SelectedApplication->RegName, Uninstaller)) { - bShowUninstaller = TRUE; - } + ShowSelectedApplication(); + if(getUninstaller(SelectedApplication, NULL)) { + bShowUninstaller = TRUE; } } } @@ -452,7 +496,8 @@ MSG msg; InitCommonControls(); - + CmdLine = lpCmdLine; + // Load strings for(i=0; i<STRING_COUNT; i++) LoadStringW(hInstance, i, Strings[i], MAX_STRING_LENGHT); // if you know a better method please tell me. Added: trunk/reactos/base/applications/downloader/packagetree/internet/browser/browser.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/packagetree/internet/browser/browser.rbuild (added) +++ trunk/reactos/base/applications/downloader/packagetree/internet/browser/browser.rbuild Fri Mar 2 20:27:39 2007 @@ -1,0 +1,4 @@ +<?xml version="1.0"?> +<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> +<installfile base="packagetree\internet\browser">firefox.1.5.0.9.dml</installfile> +<installfile base="packagetree\internet\browser">firefox.2.0.0.1.dml</installfile> Added: trunk/reactos/base/applications/downloader/packagetree/internet/browser/firefox.1.5.0.9.dml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/packagetree/internet/browser/firefox.1.5.0.9.dml (added) +++ trunk/reactos/base/applications/downloader/packagetree/internet/browser/firefox.1.5.0.9.dml Fri Mar 2 20:27:39 2007 @@ -1,0 +1,7 @@ +<application name="Firefox 1.5" target="internet\browser\firefox.1.5.0.9.dml"> + <regname>Mozilla Firefox (1.5)</regname> + <licence>MPL/GPL/LGPL</licence> + <version>1.5.0.9</version> + <description>The most popular and one of the best free WebBrowsers out there.</description> + <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/firefox/releases/1.5.0.9/wi…</location> +</application> Added: trunk/reactos/base/applications/downloader/packagetree/internet/browser/firefox.2.0.0.1.dml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/packagetree/internet/browser/firefox.2.0.0.1.dml (added) +++ trunk/reactos/base/applications/downloader/packagetree/internet/browser/firefox.2.0.0.1.dml Fri Mar 2 20:27:39 2007 @@ -1,0 +1,7 @@ +<application name="Firefox 2.0" target="internet\browser\firefox.2.0.0.1.dml"> + <regname>Mozilla Firefox (2.0.0.1)</regname> + <licence>MPL/GPL/LGPL</licence> + <version>2.0.0.1</version> + <description>The most popular and one of the best free WebBrowsers out there.</description> + <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/firefox/releases/latest/win…</location> +</application> Added: trunk/reactos/base/applications/downloader/packagetree/internet/category.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/packagetree/internet/category.xml (added) +++ trunk/reactos/base/applications/downloader/packagetree/internet/category.xml Fri Mar 2 20:27:39 2007 @@ -1,0 +1,54 @@ +<category name="Internet & Network" icon="1"> + <import folder="internet\browser" /> + <import folder="internet\email" /> + <import folder="internet\ftp" /> + <import folder="internet\chat" /> + <import folder="internet\filesharing" /> + <import folder="internet\remotecontrol" /> + <import folder="internet\server" /> + <import folder="internet\monitoring" /> + <import folder="internet\security" /> + <import folder="internet\streaming" /> + <import folder="internet\other" /> + <application name="Thunderbird"> + <regname>Mozilla Thunderbird (1.5)</regname> + <licence>MPL/GPL/LGPL</licence> + <version>1.5.0.9</version> + <description>The most popular and one of the best free MailClients out there.</description> + <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/thunderbird/releases/latest…</location> + </application> + <application name="SeaMonkey"> + <regname>SeaMonkey (1.0.7)</regname> + <version>1.0.7</version> + <description>Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, Composer bundle you will ever need.</description> + <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/seamonkey/releases/1.0.7/se…</location> + </application> + <application name="Mozilla ActiveX Control"> + <regname>Mozilla ActiveX Control v1.7.12 (ReactOS special)</regname> + <version>1.7.12</version> + <description>Essential Component to get ReactOS Explorer's and other application's Internet Browsing feature running.</description> + <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/MozillaControl1712-ReactO…</location> + </application> + <application name="Off By One Browser"> + <regname>The Off By One Web Browser</regname> + <description>The Off By One Browser is a very small and fast web browser with full HTML 3.2 support.</description> + <location>http://offbyone.com/offbyone/images/OffByOneSetup.exe</location> + </application> + <application name="Samba TNG"> + <description>This tool allows you to access your Windows shared folders/printers with ReactOS.</description> + <location>http://svn.reactos.org/packages/samba-tng.exe</location> + </application> + <application name="Miranda IM"> + <regname>Miranda IM</regname> + <version>0.5.1</version> + <description>Open source multiprotocol instant messaging application - May not work completely.</description> + <location>http://ovh.dl.sourceforge.net/sourceforge/miranda/miranda-im-v0.5.1-unicode…</location> + </application> + <application name="Putty"> + <regname>PuTTY version 0.59</regname> + <licence>MIT</licence> + <version>0.59</version> + <description>A free SSH, Telnet, rlogin, and raw TCP client.</description> + <location>http://the.earth.li/~sgtatham/putty/latest/x86/putty-0.59-installer.exe</location> + </application> +</category> Added: trunk/reactos/base/applications/downloader/packagetree/internet/internet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/packagetree/internet/internet.rbuild (added) +++ trunk/reactos/base/applications/downloader/packagetree/internet/internet.rbuild Fri Mar 2 20:27:39 2007 @@ -1,0 +1,6 @@ +<?xml version="1.0"?> +<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> +<directory name="browser"> + <xi:include href="browser/browser.rbuild" /> +</directory> +<installfile base="packagetree\internet">category.xml</installfile> Added: trunk/reactos/base/applications/downloader/packagetree/packagetree.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/packagetree/packagetree.rbuild (added) +++ trunk/reactos/base/applications/downloader/packagetree/packagetree.rbuild Fri Mar 2 20:27:39 2007 @@ -1,0 +1,9 @@ +<?xml version="1.0"?> +<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> +<directory name="internet"> + <xi:include href="internet/internet.rbuild" /> +</directory> +<directory name="script"> + <xi:include href="script/script.rbuild" /> +</directory> +<installfile base="packagetree">tree.xml</installfile> Added: trunk/reactos/base/applications/downloader/packagetree/script/default.install.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/packagetree/script/default.install.xml (added) +++ trunk/reactos/base/applications/downloader/packagetree/script/default.install.xml Fri Mar 2 20:27:39 2007 @@ -1,0 +1,5 @@ +<script> + <download url="%location%" file="%TEMP%\%location_file%" /> + <exec file="%TEMP%\%location_file%" /> + <del file="%TEMP%\%location_file%" /> +</script> Added: trunk/reactos/base/applications/downloader/packagetree/script/default.uninstall.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/packagetree/script/default.uninstall.xml (added) +++ trunk/reactos/base/applications/downloader/packagetree/script/default.uninstall.xml Fri Mar 2 20:27:39 2007 @@ -1,0 +1,1 @@ +<exec file="%regname_uninstaller%" /> Added: trunk/reactos/base/applications/downloader/packagetree/script/script.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/packagetree/script/script.rbuild (added) +++ trunk/reactos/base/applications/downloader/packagetree/script/script.rbuild Fri Mar 2 20:27:39 2007 @@ -1,0 +1,3 @@ +<?xml version="1.0"?> +<installfile base="packagetree/script">default.install.xml</installfile> +<installfile base="packagetree/script">default.uninstall.xml</installfile> Added: trunk/reactos/base/applications/downloader/packagetree/tree.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/packagetree/tree.xml (added) +++ trunk/reactos/base/applications/downloader/packagetree/tree.xml Fri Mar 2 20:27:39 2007 @@ -1,0 +1,142 @@ +<tree Version="1">  + <import file="internet\category.xml" /> + <category name="Office" icon="2"> + <application name="Abiword"> + <regname>"AbiWord 2.4.1 (remove only)"</regname> + <version>2.4.1</version> + <description>Word processor.</description> + <location>http://www.abiword.org/downloads/abiword/2.4.1/Windows/abiword-setup-2.4.1.…</location> + </application> + <application name="OpenOffice"> + <regname>OpenOffice.org 2.1</regname> + <version>2.1.0</version> + <description>THE Open Source Office Suite.</description> + <location>http://ftp.tu-chemnitz.de/pub/openoffice-extended//stable/2.1.0/OOo_2.1.0_W…</location> + </application> + </category> + <category name="Graphics" icon="3"> + <application name="IrfanView"> + <regname>IrfanView (remove only)</regname> + <version>3.99</version> + <description>Viewer for all kinds of graphics/audio files/video files.</description> + <location>http://gd.tuwien.ac.at/graphics/irfanview/iview399.exe</location> + </application> + <application name="IrfanView Plugins"> + <version>3.99</version> + <description>Additional Plugins for supporting more file types.</description> + <location>http://irfanview.tuwien.ac.at/plugins/irfanview_plugins_399.exe</location> + </application> + <application name="TuxPaint"> + <regname>Tux Paint 0.9.16</regname> + <version>0.9.16</version> + <description>An open source bitmap graphics editor geared towards young children.</description> + <location>http://ovh.dl.sourceforge.net/sourceforge/tuxpaint/tuxpaint-0.9.16-win32-in…</location> + </application> + </category> + <category name="Multimedia" icon="4"> + </category> + <category name="Development" icon="5"> + <application name="ReactOS Build Environment"> + <regname>ReactOS Build Environment 0.3.4</regname> + <version>0.3.4</version> + <description>Allows you to build the ReactOS Source. For more instructions see ReactOS wiki.</description> + <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-0.3.4.exe</location> + </application> + <application name="MinGW"> + <regname>MinGW 5.1.3</regname> + <version>5.1.3</version> + <description>A Port of the GNU toolchain with GCC, GDB, GNU make, etc.</description> + <location>http://puzzle.dl.sourceforge.net/sourceforge/mingw/MinGW-5.1.3.exe</location> + </application> + <application name="FreeBASIC"> + <regname>FreeBASIC 0.16b</regname> + <version>0.16b</version> + <description>Open Source Basic Compiler. The Basic syntax is compatible to QBASIC.</description> + <location>http://switch.dl.sourceforge.net/sourceforge/fbc/FreeBASIC-v0.16b-win32.exe</location> + </application> + </category> + <category name="Games & Fun" icon="6"> + <application name="ScummVM"> + <regname>ScummVM 0.9.1</regname> + <version>0.9.1</version> + <description>SamNMax, Day of Tentacle, etc on ReactOS</description> + <location>http://ovh.dl.sourceforge.net/sourceforge/scummvm/scummvm-0.9.1-win32.exe</location> + </application> + <application name="Tile World"> + <description>Nice Clone of Chip's Challenge originally made for the Atari Lynx. Includes free CCLP2 Graphics Pack, so you dont need the copyrighted Original.</description> + <location>http://www.muppetlabs.com/~breadbox/pub/software/tworld/tworld-1.3.0-win32-…</location> + </application> + <application name="OpenTTD"> + <regname>OpenTTD 0.5.0</regname> + <version>0.5.0-RC5</version> + <description>Open-source-clone of the "Transport Tycoon Deluxe" game-engine. You need a copy of Transport Tycoon.</description> + <location>http://ovh.dl.sourceforge.net/sourceforge/openttd/openttd-0.5.0-RC5-win32.e…</location> + </application> + <application name="LBreakout2">LBreakout2 2.4.1 + <regname>LBreakout2 2.4.1</regname> + <version>2.4.1</version> + <description>Breakout Clone using SDL libs.</description> + <location>http://switch.dl.sourceforge.net/sourceforge/lgames/lbreakout2-2.4.1-win32.…</location> + </application> + <application name="LGeneral"> + <regname>LGeneral 1.1</regname> + <version>1.1</version> + <description>Panzer General Clone using SDL libs.</description> + <location>http://kent.dl.sourceforge.net/sourceforge/lgames/lgeneral-1.1-win32.exe</location> + </application> + <application name="LMarbles"> + <regname>LMarbles 1.0.6</regname> + <version>1.0.6</version> + <description>Atomix Clone using SDL libs.</description> + <location>http://heanet.dl.sourceforge.net/sourceforge/lgames/lmarbles-1.0.6-win32.exe</location> + </application> + </category> + <category name="Tools" icon="7"> + <application name="7-Zip"> + <regname>7-Zip 4.42</regname> + <version>4.42</version> + <description>Utility to create and open 7zip, zip, tar, rar and other archive files.</description> + <location>http://ovh.dl.sourceforge.net/sourceforge/sevenzip/7z442.exe</location> + </application> + <application name="uTorrent"> + <regname>uTorrent</regname> + <version>1.6</version> + <description>Small and fast Torrent Client.</description> + <location>http://download.utorrent.com/1.6/uTorrent-1.6-install.exe</location> + </application> + <application name="Audio Grabber"> + <regname>Audiograbber 1.83 SE </regname> + <version>1.83 SE</version> + <description>A very good CD Ripper/Audio File Converter.</description> + <location>http://www.audiograbber.de/files/342677432/agsetup183se.exe</location> + </application> + </category> + <category name="Others" icon="8"> + <application name="Simple Direct Media Layer (SDL) Runtime"> + <regname>SDL Runtime</regname> + <version>1.2.11</version> + <description>Needed for many Open Source Games to run. You need 7-Zip or a similar Utility to extract it.</description> + <location>http://ovh.dl.sourceforge.net/sourceforge/libsdl/SDL-1.2.11-win32.zip</location> + <installscript> + <load file="test.xml" /> + <unzip /> + <download url="%location%" file="%TEMP%\%location_file%" /> + <unzip file="%TEMP%\%location_file%" outdir="%SystemRoot%\System32" /> + <exec file="notepad %SystemRoot%\System32\README-SDL.txt" /> + <del file="%TEMP%\%location_file%" /> + <adduninstaller regname="%regname%" file="downloader.exe show %name%" /> + </installscript> + <uninstallscript> + <del file="%SystemRoot%\System32\SDL.dll" /> + <del file="%SystemRoot%\System32\README-SDL.txt" /> + <removeuninstaller regname="%regname%" /> + <message text="Uninstall complete." /> + </uninstallscript> + </application> + <application name="DOSBox"> + <version>0.65</version> + <description>DOSBox is a DOS emulator.</description> + <location>http://puzzle.dl.sourceforge.net/sourceforge/dosbox/DOSBox0.65-win32-instal…</location> + </application> + </category> +</tree> Modified: trunk/reactos/base/applications/downloader/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/resources.h (original) +++ trunk/reactos/base/applications/downloader/resources.h Fri Mar 2 20:27:39 2007 @@ -39,9 +39,10 @@ #define IDS_XMLERROR_1 14 #define IDS_XMLERROR_2 15 #define IDS_DOWNLOAD_ERROR 16 -#define IDS_VERSION 17 -#define IDS_LICENCE 18 -#define IDS_MAINTAINER 19 +#define IDS_UNZIP_ERROR 17 +#define IDS_VERSION 18 +#define IDS_LICENCE 19 +#define IDS_MAINTAINER 20 -#define STRING_COUNT 20 +#define STRING_COUNT 21 #define MAX_STRING_LENGHT 0x100 Added: trunk/reactos/base/applications/downloader/script.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/script.c (added) +++ trunk/reactos/base/applications/downloader/script.c Fri Mar 2 20:27:39 2007 @@ -1,0 +1,246 @@ +/* PROJECT: ReactOS Downloader + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/downloader/script.c + * PURPOSE: Run (un/)installscript + * PROGRAMMERS: Lester Kortenhoeven + */ + +#include <windows.h> + +#include "resources.h" +#include "structures.h" + +extern BOOL getUninstaller(struct Application*, WCHAR*); +extern INT_PTR CALLBACK DownloadProc (HWND, UINT, WPARAM, LPARAM); +extern WCHAR Strings [STRING_COUNT][MAX_STRING_LENGHT]; + +static void DownloadScriptFunc (WCHAR* URL, WCHAR* File) { + struct lParamDownload* lParam; + lParam = malloc(sizeof(struct lParamDownload)); + lParam->URL = URL; + lParam->File = File; + DialogBoxParamW(GetModuleHandle(NULL), MAKEINTRESOURCEW(IDD_DOWNLOAD), 0, DownloadProc, (LPARAM)lParam); + free(lParam); +} + +static void ExecScriptFunc(WCHAR* Arg) { + STARTUPINFOW si; + PROCESS_INFORMATION pi; + + memset(&si, 0, sizeof(si)); + si.cb=sizeof(si); + CreateProcessW(NULL,Arg,NULL,NULL,FALSE,0,NULL,NULL,&si,&pi); + CloseHandle(pi.hThread); + WaitForSingleObject(pi.hProcess, INFINITE); + CloseHandle(pi.hProcess); +} + + +static void DelScriptFunc(WCHAR* Arg) { + DeleteFileW(Arg); +} + +static BOOL UnzipScriptFunc(WCHAR* File, WCHAR* Outdir) { + HKEY hKey; + DWORD Type = 0; + WCHAR ExecStr[0x100]; + DWORD currentlengt = 0x100; + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,L"SOFTWARE\\7-Zip",0,KEY_READ,&hKey) == ERROR_SUCCESS) { + if (RegQueryValueExW(hKey,L"Path",0,&Type,(LPBYTE)ExecStr,&currentlengt) == ERROR_SUCCESS) { + if (File[0] != L'\0') { + wcsncat(ExecStr,L"\\7z.exe x ",0x100-currentlengt); + currentlengt = lstrlenW(ExecStr); + wcsncat(ExecStr,File,0x100-currentlengt); + currentlengt = lstrlenW(ExecStr); + wcsncat(ExecStr,L" -o",0x100-currentlengt); + currentlengt = lstrlenW(ExecStr); + wcsncat(ExecStr,Outdir,0x100-currentlengt); + ExecScriptFunc(ExecStr); + RegCloseKey(hKey); + } + return TRUE; + } + RegCloseKey(hKey); + } + MessageBoxW(0,Strings[IDS_UNZIP_ERROR],0,0); + return FALSE; +} + +static void AddUninstallerScriptFunc(WCHAR* RegName, WCHAR* File) { + HKEY hKey1; + HKEY hKey2; + LPDWORD dispos = NULL; + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall",0,KEY_WRITE,&hKey1) == ERROR_SUCCESS) + if (RegCreateKeyEx(hKey1,RegName,0,NULL,REG_OPTION_NON_VOLATILE,KEY_WRITE,NULL,&hKey2,dispos) == ERROR_SUCCESS) { + RegSetValueExW(hKey2,L"DisplayName",0,REG_SZ,(BYTE*)RegName,(lstrlen(RegName)+1)*sizeof(WCHAR)); + RegSetValueExW(hKey2,L"UninstallString",0,REG_SZ,(BYTE*)File,(lstrlen(File)+1)*sizeof(WCHAR)); + } + RegCloseKey(hKey2); + RegCloseKey(hKey1); +} + +static void RemoveUninstallerScriptFunc(WCHAR* RegName) { + HKEY hKey1; + HKEY hKey2; + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall",0,KEY_WRITE,&hKey1) == ERROR_SUCCESS) { + if (RegOpenKeyExW(hKey1,RegName,0,KEY_WRITE,&hKey2) == ERROR_SUCCESS) { + RegDeleteValueW(hKey2,L"DisplayName"); + RegDeleteValueW(hKey2,L"UninstallString"); + RegCloseKey(hKey2); + } + // RegDeleteKeyW(hKey1,RegName); + } + RegCloseKey(hKey1); +} + +static void MessageScriptFunc(WCHAR* Text) { + MessageBoxW(0,Text,Strings[IDS_WINDOW_TITLE],0); +} + +extern void LoadScriptFunc(WCHAR*, struct ScriptElement*); + +static void RunScript(struct Application* App, struct ScriptElement* Script) { + BOOL bRun = TRUE; + struct ScriptElement* p = Script; + INT SizeB = 0x100; + INT SizeA = sizeof(p->Arg)/sizeof(*(p->Arg)); + INT i; + int currentlengt = 0; + WCHAR ArgBuffer[SizeA][SizeB]; + WCHAR BufferA[SizeB]; + WCHAR BufferB[SizeB]; + WCHAR BufferC[SizeB]; + WCHAR* Pos1; + WCHAR* Pos2; + WCHAR* Pos3 = NULL; + BOOL bNext; + while(bRun && (p != NULL)) { + + for(i=0; i<SizeA; i++) { + bNext = TRUE; + wcscpy(BufferA, p->Arg[i]); + Pos1 = BufferA; + Pos2 = wcschr(Pos1, L'%'); + if(!Pos2) { + wcscpy(ArgBuffer[i], Pos1); + break; + } + Pos2[0] = L'\0'; + wcscpy(BufferB, Pos1); + Pos1 = Pos2 + 1; + Pos2 = wcschr(Pos1, L'%'); + while (Pos2) { + Pos2[0] = L'\0'; + if(bNext) { + if (wcscmp(Pos1, L"name") == 0) { + Pos3 = App->Name; + } else if (wcscmp(Pos1, L"regname") == 0) { + Pos3 = App->RegName; + } else if (wcscmp(Pos1, L"version") == 0) { + Pos3 = App->Version; + } else if (wcscmp(Pos1, L"maintainer") == 0) { + Pos3 = App->Maintainer; + } else if (wcscmp(Pos1, L"licence") == 0) { + Pos3 = App->Licence; + } else if (wcscmp(Pos1, L"description") == 0) { + Pos3 = App->Description; + } else if (wcscmp(Pos1, L"location") == 0) { + Pos3 = App->Location; + } else if (wcscmp(Pos1, L"regname_uninstaller") == 0) { + if (!getUninstaller(App, BufferC)) { + BufferC[0] = '\0'; + } + Pos3 = BufferC; + } else if (wcscmp(Pos1, L"location_file") == 0) { + Pos3 = wcsrchr(App->Location, L'/'); + if(Pos3 == NULL) { + BufferC[0] = '\0'; + Pos3 = BufferC; + } else { + Pos3++; + } + } else { + Pos3 = _wgetenv(Pos1); + } + bNext = !(Pos3); + if (bNext) { + Pos3 = Pos1; + currentlengt = lstrlenW(BufferB); + wcsncat(BufferB, L"%", SizeB-currentlengt); + } + } else { + Pos3 = Pos1; + bNext = TRUE; + } + currentlengt = lstrlenW(BufferB); + wcsncat(BufferB, Pos3, SizeB-currentlengt); + Pos1 = Pos2 + 1; + Pos2 = wcschr(Pos1, L'%'); + } + if (bNext) { + wcsncat(BufferB, L"%", SizeB-currentlengt); + } + currentlengt = lstrlenW(BufferB); + wcsncat(BufferB, Pos1, SizeB-currentlengt); + wcscpy(ArgBuffer[i], BufferB); + } + + if (wcscmp(p->Func, L"download") == 0) { + DownloadScriptFunc(ArgBuffer[0], ArgBuffer[1]); + } else if (wcscmp(p->Func, L"exec") == 0) { + ExecScriptFunc(ArgBuffer[0]); + } else if (wcscmp(p->Func, L"del") == 0) { + DelScriptFunc(ArgBuffer[0]); + } else if (wcscmp(p->Func, L"unzip") == 0) { + bRun = UnzipScriptFunc(ArgBuffer[0], ArgBuffer[1]); + } else if (wcscmp(p->Func, L"adduninstaller") == 0) { + AddUninstallerScriptFunc(ArgBuffer[0], ArgBuffer[1]); + } else if (wcscmp(p->Func, L"removeuninstaller") == 0) { + RemoveUninstallerScriptFunc(ArgBuffer[0]); + } else if (wcscmp(p->Func, L"message") == 0) { + MessageScriptFunc(ArgBuffer[0]); + } else if (wcscmp(p->Func, L"load") == 0) { + LoadScriptFunc(ArgBuffer[0],p); + } + p = p->Next; + } +} + +DWORD WINAPI InstallThreadFunc(LPVOID Context) { + struct Application* App = (struct Application*)Context; + + if(App->InstallScript == NULL){ + /* Default UninstallScript */ + struct ScriptElement* Current; + Current = malloc(sizeof(struct ScriptElement)); + App->InstallScript = Current; + memset(Current, 0, sizeof(struct ScriptElement)); + wcscpy(Current->Func, L"load"); + wcscpy(Current->Arg[0], L"script/default.install.xml"); + } + + RunScript(App, App->InstallScript); + + return 0; +} + + + +DWORD WINAPI UninstallThreadFunc(LPVOID Context){ + struct Application* App = (struct Application*)Context; + + if(App->UninstallScript == NULL){ + /* Default UninstallScript */ + struct ScriptElement* Current; + Current = malloc(sizeof(struct ScriptElement)); + App->UninstallScript = Current; + memset(Current, 0, sizeof(struct ScriptElement)); + wcscpy(Current->Func, L"load"); + wcscpy(Current->Arg[0], L"script/default.uninstall.xml"); + } + + RunScript(App, App->UninstallScript); + + return 0; +} + Propchange: trunk/reactos/base/applications/downloader/script.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/applications/downloader/script.c ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: trunk/reactos/base/applications/downloader/structures.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/structures.h (original) +++ trunk/reactos/base/applications/downloader/structures.h Fri Mar 2 20:27:39 2007 @@ -9,6 +9,8 @@ WCHAR Description[0x400]; WCHAR Location[0x100]; struct Application* Next; + struct ScriptElement* InstallScript; + struct ScriptElement* UninstallScript; }; struct Category @@ -22,3 +24,17 @@ struct Category* Children; struct Category* Parent; }; + +struct ScriptElement +{ + WCHAR Func[0x100]; + WCHAR Arg[2][0x100]; + struct ScriptElement* Next; +}; + +struct lParamDownload +{ + HWND Dlg; + WCHAR* URL; + WCHAR* File; +}; Modified: trunk/reactos/base/applications/downloader/translations/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/translations/de.rc (original) +++ trunk/reactos/base/applications/downloader/translations/de.rc Fri Mar 2 20:27:39 2007 @@ -14,7 +14,7 @@ BEGIN IDS_WINDOW_TITLE "Download ! - ReactOS Downloader" IDS_WELCOME_TITLE "Willkommen im ReactOS Downloader" - IDS_WELCOME "Bitte wählen Sie rechts eine Kategorie. Dies ist Version 1.0." + IDS_WELCOME "Bitte wählen Sie links eine Kategorie. Dies ist Version 1.0." IDS_NO_APP_TITLE "Keine Anwendung ausgewählt" IDS_NO_APP "Bitte wählen Sie eine Anwendung, bevor Sie die Download-Schaltfläche betätigen. Wenn Sie Hilfe benötigen, drücken Sie die Hilfe-Schaltfläche in der oberen rechten Ecke." IDS_UPDATE_TITLE "Update" @@ -29,6 +29,7 @@ IDS_XMLERROR_1 "XML Datei nicht gefunden!" IDS_XMLERROR_2 "XML Datei kann nicht verarbeitet werden!" IDS_DOWNLOAD_ERROR "Die Datei konnte nicht runtergeladen werden.\nBitte prüfen sie, ob eine Verbindung zum Internet besteht." + IDS_UNZIP_ERROR "7-Zip nicht gefunden.\nBitte installieren Sie 7-Zip." IDS_VERSION "Version: " IDS_LICENCE "Lizenz: " IDS_MAINTAINER "Maintainer: " Modified: trunk/reactos/base/applications/downloader/translations/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/translations/en.rc (original) +++ trunk/reactos/base/applications/downloader/translations/en.rc Fri Mar 2 20:27:39 2007 @@ -14,7 +14,7 @@ BEGIN IDS_WINDOW_TITLE "Download ! - ReactOS Downloader" IDS_WELCOME_TITLE "Welcome to the ReactOS Downloader" - IDS_WELCOME "Please choose a category on the right. This is version 1.0." + IDS_WELCOME "Please choose a category on the left. This is version 1.0." IDS_NO_APP_TITLE "No application selected" IDS_NO_APP "Please select a Application before you click the download button, if you need assistance please click on the question mark button on the top right corner." IDS_UPDATE_TITLE "Update" @@ -29,6 +29,7 @@ IDS_XMLERROR_1 "Could not find the xml file !" IDS_XMLERROR_2 "Could not parse the xml file !" IDS_DOWNLOAD_ERROR "Unable to download the file.\nPlease check you internet connection." + IDS_UNZIP_ERROR "7-Zip not found.\nPlease install 7-Zip" IDS_VERSION "Version: " IDS_LICENCE "Licence: " IDS_MAINTAINER "Maintainer: " Modified: trunk/reactos/base/applications/downloader/translations/fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/translations/fr.rc (original) +++ trunk/reactos/base/applications/downloader/translations/fr.rc Fri Mar 2 20:27:39 2007 @@ -29,6 +29,7 @@ IDS_XMLERROR_1 "Impossible de trouver le fichier xml !" IDS_XMLERROR_2 "Impossible d'analyser le fichier xml !" IDS_DOWNLOAD_ERROR "Impossible de télécharger le fichier.\nVeuillez vérifier votre connexion Internet." + IDS_UNZIP_ERROR "7-Zip not found.\nPlease install 7-Zip" IDS_VERSION "Version: " IDS_LICENCE "Licence: " IDS_MAINTAINER "Maintainer: " Modified: trunk/reactos/base/applications/downloader/translations/id.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/translations/id.rc (original) +++ trunk/reactos/base/applications/downloader/translations/id.rc Fri Mar 2 20:27:39 2007 @@ -29,6 +29,7 @@ IDS_XMLERROR_1 "Tidak dapat menemukan file xml !" IDS_XMLERROR_2 "Tidak dapat mengurai file xml !" IDS_DOWNLOAD_ERROR "Tidak bisa mendownload file.\nSilahkan periksa koneksi internet anda." + IDS_UNZIP_ERROR "7-Zip not found.\nPlease install 7-Zip" IDS_VERSION "Versi: " IDS_LICENCE "Lisensi: " IDS_MAINTAINER "Pemelihara: " Modified: trunk/reactos/base/applications/downloader/translations/it.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/translations/it.rc (original) +++ trunk/reactos/base/applications/downloader/translations/it.rc Fri Mar 2 20:27:39 2007 @@ -29,6 +29,7 @@ IDS_XMLERROR_1 "File xml non trovato !" IDS_XMLERROR_2 "Impossibile trattare il contenuto del file xml !" IDS_DOWNLOAD_ERROR "Download del file impossibile.\nVerifica la connessione a Internet." + IDS_UNZIP_ERROR "7-Zip not found.\nPlease install 7-Zip" IDS_VERSION "Version: " IDS_LICENCE "Licence: " IDS_MAINTAINER "Maintainer: " Modified: trunk/reactos/base/applications/downloader/xml.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/xml.c (original) +++ trunk/reactos/base/applications/downloader/xml.c Fri Mar 2 20:27:39 2007 @@ -10,20 +10,153 @@ #include <stdio.h> #include <windows.h> #include <shlwapi.h> +#include <io.h> #include "structures.h" #include "resources.h" BOOL TagOpen; +BOOL InstallScriptOpen; +BOOL UninstallScriptOpen; struct Category* Current; struct Application* CurrentApplication; +struct ScriptElement* CurrentScript; +char DML_Name[0x100]; +char DML_Target[0x100]; +char Path [0x100]; char CurrentTag [0x100]; + extern WCHAR Strings [STRING_COUNT][MAX_STRING_LENGHT]; +BOOL ImportXML (const char*); + +void ImportFolder (const char* folder) +{ + WCHAR buffer[0x100]; + char buffer2[0x100]; + struct _wfinddata_t Finddata; + DWORD Findhandle; + buffer[0]='\0'; + strcpy(buffer2, Path); + strncat(buffer2, folder, 0x100-strlen(buffer2)); + strncat(buffer2, "\\*.dml", 0x100-strlen(buffer2)); + MultiByteToWideChar(CP_UTF8, 0, buffer2, -1, buffer, 0x100); + if((Findhandle=_wfindfirst(buffer, &Finddata)) == -1) + return; + do { + buffer[0]='\0'; + MultiByteToWideChar(CP_UTF8, 0, folder, -1, buffer, 0x100); + wcsncat(buffer, L"\\", 0x100-wcslen(buffer)); + wcsncat(buffer, Finddata.name, 0x100-wcslen(buffer)); + WideCharToMultiByte(CP_UTF8, 0, buffer, -1, buffer2, 0x100, NULL, FALSE); + ImportXML(buffer2); + } while(_wfindnext(Findhandle, &Finddata)==0); + _findclose(Findhandle); +} + + +void Script_tag_opened (void* usrdata, const char* tag, const char** arg) +{ + int i; + if (!strcmp(tag, "script")) { + return; + } else if (InstallScriptOpen && (CurrentScript == NULL)) { + CurrentApplication->InstallScript = malloc(sizeof(struct ScriptElement)); + CurrentScript = CurrentApplication->InstallScript; + } else if (UninstallScriptOpen && (CurrentScript == NULL)) { + CurrentApplication->UninstallScript = malloc(sizeof(struct ScriptElement)); + CurrentScript = CurrentApplication->UninstallScript; + } else if (CurrentScript != NULL) { + CurrentScript->Next = malloc(sizeof(struct ScriptElement)); + CurrentScript = CurrentScript->Next; + } else { + return; + } + memset(CurrentScript, 0, sizeof(struct ScriptElement)); + if (!strcmp(tag, "download")) { + wcscpy(CurrentScript->Func, L"download"); + for (i=0; arg[i]; i+=2) { + if(!strcmp(arg[i], "file")) { + MultiByteToWideChar(CP_UTF8, 0, arg[i+1], -1, CurrentScript->Arg[1], 0x100); + } else if(!strcmp(arg[i], "url")) { + MultiByteToWideChar(CP_UTF8, 0, arg[i+1], -1, CurrentScript->Arg[0], 0x100); + } + } + } else if (!strcmp(tag, "exec")) { + wcscpy(CurrentScript->Func, L"exec"); + for (i=0; arg[i]; i+=2) { + if(!strcmp(arg[i], "file")) { + MultiByteToWideChar(CP_UTF8, 0, arg[i+1], -1, CurrentScript->Arg[0], 0x100); + } + } + } else if (!strcmp(tag, "del")) { + wcscpy(CurrentScript->Func, L"del"); + for (i=0; arg[i]; i+=2) { + if(!strcmp(arg[i], "file")) { + MultiByteToWideChar(CP_UTF8, 0, arg[i+1], -1, CurrentScript->Arg[0], 0x100); + } + } + } else if (!strcmp(tag, "unzip")) { + wcscpy(CurrentScript->Func, L"unzip"); + for (i=0; arg[i]; i+=2) { + if(!strcmp(arg[i], "file")) { + MultiByteToWideChar(CP_UTF8, 0, arg[i+1], -1, CurrentScript->Arg[0], 0x100); + } else if(!strcmp(arg[i], "outdir")) { + MultiByteToWideChar(CP_UTF8, 0, arg[i+1], -1, CurrentScript->Arg[1], 0x100); + } + } + } else if (!strcmp(tag, "adduninstaller")) { + wcscpy(CurrentScript->Func, L"adduninstaller"); + for (i=0; arg[i]; i+=2) { + if(!strcmp(arg[i], "regname")) { + MultiByteToWideChar(CP_UTF8, 0, arg[i+1], -1, CurrentScript->Arg[0], 0x100); + } else if(!strcmp(arg[i], "file")) { + MultiByteToWideChar(CP_UTF8, 0, arg[i+1], -1, CurrentScript->Arg[1], 0x100); + } + } + } else if (!strcmp(tag, "removeuninstaller")) { + wcscpy(CurrentScript->Func, L"removeuninstaller"); + for (i=0; arg[i]; i+=2) { + if(!strcmp(arg[i], "regname")) { + MultiByteToWideChar(CP_UTF8, 0, arg[i+1], -1, CurrentScript->Arg[0], 0x100); + } + } + } else if (!strcmp(tag, "message")) { + wcscpy(CurrentScript->Func, L"message"); + for (i=0; arg[i]; i+=2) { + if(!strcmp(arg[i], "text")) { + MultiByteToWideChar(CP_UTF8, 0, arg[i+1], -1, CurrentScript->Arg[0], 0x100); + } + } + } else if (!strcmp(tag, "load")) { + wcscpy(CurrentScript->Func, L"load"); + for (i=0; arg[i]; i+=2) { + if(!strcmp(arg[i], "file")) { + MultiByteToWideChar(CP_UTF8, 0, arg[i+1], -1, CurrentScript->Arg[0], 0x100); + } + } + } else + MessageBoxW(0,Strings[IDS_XMLERROR_2],0,0); +} + void tag_opened (void* usrdata, const char* tag, const char** arg) { int i; - if(!strcmp(tag, "tree") && !CurrentApplication) + if(!strcmp(tag, "import")) + { + for (i=0; arg[i]; i+=2) + { + if(!strcmp(arg[i], "file")) + { + ImportXML(arg[i+1]); + } + else if(!strcmp(arg[i], "folder")) + { + ImportFolder(arg[i+1]); + } + } + } + else if(!strcmp(tag, "tree") && !CurrentApplication) { // check version } @@ -92,7 +225,16 @@ } else if (CurrentApplication) { - strncpy(CurrentTag, tag, 0x100); + if (!strcmp(tag, "installscript")) { + InstallScriptOpen = TRUE; + } else if (!strcmp(tag, "uninstallscript")) { + UninstallScriptOpen = TRUE; + } else { + Script_tag_opened(usrdata, tag, arg); + if (CurrentScript == NULL) { + strncpy(CurrentTag, tag, 0x100); + } + } } else MessageBoxW(0,Strings[IDS_XMLERROR_2],0,0); @@ -155,30 +297,27 @@ { CurrentApplication = NULL; } -} - -BOOL ProcessXML (const char* filename, struct Category* Root) + else if(!strcmp(tag, "installscript") || !strcmp(tag, "uninstallscript")) + { + CurrentScript = NULL; + InstallScriptOpen = FALSE; + UninstallScriptOpen = FALSE; + } +} + +BOOL ImportXML (const char* filename) { int done = 0; - char buffer[255]; + char buffer[0x100]; FILE* file; XML_Parser parser; - - if(Current) + strcpy(buffer, Path); + strncat(buffer, filename, 0x100-strlen(buffer)); + file = fopen(buffer, "r"); + if(!file) + { + MessageBoxW(0,Strings[IDS_XMLERROR_1],0,0); return FALSE; - - Current = Root; - TagOpen = TRUE; - - file = fopen(filename, "r"); - if(!file) - { - file = fopen("downloader.xml", "r"); - if(!file) - { - MessageBoxW(0,Strings[IDS_XMLERROR_1],0,0); - return FALSE; - } } parser = XML_ParserCreate(NULL); @@ -204,10 +343,169 @@ return TRUE; } +BOOL ProcessXML (const char* filename, struct Category* Root) +{ + FILE* file; + file = fopen(filename, "r"); + if(file) + { + Path[0]='\0'; + fclose(file); + } + else + { + strncpy(Path, getenv("SystemRoot"), 0x100-13); + strcat(Path, "\\packagetree\\"); + } + + if(Current) + return FALSE; + + Current = Root; + CurrentApplication = NULL; + CurrentScript = NULL; + TagOpen = TRUE; + InstallScriptOpen = FALSE; + UninstallScriptOpen = FALSE; + + return ImportXML(filename); +} + +void DML_tag_opened (void* usrdata, const char* tag, const char** arg) +{ + int i; + + if(!strcmp(tag, "application")) + { + for (i=0; arg[i]; i+=2) + { + if(!strcmp(arg[i], "name")) + { + strncpy(DML_Name, arg[i+1], 0x100); + } + else if(!strcmp(arg[i], "target")) + { + strncpy(DML_Target, arg[i+1], 0x100); + } + } + } +} + +void NOP_text (void* usrdata, const char* data, int len) +{ +} + +void NOP_tag_closed (void* tree, const char* tag) +{ +} + +char* addDML (const char* filename) +{ + int done = 0; + char buffer[0x100]; + FILE* file; + XML_Parser parser; + DML_Target[0] = '\0'; + file = fopen(filename, "r"); + if(!file) + { + MessageBoxW(0,Strings[IDS_XMLERROR_1],0,0); + return NULL; + } + + parser = XML_ParserCreate(NULL); + XML_SetElementHandler(parser, DML_tag_opened, NOP_tag_closed); + XML_SetCharacterDataHandler(parser, NOP_text); + + while (!done) + { + size_t len = fread (buffer, 1, sizeof(buffer), file); + done = len < sizeof(buffer); + + buffer[len] = 0; + if(!XML_Parse(parser, buffer, len, done)) + { + MessageBoxW(0,Strings[IDS_XMLERROR_2],0,0); + return NULL; + } + } + + XML_ParserFree(parser); + fclose(file); + + if(DML_Target[0]=='\0') + { + MessageBoxW(0,Strings[IDS_XMLERROR_2],0,0); + return NULL; + } + + strcpy(buffer, getenv("SystemRoot")); + strncat(buffer, "\\packagetree\\", 0x100-strlen(buffer)); + strncat(buffer, DML_Target, 0x100-strlen(buffer)); + + CopyFileA(filename, buffer, FALSE); + return DML_Name; +} + +void LoadScriptFunc(WCHAR* filenameW, struct ScriptElement* Script) +{ + int done = 0; + char buffer[0x100]; + char filenameA[0x100]; + FILE* file; + XML_Parser parser; + struct ScriptElement* NextElement = Script->Next; + wcscpy(Script->Func,L"NOP"); + CurrentScript = Script; + WideCharToMultiByte(CP_UTF8, 0, filenameW, -1, filenameA, 0x100, NULL, FALSE); + strcpy(buffer, Path); + strncat(buffer, filenameA, 0x100-strlen(buffer)); + file = fopen(buffer, "r"); + if(!file) + { + MessageBoxW(0,Strings[IDS_XMLERROR_1],0,0); + return; + } + + parser = XML_ParserCreate(NULL); + XML_SetElementHandler(parser, Script_tag_opened, NOP_tag_closed); + XML_SetCharacterDataHandler(parser, NOP_text); + + while (!done) + { + size_t len = fread (buffer, 1, sizeof(buffer), file); + done = len < sizeof(buffer); + + buffer[len] = 0; + if(!XML_Parse(parser, buffer, len, done)) + { + MessageBoxW(0,Strings[IDS_XMLERROR_2],0,0); + CurrentScript->Next = NextElement; + return; + } + } + + XML_ParserFree(parser); + fclose(file); + CurrentScript->Next = NextElement; + return; +} + +void FreeScript (struct ScriptElement* Script) +{ + if (Script->Next != NULL) + FreeScript(Script->Next); + free(Script); +} + void FreeApps (struct Application* Apps) { if (Apps->Next) FreeApps(Apps->Next); + if (Apps->InstallScript) + FreeScript(Apps->InstallScript); + if (Apps->UninstallScript) + FreeScript(Apps->UninstallScript); free(Apps); }

1 0

[mbosma] 25951: Felipe Villarroel (fvillarroels(at)gmail(dot)com): Gcc4 fixes.
by mbosma＠svn.reactos.org 02 Mar '07

02 Mar '07

Author: mbosma Date: Fri Mar 2 20:06:20 2007 New Revision: 25951 URL: http://svn.reactos.org/svn/reactos?rev=25951&view=rev Log: Felipe Villarroel (fvillarroels(at)gmail(dot)com): Gcc4 fixes. Modified: branches/cache_manager_rewrite/mm/pageop.c branches/cache_manager_rewrite/mm/rmap.c Modified: branches/cache_manager_rewrite/mm/pageop.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/pageop… ============================================================================== --- branches/cache_manager_rewrite/mm/pageop.c (original) +++ branches/cache_manager_rewrite/mm/pageop.c Fri Mar 2 20:06:20 2007 @@ -48,7 +48,7 @@ } if (PageOp->MArea) { - InterlockedDecrementUL(&PageOp->MArea->PageOpCount); + (void)InterlockedDecrementUL(&PageOp->MArea->PageOpCount); } PrevPageOp = MmPageOpHashTable[PageOp->Hash]; if (PrevPageOp == PageOp) Modified: branches/cache_manager_rewrite/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/rmap.c… ============================================================================== --- branches/cache_manager_rewrite/mm/rmap.c (original) +++ branches/cache_manager_rewrite/mm/rmap.c Fri Mar 2 20:06:20 2007 @@ -528,7 +528,7 @@ } if (Process) { - InterlockedExchangeAddUL(&Process->Vm.WorkingSetSize, -PAGE_SIZE); + (void)InterlockedExchangeAddUL(&Process->Vm.WorkingSetSize, -PAGE_SIZE); } return; }

1 0

[mbosma] 25950: Merge to state of 0.3.1 branch.
by mbosma＠svn.reactos.org 02 Mar '07

02 Mar '07

Author: mbosma Date: Fri Mar 2 20:01:55 2007 New Revision: 25950 URL: http://svn.reactos.org/svn/reactos?rev=25950&view=rev Log: Merge to state of 0.3.1 branch. Modified: branches/cache_manager_rewrite/Instructions.txt branches/cache_manager_rewrite/mm/freelist.c branches/cache_manager_rewrite/mm/mminit.c branches/cache_manager_rewrite/mm/rmap.c branches/cache_manager_rewrite/mm/section.c Modified: branches/cache_manager_rewrite/Instructions.txt URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/Instructi… ============================================================================== --- branches/cache_manager_rewrite/Instructions.txt (original) +++ branches/cache_manager_rewrite/Instructions.txt Fri Mar 2 20:01:55 2007 @@ -1,2 +1,2 @@ To build this branch apply the patch to trunk. And replace ntoskrnl/mm, ntoskrnl/cc with the folders from here. -This branch currently applies against: r25313 +This branch currently applies against: 0.3.1 branch - r25940 Modified: branches/cache_manager_rewrite/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/freeli… ============================================================================== --- branches/cache_manager_rewrite/mm/freelist.c (original) +++ branches/cache_manager_rewrite/mm/freelist.c Fri Mar 2 20:01:55 2007 @@ -479,7 +479,9 @@ MmPageArray[j].Flags.Type = MM_PHYSICAL_PAGE_USED; MmPageArray[j].Flags.Zero = 0; MmPageArray[j].Flags.Consumer = MC_NPPOOL; - MmPageArray[j].ReferenceCount = 1; + /* Reference count 2, because we're having ReferenceCount track + MapCount as well. */ + MmPageArray[j].ReferenceCount = 2; MmPageArray[j].MapCount = 1; InsertTailList(&UsedPageListHeads[MC_NPPOOL], &MmPageArray[j].ListEntry); @@ -519,7 +521,7 @@ MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_USED; MmPageArray[i].Flags.Zero = 0; MmPageArray[i].Flags.Consumer = MC_NPPOOL; - MmPageArray[i].ReferenceCount = 1; + MmPageArray[i].ReferenceCount = 2; MmPageArray[i].MapCount = 1; InsertTailList(&UsedPageListHeads[MC_NPPOOL], &MmPageArray[i].ListEntry); @@ -588,6 +590,7 @@ KEBUGCHECK(0); } MmPageArray[Pfn].MapCount++; + MmPageArray[Pfn].ReferenceCount++; KeReleaseSpinLock(&PageListLock, oldIrql); } } @@ -612,6 +615,7 @@ KEBUGCHECK(0); } MmPageArray[Pfn].MapCount--; + MmPageArray[Pfn].ReferenceCount--; KeReleaseSpinLock(&PageListLock, oldIrql); } } Modified: branches/cache_manager_rewrite/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/mminit… ============================================================================== --- branches/cache_manager_rewrite/mm/mminit.c (original) +++ branches/cache_manager_rewrite/mm/mminit.c Fri Mar 2 20:01:55 2007 @@ -485,7 +485,7 @@ /* * Initialise the modified page writer. */ - MmInitMpwThread(); + if (!strstr(KeLoaderBlock->LoadOptions, "MININT")) MmInitMpwThread(); /* FIXME: Read parameters from memory */ MmInitSectionImplementation2(); Modified: branches/cache_manager_rewrite/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/rmap.c… ============================================================================== --- branches/cache_manager_rewrite/mm/rmap.c (original) +++ branches/cache_manager_rewrite/mm/rmap.c Fri Mar 2 20:01:55 2007 @@ -415,7 +415,7 @@ if (MmGetPfnForProcess(Process, Address) != Page) { DPRINT1("Insert rmap (%d, 0x%.8X) 0x%.8X which doesn't match physical " - "address 0x%.8X\n", Process ? Process->UniqueProcessId : 0, Address, + "address 0x%.8X\n", Process->UniqueProcessId, Address, MmGetPfnForProcess(Process, Address) << PAGE_SHIFT, Page << PAGE_SHIFT); KEBUGCHECK(0); @@ -492,7 +492,7 @@ } if (Process) { - InterlockedExchangeAddUL(&Process->Vm.WorkingSetSize, -PAGE_SIZE); + (void)InterlockedExchangeAddUL(&Process->Vm.WorkingSetSize, -PAGE_SIZE); } } } Modified: branches/cache_manager_rewrite/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/sectio… ============================================================================== --- branches/cache_manager_rewrite/mm/section.c (original) +++ branches/cache_manager_rewrite/mm/section.c Fri Mar 2 20:01:55 2007 @@ -3281,6 +3281,7 @@ ObjectTypeInitializer.GenericMapping = MmpSectionMapping; ObjectTypeInitializer.DeleteProcedure = MmpDeleteSection; ObjectTypeInitializer.CloseProcedure = MmpCloseSection; + ObjectTypeInitializer.ValidAccessMask = SECTION_ALL_ACCESS; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &MmSectionObjectType); InitializeListHead(&ImageSectionObjectListHead);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2007