Ros-diffs

ros-diffs@reactos.org

81390 discussions

[zguo] 28230: Fix build part 1, add precomp.h into bootvid.rbuild
by zguo＠svn.reactos.org 07 Aug '07

07 Aug '07

Author: zguo Date: Wed Aug 8 03:04:19 2007 New Revision: 28230 URL: http://svn.reactos.org/svn/reactos?rev=28230&view=rev Log: Fix build part 1, add precomp.h into bootvid.rbuild Modified: trunk/reactos/drivers/base/bootvid/bootvid.rbuild Modified: trunk/reactos/drivers/base/bootvid/bootvid.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… ============================================================================== --- trunk/reactos/drivers/base/bootvid/bootvid.rbuild (original) +++ trunk/reactos/drivers/base/bootvid/bootvid.rbuild Wed Aug 8 03:04:19 2007 @@ -9,4 +9,5 @@ <file>bootdata.c</file> <file>vga.c</file> <file>bootvid.rc</file> + <pch>precomp.h</pch> </module>

1 0

[jimtabor] 28229: Don't write to user space after an error. We do write if TRUE.
by jimtabor＠svn.reactos.org 07 Aug '07

07 Aug '07

Author: jimtabor Date: Wed Aug 8 02:19:32 2007 New Revision: 28229 URL: http://svn.reactos.org/svn/reactos?rev=28229&view=rev Log: Don't write to user space after an error. We do write if TRUE. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Wed Aug 8 02:19:32 2007 @@ -1213,7 +1213,7 @@ break; } - if (!Ret) + if (Ret) { _SEH_TRY {

1 0

[cwittich] 28228: add support for Visual Studio 2008 (Orcas)
by cwittich＠svn.reactos.org 07 Aug '07

07 Aug '07

Author: cwittich Date: Wed Aug 8 01:19:22 2007 New Revision: 28228 URL: http://svn.reactos.org/svn/reactos?rev=28228&view=rev Log: add support for Visual Studio 2008 (Orcas) Modified: trunk/reactos/Makefile trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=28228&r1=2822… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Wed Aug 8 01:19:22 2007 @@ -523,6 +523,11 @@ $(ECHO_RBUILD) $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs8.00 -voversionconfiguration msvc +.PHONY: msvc9 +msvc9: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs9.00 -voversionconfiguration msvc + .PHONY: msvc6_clean msvc6_clean: $(RBUILD_TARGET) $(ECHO_RBUILD) @@ -542,6 +547,11 @@ msvc8_clean: $(RBUILD_TARGET) $(ECHO_RBUILD) $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs8.00 -voversionconfiguration msvc + +.PHONY: msvc9_clean +msvc9_clean: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs9.00 -voversionconfiguration msvc .PHONY: msvc_clean msvc_clean: $(RBUILD_TARGET) 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 Wed Aug 8 01:19:22 2007 @@ -285,6 +285,8 @@ return "vc70"; else if ( configuration.VSProjectVersion == "7.10" ) return "vc71"; + else if ( configuration.VSProjectVersion == "9.00" ) + return "vc9"; else /* must be VS2005 */ return "vc8"; 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 Wed Aug 8 01:19:22 2007 @@ -416,6 +416,12 @@ fprintf ( OUT, "\t\t\t\tName=\"VCLinkerTool\"\r\n" ); if (module.GetEntryPoint(false) == "0") fprintf ( OUT, "AdditionalOptions=\"/noentry\"" ); + + if (configuration.VSProjectVersion == "9.00") + { + fprintf ( OUT, "\t\t\t\tRandomizedBaseAddress=\"0\"\r\n" ); + fprintf ( OUT, "\t\t\t\tDataExecutionPrevention=\"0\"\r\n" ); + } if (module.importLibrary != NULL) fprintf ( OUT, "\t\t\t\tModuleDefinitionFile=\"%s\"\r\n", module.importLibrary->definition.c_str()); @@ -777,6 +783,9 @@ if (configuration.VSProjectVersion == "8.00") version = "9.00"; + if (configuration.VSProjectVersion == "9.00") + version = "10.00"; + return version; }

1 0

[fireball] 28227: - WDK support for bootvid and kdcom.
by fireball＠svn.reactos.org 07 Aug '07

07 Aug '07

Author: fireball Date: Wed Aug 8 00:58:55 2007 New Revision: 28227 URL: http://svn.reactos.org/svn/reactos?rev=28227&view=rev Log: - WDK support for bootvid and kdcom. Modified: trunk/reactos/drivers/base/bootvid/precomp.h trunk/reactos/drivers/base/kdcom/kdbg.c Modified: trunk/reactos/drivers/base/bootvid/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/preco… ============================================================================== --- trunk/reactos/drivers/base/bootvid/precomp.h (original) +++ trunk/reactos/drivers/base/bootvid/precomp.h Wed Aug 8 00:58:55 2007 @@ -1,3 +1,5 @@ +void _enable(void); +void _disable(void); #include "ntddk.h" #include "arc/arc.h" #include "halfuncs.h" 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 Wed Aug 8 00:58:55 2007 @@ -11,6 +11,11 @@ */ /* INCLUDES *****************************************************************/ + +#ifdef _MSC_VER +void _enable(void); +void _disable(void); +#endif #define NOEXTAPI #include <ntddk.h>

1 0

[cwittich] 28226: revert more.c to r25042
by cwittich＠svn.reactos.org 07 Aug '07

07 Aug '07

Author: cwittich Date: Wed Aug 8 00:52:55 2007 New Revision: 28226 URL: http://svn.reactos.org/svn/reactos?rev=28226&view=rev Log: revert more.c to r25042 Modified: trunk/reactos/base/applications/cmdutils/more/more.c Modified: trunk/reactos/base/applications/cmdutils/more/more.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/more.c (original) +++ trunk/reactos/base/applications/cmdutils/more/more.c Wed Aug 8 00:52:55 2007 @@ -1,139 +1,169 @@ -#include <stdlib.h> -#include <stdio.h> -#include <time.h> -#include <unistd.h> +/* $Id$ + * + * MORE.C - external command. + * + * clone from 4nt more command + * + * 26 Sep 1999 - Paolo Pantaleo <paolopan(a)freemail.it> + * started + * Oct 2003 - Timothy Schepens <tischepe at fastmail dot fm> + * use window size instead of buffer size. + */ -#define rdtscll(val) __asm__ __volatile__ ("rdtsc" : "=A" (val)) +#include <windows.h> +#include <malloc.h> +#include <tchar.h> -const int SELECTMODE = 14; -const int BIGDATA = 10000; // Relying on int = long -const int MHZ = 2160; -int *data; -void SelectionSort(int data[], int left, int right) { - int i, j; - for(i = left; i < right; i++) { - int min = i; - for(j=i+1; j <= right; j++) - if(data[j] < data[min]) min = j; - int temp = data[min]; - data[min] = data[i]; - data[i] = temp; - } +DWORD len; +LPTSTR msg = _T("--- continue ---"); + + +/*handle for file and console*/ +HANDLE hStdIn; +HANDLE hStdOut; +HANDLE hStdErr; +HANDLE hKeyboard; + + +static VOID +GetScreenSize (PSHORT maxx, PSHORT maxy) +{ + CONSOLE_SCREEN_BUFFER_INFO csbi; + + GetConsoleScreenBufferInfo (hStdOut, &csbi); + *maxx = (csbi.srWindow.Right - csbi.srWindow.Left) + 1; + *maxy = (csbi.srWindow.Bottom - csbi.srWindow.Top) - 4; + } -int Partition( int d[], int left, int right) + +static +VOID ConOutPuts (LPTSTR szText) { - int val =d[left]; - int lm = left-1; - int rm = right+1; - for(;;) { - do - rm--; - while (d[rm] > val); - - do - lm++; - while( d[lm] < val); + DWORD dwWritten; - if(lm < rm) { - int tempr = d[rm]; - d[rm] = d[lm]; - d[lm] = tempr; - } - else - return rm; - } + WriteFile (GetStdHandle (STD_OUTPUT_HANDLE), szText, _tcslen(szText), &dwWritten, NULL); + WriteFile (GetStdHandle (STD_OUTPUT_HANDLE), "\n", 1, &dwWritten, NULL); } -void Quicksort( int d[], int left, int right) + +static VOID +ConInKey (VOID) { - if(left < (right-SELECTMODE)) { - int split_pt = Partition(d,left, right); - Quicksort(d, left, split_pt); - Quicksort(d, split_pt+1, right); - } - else SelectionSort(d, left, right); + INPUT_RECORD ir; + DWORD dwRead; + + do + { + ReadConsoleInput (hKeyboard, &ir, 1, &dwRead); + if ((ir.EventType == KEY_EVENT) && + (ir.Event.KeyEvent.bKeyDown == TRUE)) + return; + } + while (TRUE); } -int main(int argc, char* argv[]) { - data = (int*)calloc(BIGDATA,4); - unsigned long int timeStart; +static VOID +WaitForKey (VOID) +{ + DWORD dwWritten; - unsigned long int timeReadLoopStart; - unsigned long int timeReadLoopEnd; + WriteFile (hStdErr,msg , len, &dwWritten, NULL); - unsigned long int timeSortLoopStart; - unsigned long int timeSortLoopEnd; + ConInKey(); - unsigned long int timeWriteLoopStart; - unsigned long int timeWriteLoopEnd; + WriteFile (hStdErr, _T("\n"), 1, &dwWritten, NULL); - unsigned long int timeEnd; +// FlushConsoleInputBuffer (hConsoleIn); +} - FILE *randfile; - FILE *sortfile; - int i,j,thisInt,dataSize = 0; - long sumUnsorted = 0; - rdtscll(timeStart); +//INT CommandMore (LPTSTR cmd, LPTSTR param) +int main (int argc, char **argv) +{ + SHORT maxx,maxy; + SHORT line_count=0,ch_count=0; + DWORD i, last; + HANDLE hFile = INVALID_HANDLE_VALUE; + TCHAR szFullPath[MAX_PATH]; - randfile = (argc < 2) ? stdin : fopen(argv[1],"r"); - sortfile = (argc < 3) ? stdout : fopen(argv[2],"w"); - if (randfile == NULL || sortfile == NULL) { - fprintf(stderr,"Could not open all files.\n"); - return 1; + /*reading/writing buffer*/ + TCHAR *buff; + + /*bytes written by WriteFile and ReadFile*/ + DWORD dwRead,dwWritten; + + /*ReadFile() return value*/ + BOOL bRet; + + len = _tcslen (msg); + hStdIn = GetStdHandle(STD_INPUT_HANDLE); + hStdOut = GetStdHandle(STD_OUTPUT_HANDLE); + hStdErr = GetStdHandle(STD_ERROR_HANDLE); + + if (argc > 1 && _tcsncmp (argv[1], _T("/?"), 2) == 0) + { + ConOutPuts(_T("Help text still missing!!")); + return 0; } - rdtscll(timeReadLoopStart); + hKeyboard = CreateFile (_T("CONIN$"), GENERIC_READ, + 0,NULL,OPEN_ALWAYS,0,0); - i = 0; - while (!feof(randfile)) { - fscanf(randfile,"%d",&thisInt); - if (feof(randfile)) { break; } - data[i] = thisInt; - sumUnsorted += thisInt; - //fprintf(stdout,"[%d] Read item: %d\n",i,thisInt); - i++; - if (i >= BIGDATA) { - break; + GetScreenSize(&maxx,&maxy); + + buff=malloc(4096); + + FlushConsoleInputBuffer (hKeyboard); + + if(argc > 1) + { + GetFullPathName(argv[1], MAX_PATH, szFullPath, NULL); + hFile = CreateFile (szFullPath, GENERIC_READ, + 0,NULL,OPEN_ALWAYS,0,0); + } + + do + { + if(hFile != INVALID_HANDLE_VALUE) + { + bRet = ReadFile(hFile,buff,4096,&dwRead,NULL); } + else + { + bRet = ReadFile(hStdIn,buff,4096,&dwRead,NULL); + } + + for(last=i=0;i<dwRead && bRet;i++) + { + ch_count++; + if(buff[i] == _T('\n') || ch_count == maxx) + { + ch_count=0; + line_count++; + if (line_count == maxy) + { + line_count = 0; + WriteFile(hStdOut,&buff[last], i-last+1, &dwWritten, NULL); + last=i+1; + FlushFileBuffers (hStdOut); + WaitForKey (); + } + } + } + if (last<dwRead && bRet) + WriteFile(hStdOut,&buff[last], dwRead-last, &dwWritten, NULL); + } - fclose(randfile); - dataSize = i; + while(dwRead>0 && bRet); - rdtscll(timeReadLoopEnd); - rdtscll(timeSortLoopStart); - - Quicksort(data, 0, dataSize-1); - - rdtscll(timeSortLoopEnd); - rdtscll(timeWriteLoopStart); - - int last = -1; - for(j = 0; j < dataSize; j++) { - if (data[j] < last) { - fprintf(stderr,"The data is not in order\n"); - fprintf(stderr,"Noticed the problem at j = %d\n",j); - fclose(sortfile); - return 1; - } else { - fprintf(sortfile,"%d\n",data[j]); - } - } - fclose(sortfile); - - rdtscll(timeWriteLoopEnd); - - rdtscll(timeEnd); - - fprintf(stdout,"Sorted %d items.\n",dataSize); - fprintf(stdout,"Open Files : %ldt.\n",(long)timeReadLoopStart - (long)timeStart); - fprintf(stdout,"Read Data : %ldt.\n",(long)timeReadLoopEnd - (long)timeReadLoopStart); - fprintf(stdout,"Sort Data : %ldt.\n",(long)timeSortLoopEnd - (long)timeSortLoopStart); - fprintf(stdout,"Write Data : %ldt.\n",(long)timeWriteLoopEnd - (long)timeWriteLoopStart); - fprintf(stdout,"Total Time : %ldt.\n",(long)timeEnd - (long)timeStart); + free (buff); + CloseHandle (hKeyboard); + CloseHandle (hFile); return 0; } + +/* EOF */

1 0

[fireball] 28225: - Force using ReactOS's ntverp.h instead of the WDK. - Don't include ntverp.h twice.
by fireball＠svn.reactos.org 07 Aug '07

07 Aug '07

Author: fireball Date: Wed Aug 8 00:51:50 2007 New Revision: 28225 URL: http://svn.reactos.org/svn/reactos?rev=28225&view=rev Log: - Force using ReactOS's ntverp.h instead of the WDK. - Don't include ntverp.h twice. Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=282… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Wed Aug 8 00:51:50 2007 @@ -12,9 +12,7 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> -//#include <ntoskrnl/cm/newcm.h> #include "ntoskrnl/cm/cm.h" -#include "ntverp.h" #include "ntstrsafe.h" typedef struct _INIT_BUFFER Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.… ============================================================================== --- trunk/reactos/ntoskrnl/include/ntoskrnl.h (original) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h Wed Aug 8 00:51:50 2007 @@ -9,7 +9,7 @@ /* INCLUDES ******************************************************************/ /* Version Data */ -#include <ntverp.h> +#include <psdk/ntverp.h> #define _WIN32_WINNT _WIN32_WINNT_WS03 #define NTDDI_VERSION NTDDI_WS03SP1

1 0

[fireball] 28224: - Make CSQ compatible with MSVC/WDK.
by fireball＠svn.reactos.org 07 Aug '07

07 Aug '07

Author: fireball Date: Wed Aug 8 00:49:09 2007 New Revision: 28224 URL: http://svn.reactos.org/svn/reactos?rev=28224&view=rev Log: - Make CSQ compatible with MSVC/WDK. Modified: trunk/reactos/lib/drivers/csq/csq.c Modified: trunk/reactos/lib/drivers/csq/csq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/csq/csq.c?rev=… ============================================================================== --- trunk/reactos/lib/drivers/csq/csq.c (original) +++ trunk/reactos/lib/drivers/csq/csq.c Wed Aug 8 00:49:09 2007 @@ -25,7 +25,11 @@ */ /* $Id$ */ -#include <ntddk.h> +#ifdef _MSC_VER +#include <ntdef.h> +#undef DECLSPEC_IMPORT +#define DECLSPEC_IMPORT +#endif #include <ntifs.h>

1 0

[fireball] 28223: - Rename exception.c to except.c to avoid conflict with another exception.c in rtl project. - Fix WDK compatibility.
by fireball＠svn.reactos.org 07 Aug '07

07 Aug '07

Author: fireball Date: Wed Aug 8 00:46:24 2007 New Revision: 28223 URL: http://svn.reactos.org/svn/reactos?rev=28223&view=rev Log: - Rename exception.c to except.c to avoid conflict with another exception.c in rtl project. - Fix WDK compatibility. Added: trunk/reactos/lib/rtl/i386/except.c - copied unchanged from r28215, trunk/reactos/lib/rtl/i386/exception.c Removed: trunk/reactos/lib/rtl/i386/exception.c Modified: trunk/reactos/lib/rtl/rtl.h trunk/reactos/lib/rtl/rtl.rbuild Removed: trunk/reactos/lib/rtl/i386/exception.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/exception.c?r… ============================================================================== --- trunk/reactos/lib/rtl/i386/exception.c (original) +++ trunk/reactos/lib/rtl/i386/exception.c (removed) @@ -1,336 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Run-Time Library - * PURPOSE: User-mode exception support for IA-32 - * FILE: lib/rtl/i386/exception.c - * PROGRAMERS: Alex Ionescu (alex(a)relsoft.net) - * Casper S. Hornstrup (chorns(a)users.sourceforge.net) - */ - -/* INCLUDES *****************************************************************/ - -#include <rtl.h> -#define NDEBUG -#include <debug.h> - -/* PUBLIC FUNCTIONS **********************************************************/ - -/* - * @unimplemented - */ -VOID -NTAPI -RtlGetCallersAddress(OUT PVOID *CallersAddress, - OUT PVOID *CallersCaller) -{ - UNIMPLEMENTED; -} - -/* - * @implemented - */ -BOOLEAN -NTAPI -RtlDispatchException(IN PEXCEPTION_RECORD ExceptionRecord, - IN PCONTEXT Context) -{ - PEXCEPTION_REGISTRATION_RECORD RegistrationFrame, NestedFrame = NULL; - DISPATCHER_CONTEXT DispatcherContext; - EXCEPTION_RECORD ExceptionRecord2; - EXCEPTION_DISPOSITION Disposition; - ULONG_PTR StackLow, StackHigh; - ULONG_PTR RegistrationFrameEnd; - - /* Get the current stack limits and registration frame */ - RtlpGetStackLimits(&StackLow, &StackHigh); - RegistrationFrame = RtlpGetExceptionList(); - - /* Now loop every frame */ - while (RegistrationFrame != EXCEPTION_CHAIN_END) - { - /* Find out where it ends */ - RegistrationFrameEnd = (ULONG_PTR)RegistrationFrame + - sizeof(EXCEPTION_REGISTRATION_RECORD); - - /* Make sure the registration frame is located within the stack */ - if ((RegistrationFrameEnd > StackHigh) || - ((ULONG_PTR)RegistrationFrame < StackLow) || - ((ULONG_PTR)RegistrationFrame & 0x3)) - { - /* Check if this happened in the DPC Stack */ - if (RtlpHandleDpcStackException(RegistrationFrame, - RegistrationFrameEnd, - &StackLow, - &StackHigh)) - { - /* Use DPC Stack Limits and restart */ - continue; - } - - /* Set invalid stack and return false */ - ExceptionRecord->ExceptionFlags |= EXCEPTION_STACK_INVALID; - return FALSE; - } - - /* Check if logging is enabled */ - RtlpCheckLogException(ExceptionRecord, - Context, - RegistrationFrame, - sizeof(*RegistrationFrame)); - - /* Call the handler */ - Disposition = RtlpExecuteHandlerForException(ExceptionRecord, - RegistrationFrame, - Context, - &DispatcherContext, - RegistrationFrame-> - Handler); - - /* Check if this is a nested frame */ - if (RegistrationFrame == NestedFrame) - { - /* Mask out the flag and the nested frame */ - ExceptionRecord->ExceptionFlags &= ~EXCEPTION_NESTED_CALL; - NestedFrame = NULL; - } - - /* Handle the dispositions */ - switch (Disposition) - { - /* Continue searching */ - case ExceptionContinueExecution: - - /* Check if it was non-continuable */ - if (ExceptionRecord->ExceptionFlags & EXCEPTION_NONCONTINUABLE) - { - /* Set up the exception record */ - ExceptionRecord2.ExceptionRecord = ExceptionRecord; - ExceptionRecord2.ExceptionCode = - STATUS_NONCONTINUABLE_EXCEPTION; - ExceptionRecord2.ExceptionFlags = EXCEPTION_NONCONTINUABLE; - ExceptionRecord2.NumberParameters = 0; - - /* Raise the exception */ - RtlRaiseException(&ExceptionRecord2); - } - else - { - /* Return to caller */ - return TRUE; - } - - /* Continue searching */ - case ExceptionContinueSearch: - break; - - /* Nested exception */ - case ExceptionNestedException: - - /* Turn the nested flag on */ - ExceptionRecord->ExceptionFlags |= EXCEPTION_NESTED_CALL; - - /* Update the current nested frame */ - if (DispatcherContext.RegistrationPointer > NestedFrame) - { - /* Get the frame from the dispatcher context */ - NestedFrame = DispatcherContext.RegistrationPointer; - } - break; - - /* Anything else */ - default: - - /* Set up the exception record */ - ExceptionRecord2.ExceptionRecord = ExceptionRecord; - ExceptionRecord2.ExceptionCode = STATUS_INVALID_DISPOSITION; - ExceptionRecord2.ExceptionFlags = EXCEPTION_NONCONTINUABLE; - ExceptionRecord2.NumberParameters = 0; - - /* Raise the exception */ - RtlRaiseException(&ExceptionRecord2); - break; - } - - /* Go to the next frame */ - RegistrationFrame = RegistrationFrame->Next; - } - - /* Unhandled, return false */ - return FALSE; -} - -/* - * @implemented - */ -VOID -NTAPI -RtlUnwind(IN PVOID TargetFrame OPTIONAL, - IN PVOID TargetIp OPTIONAL, - IN PEXCEPTION_RECORD ExceptionRecord OPTIONAL, - IN PVOID ReturnValue) -{ - PEXCEPTION_REGISTRATION_RECORD RegistrationFrame, OldFrame; - DISPATCHER_CONTEXT DispatcherContext; - EXCEPTION_RECORD ExceptionRecord2, ExceptionRecord3; - EXCEPTION_DISPOSITION Disposition; - ULONG_PTR StackLow, StackHigh; - ULONG_PTR RegistrationFrameEnd; - CONTEXT LocalContext; - PCONTEXT Context; - - /* Get the current stack limits */ - RtlpGetStackLimits(&StackLow, &StackHigh); - - /* Check if we don't have an exception record */ - if (!ExceptionRecord) - { - /* Overwrite the argument */ - ExceptionRecord = &ExceptionRecord3; - - /* Setup a local one */ - ExceptionRecord3.ExceptionFlags = 0; - ExceptionRecord3.ExceptionCode = STATUS_UNWIND; - ExceptionRecord3.ExceptionRecord = NULL; - ExceptionRecord3.ExceptionAddress = RtlpGetExceptionAddress(); - ExceptionRecord3.NumberParameters = 0; - } - - /* Check if we have a frame */ - if (TargetFrame) - { - /* Set it as unwinding */ - ExceptionRecord->ExceptionFlags |= EXCEPTION_UNWINDING; - } - else - { - /* Set the Exit Unwind flag as well */ - ExceptionRecord->ExceptionFlags |= (EXCEPTION_UNWINDING | - EXCEPTION_EXIT_UNWIND); - } - - /* Now capture the context */ - Context = &LocalContext; - LocalContext.ContextFlags = CONTEXT_INTEGER | - CONTEXT_CONTROL | - CONTEXT_SEGMENTS; - RtlpCaptureContext(Context); - - /* Pop the current arguments off */ - Context->Esp += sizeof(TargetFrame) + - sizeof(TargetIp) + - sizeof(ExceptionRecord) + - sizeof(ReturnValue); - - /* Set the new value for EAX */ - Context->Eax = (ULONG)ReturnValue; - - /* Get the current frame */ - RegistrationFrame = RtlpGetExceptionList(); - - /* Now loop every frame */ - while (RegistrationFrame != EXCEPTION_CHAIN_END) - { - /* If this is the target */ - if (RegistrationFrame == TargetFrame) ZwContinue(Context, FALSE); - - /* Check if the frame is too low */ - if ((TargetFrame) && - ((ULONG_PTR)TargetFrame < (ULONG_PTR)RegistrationFrame)) - { - /* Create an invalid unwind exception */ - ExceptionRecord2.ExceptionCode = STATUS_INVALID_UNWIND_TARGET; - ExceptionRecord2.ExceptionFlags = EXCEPTION_NONCONTINUABLE; - ExceptionRecord2.ExceptionRecord = ExceptionRecord; - ExceptionRecord2.NumberParameters = 0; - - /* Raise the exception */ - RtlRaiseException(&ExceptionRecord2); - } - - /* Find out where it ends */ - RegistrationFrameEnd = (ULONG_PTR)RegistrationFrame + - sizeof(EXCEPTION_REGISTRATION_RECORD); - - /* Make sure the registration frame is located within the stack */ - if ((RegistrationFrameEnd > StackHigh) || - ((ULONG_PTR)RegistrationFrame < StackLow) || - ((ULONG_PTR)RegistrationFrame & 0x3)) - { - /* Check if this happened in the DPC Stack */ - if (RtlpHandleDpcStackException(RegistrationFrame, - RegistrationFrameEnd, - &StackLow, - &StackHigh)) - { - /* Use DPC Stack Limits and restart */ - continue; - } - - /* Create an invalid stack exception */ - ExceptionRecord2.ExceptionCode = STATUS_BAD_STACK; - ExceptionRecord2.ExceptionFlags = EXCEPTION_NONCONTINUABLE; - ExceptionRecord2.ExceptionRecord = ExceptionRecord; - ExceptionRecord2.NumberParameters = 0; - - /* Raise the exception */ - RtlRaiseException(&ExceptionRecord2); - } - else - { - /* Call the handler */ - Disposition = RtlpExecuteHandlerForUnwind(ExceptionRecord, - RegistrationFrame, - Context, - &DispatcherContext, - RegistrationFrame-> - Handler); - switch(Disposition) - { - /* Continue searching */ - case ExceptionContinueSearch: - break; - - /* Collission */ - case ExceptionCollidedUnwind : - - /* Get the original frame */ - RegistrationFrame = DispatcherContext.RegistrationPointer; - break; - - /* Anything else */ - default: - - /* Set up the exception record */ - ExceptionRecord2.ExceptionRecord = ExceptionRecord; - ExceptionRecord2.ExceptionCode = STATUS_INVALID_DISPOSITION; - ExceptionRecord2.ExceptionFlags = EXCEPTION_NONCONTINUABLE; - ExceptionRecord2.NumberParameters = 0; - - /* Raise the exception */ - RtlRaiseException(&ExceptionRecord2); - break; - } - - /* Go to the next frame */ - OldFrame = RegistrationFrame; - RegistrationFrame = RegistrationFrame->Next; - - /* Remove this handler */ - RtlpSetExceptionList(OldFrame); - } - } - - /* Check if we reached the end */ - if (TargetFrame == EXCEPTION_CHAIN_END) - { - /* Unwind completed, so we don't exit */ - ZwContinue(Context, FALSE); - } - else - { - /* This is an exit_unwind or the frame wasn't present in the list */ - ZwRaiseException(ExceptionRecord, Context, FALSE); - } -} - -/* EOF */ Modified: trunk/reactos/lib/rtl/rtl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.h?rev=28223&r1… ============================================================================== --- trunk/reactos/lib/rtl/rtl.h (original) +++ trunk/reactos/lib/rtl/rtl.h Wed Aug 8 00:46:24 2007 @@ -24,11 +24,15 @@ #include <ndk/ntndk.h> /* Internal RTL header */ -#include <reactos/helper.h> #include "rtlp.h" +/* PSEH Support */ +#include <reactos/helper.h> #include <pseh/pseh.h> + +#ifndef _MSC_VER #include <intrin.h> +#endif #endif /* RTL_H */ Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=282… ============================================================================== --- trunk/reactos/lib/rtl/rtl.rbuild (original) +++ trunk/reactos/lib/rtl/rtl.rbuild Wed Aug 8 00:46:24 2007 @@ -10,7 +10,7 @@ <directory name="i386"> <file>debug_asm.S</file> <file>except_asm.s</file> - <file>exception.c</file> + <file>except.c</file> <file>random_asm.S</file> <file>rtlswap.S</file> <file>rtlmem.s</file>

1 0

[fireball] 28222: - Fix build (remove RtlUnwind redeclarations).
by fireball＠svn.reactos.org 07 Aug '07

07 Aug '07

Author: fireball Date: Wed Aug 8 00:20:15 2007 New Revision: 28222 URL: http://svn.reactos.org/svn/reactos?rev=28222&view=rev Log: - Fix build (remove RtlUnwind redeclarations). Modified: trunk/reactos/include/psdk/winternl.h trunk/reactos/include/reactos/wine/exception.h Modified: trunk/reactos/include/psdk/winternl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winternl.h?re… ============================================================================== --- trunk/reactos/include/psdk/winternl.h (original) +++ trunk/reactos/include/psdk/winternl.h Wed Aug 8 00:20:15 2007 @@ -2153,7 +2153,6 @@ NTSTATUS WINAPI RtlUnicodeToOemN(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD); ULONG WINAPI RtlUniform(PULONG); BOOLEAN WINAPI RtlUnlockHeap(HANDLE); -void WINAPI RtlUnwind(PVOID,PVOID,PEXCEPTION_RECORD,PVOID); #ifdef __ia64__ void WINAPI RtlUnwind2(FRAME_POINTERS,PVOID,PEXCEPTION_RECORD,PVOID,PCONTEXT); void WINAPI RtlUnwindEx(FRAME_POINTERS,PVOID,PEXCEPTION_RECORD,PVOID,PCONTEXT,PUNWIND_HISTORY_TABLE); Modified: trunk/reactos/include/reactos/wine/exception.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/excep… ============================================================================== --- trunk/reactos/include/reactos/wine/exception.h (original) +++ trunk/reactos/include/reactos/wine/exception.h Wed Aug 8 00:20:15 2007 @@ -192,8 +192,6 @@ } #ifndef USE_COMPILER_EXCEPTIONS - -extern VOID NTAPI RtlUnwind(PVOID,PVOID,PEXCEPTION_RECORD,PVOID); static __inline EXCEPTION_DISPOSITION __wine_exception_handler( struct _EXCEPTION_RECORD *record, void *frame,

1 0

[fireball] 28221: - Add RtlUnwind to headers, and make list.h MSVC-compatible. - Rename framebased.asm to framebased.S and write in GAS compatible assembly, instead of using nasmw. - Fix WDK compatibility.
by fireball＠svn.reactos.org 07 Aug '07

07 Aug '07

Author: fireball Date: Wed Aug 8 00:11:21 2007 New Revision: 28221 URL: http://svn.reactos.org/svn/reactos?rev=28221&view=rev Log: - Add RtlUnwind to headers, and make list.h MSVC-compatible. - Rename framebased.asm to framebased.S and write in GAS compatible assembly, instead of using nasmw. - Fix WDK compatibility. Added: trunk/reactos/lib/pseh/i386/framebased.S - copied, changed from r28215, trunk/reactos/lib/pseh/i386/framebased.asm Removed: trunk/reactos/lib/pseh/i386/framebased.asm Modified: trunk/reactos/include/psdk/winnt.h trunk/reactos/include/reactos/wine/list.h trunk/reactos/lib/pseh/framebased.c trunk/reactos/lib/pseh/pseh.rbuild Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Wed Aug 8 00:11:21 2007 @@ -2885,6 +2885,16 @@ } RTL_CRITICAL_SECTION,*PRTL_CRITICAL_SECTION; #endif +NTSYSAPI +VOID +NTAPI +RtlUnwind ( + IN PVOID TargetFrame OPTIONAL, + IN PVOID TargetIp OPTIONAL, + IN PEXCEPTION_RECORD ExceptionRecord OPTIONAL, + IN PVOID ReturnValue + ); + #define RTL_SRWLOCK_INIT {0} typedef struct _RTL_SRWLOCK { Modified: trunk/reactos/include/reactos/wine/list.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/list.… ============================================================================== --- trunk/reactos/include/reactos/wine/list.h (original) +++ trunk/reactos/include/reactos/wine/list.h Wed Aug 8 00:11:21 2007 @@ -140,7 +140,7 @@ } /* count the elements of a list */ -inline static unsigned int list_count( const struct list *list ) +__inline static unsigned int list_count( const struct list *list ) { unsigned count = 0; const struct list *ptr; Modified: trunk/reactos/lib/pseh/framebased.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/framebased.c?rev=… ============================================================================== --- trunk/reactos/lib/pseh/framebased.c (original) +++ trunk/reactos/lib/pseh/framebased.c Wed Aug 8 00:11:21 2007 @@ -20,6 +20,7 @@ DEALINGS IN THE SOFTWARE. */ +#define _NTSYSTEM_ #define STRICT #define WIN32_LEAN_AND_MEAN #include <windows.h> @@ -281,7 +282,7 @@ extern _SEHRegistration_t * __cdecl _SEHCurrentRegistration(void); /* Borland C++ uses a different decoration (i.e. none) for stdcall functions */ -extern void __stdcall RtlUnwind(void *, void *, void *, void *); +extern void __stdcall RtlUnwind(void *, void *, PEXCEPTION_RECORD, void *); void const * _SEHRtlUnwind = RtlUnwind; static void __stdcall _SEHLocalUnwind Copied: trunk/reactos/lib/pseh/i386/framebased.S (from r28215, trunk/reactos/lib/pseh/i386/framebased.asm) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/framebased.S… ============================================================================== --- trunk/reactos/lib/pseh/i386/framebased.asm (original) +++ trunk/reactos/lib/pseh/i386/framebased.S Wed Aug 8 00:11:21 2007 @@ -1,36 +1,37 @@ -; Copyright (c) 2004/2005 KJK::Hyperion +// Copyright (c) 2004/2005 KJK::Hyperion -; Permission is hereby granted, free of charge, to any person obtaining a copy -; of this software and associated documentation files (the "Software"), to deal -; in the Software without restriction, including without limitation the rights -; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -; copies of the Software, and to permit persons to whom the Software is -; furnished to dos so, subject to the following conditions: +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to dos so, subject to the following conditions: -; The above copyright notice and this permission notice shall be included in all -; copies or substantial portions of the Software. +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. -; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -; SOFTWARE. +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. -segment .text use32 +.text +.intel_syntax noprefix -global __SEHCleanHandlerEnvironment +.globl __SEHCleanHandlerEnvironment __SEHCleanHandlerEnvironment: cld ret -global __SEHCurrentRegistration +.globl __SEHCurrentRegistration __SEHCurrentRegistration: mov eax, [fs:0] ret -global __SEHRegisterFrame +.globl __SEHRegisterFrame __SEHRegisterFrame: mov ecx, [esp+4] mov eax, [fs:0] @@ -38,28 +39,28 @@ mov [fs:0], ecx ret -global __SEHUnregisterFrame +.globl __SEHUnregisterFrame __SEHUnregisterFrame: mov ecx, [fs:0] mov ecx, [ecx+0] mov [fs:0], ecx ret -global __SEHGlobalUnwind +.globl __SEHGlobalUnwind __SEHGlobalUnwind: - extern __SEHRtlUnwind +.extern __SEHRtlUnwind -; RtlUnwind clobbers all the "don't clobber" registers, so we save them +// RtlUnwind clobbers all the "don't clobber" registers, so we save them push ebx mov ebx, [esp+8] push esi push edi - push dword 0x0 ; ReturnValue - push dword 0x0 ; ExceptionRecord - push dword .RestoreRegisters ; TargetIp - push ebx ; TargetFrame + push 0 // ReturnValue + push 0 // ExceptionRecord + push .RestoreRegisters // TargetIp + push ebx // TargetFrame call [__SEHRtlUnwind] .RestoreRegisters: @@ -69,4 +70,4 @@ ret -; EOF +// EOF Removed: trunk/reactos/lib/pseh/i386/framebased.asm URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/framebased.a… ============================================================================== --- trunk/reactos/lib/pseh/i386/framebased.asm (original) +++ trunk/reactos/lib/pseh/i386/framebased.asm (removed) @@ -1,72 +1,0 @@ -; Copyright (c) 2004/2005 KJK::Hyperion - -; Permission is hereby granted, free of charge, to any person obtaining a copy -; of this software and associated documentation files (the "Software"), to deal -; in the Software without restriction, including without limitation the rights -; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -; copies of the Software, and to permit persons to whom the Software is -; furnished to dos so, subject to the following conditions: - -; The above copyright notice and this permission notice shall be included in all -; copies or substantial portions of the Software. - -; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -; SOFTWARE. - -segment .text use32 - -global __SEHCleanHandlerEnvironment -__SEHCleanHandlerEnvironment: - cld - ret - -global __SEHCurrentRegistration -__SEHCurrentRegistration: - mov eax, [fs:0] - ret - -global __SEHRegisterFrame -__SEHRegisterFrame: - mov ecx, [esp+4] - mov eax, [fs:0] - mov [ecx+0], eax - mov [fs:0], ecx - ret - -global __SEHUnregisterFrame -__SEHUnregisterFrame: - mov ecx, [fs:0] - mov ecx, [ecx+0] - mov [fs:0], ecx - ret - -global __SEHGlobalUnwind -__SEHGlobalUnwind: - - extern __SEHRtlUnwind - -; RtlUnwind clobbers all the "don't clobber" registers, so we save them - push ebx - mov ebx, [esp+8] - push esi - push edi - - push dword 0x0 ; ReturnValue - push dword 0x0 ; ExceptionRecord - push dword .RestoreRegisters ; TargetIp - push ebx ; TargetFrame - call [__SEHRtlUnwind] - -.RestoreRegisters: - pop edi - pop esi - pop ebx - - ret - -; EOF Modified: trunk/reactos/lib/pseh/pseh.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/pseh.rbuild?rev=2… ============================================================================== --- trunk/reactos/lib/pseh/pseh.rbuild (original) +++ trunk/reactos/lib/pseh/pseh.rbuild Wed Aug 8 00:11:21 2007 @@ -2,7 +2,7 @@ <define name="__USE_W32API" /> <if property="ARCH" value="i386"> <directory name="i386"> - <file>framebased.asm</file> + <file>framebased.S</file> </directory> </if> <file>framebased.c</file>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs