Ros-diffs

ros-diffs@reactos.org

81390 discussions

[turner] 20266: merge 20263 from GL's request.
by turner＠svn.reactos.com 19 Dec '05

19 Dec '05

merge 20263 from GL's request. Modified: branches/ros-branch-0_2_9/reactos/lib/msi/format.c _____ Modified: branches/ros-branch-0_2_9/reactos/lib/msi/format.c --- branches/ros-branch-0_2_9/reactos/lib/msi/format.c 2005-12-19 00:11:04 UTC (rev 20265) +++ branches/ros-branch-0_2_9/reactos/lib/msi/format.c 2005-12-19 01:50:51 UTC (rev 20266) @@ -151,7 +151,7 @@ { sz++; value = msi_alloc(sz * sizeof(WCHAR)); - GetEnvironmentVariableW(&key[1],value,sz); + GetEnvironmentVariableW(key,value,sz); *chunk = (strlenW(value)) * sizeof(WCHAR); } else

1 0

[greatlrd] 20265: commit franch translation from bugzila http://www.reactos.org/bugzilla/show_bug.cgi?id=1150
by greatlrd＠svn.reactos.com 19 Dec '05

19 Dec '05

commit franch translation from bugzila http://www.reactos.org/bugzilla/show_bug.cgi?id=1150 Added: trunk/reactos/subsys/system/welcome/Fr.rc Modified: trunk/reactos/subsys/system/welcome/welcome.rc _____ Added: trunk/reactos/subsys/system/welcome/Fr.rc --- trunk/reactos/subsys/system/welcome/Fr.rc 2005-12-18 23:21:58 UTC (rev 20264) +++ trunk/reactos/subsys/system/welcome/Fr.rc 2005-12-19 00:11:04 UTC (rev 20265) @@ -0,0 +1,81 @@ +/* + * FRENCH(FR) resources + * + * Copyright (C) 2005 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + + +LANGUAGE LANG_FRENCH, SUBLANG_FRENCH + +/* String Tables */ + +/* Default settings */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "ReactOS - Bienvenue" + IDS_DEFAULTTOPICTITLE "ReactOS" + IDS_DEFAULTTOPICDESC "Bienvenue sur le systÞme d'exploitation ReactOS.\n\nCliquez sur une section Ó gauche." +// IDS_CHECKTEXT "Afficher cette bo¯te de dialogue de nouveau." +// IDS_CLOSETEXT "Quitter" +END + +/* Topic buttons */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICBUTTON0 "Installer ReactOS" + IDS_TOPICBUTTON1 "Naviguer dans ce CD" + IDS_TOPICBUTTON2 "Quitter" +// IDS_TOPICBUTTON3 "Empty Topic 3" +// IDS_TOPICBUTTON4 "Empty Topic 4" +// IDS_TOPICBUTTON5 "Empty Topic 5" +// IDS_TOPICBUTTON6 "Empty Topic 6" +// IDS_TOPICBUTTON7 "Empty Topic 7" +// IDS_TOPICBUTTON8 "Empty Topic 8" +// IDS_TOPICBUTTON9 "Empty Topic 9" +END + +/* Topic titles */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICTITLE0 "Installer ReactOS" + IDS_TOPICTITLE1 "Naviguer dans ce CD" + IDS_TOPICTITLE2 "Quitter" +// IDS_TOPICTITLE3 "Empty Topic Title 3" +// IDS_TOPICTITLE4 "Empty Topic Title 4" +// IDS_TOPICTITLE5 "Empty Topic Title 5" +// IDS_TOPICTITLE6 "Empty Topic Title 6" +// IDS_TOPICTITLE7 "Empty Topic Title 7" +// IDS_TOPICTITLE8 "Empty Topic Title 8" +// IDS_TOPICTITLE9 "Empty Topic Title 9" +END + +/* Topic descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICDESC0 "CrÚe une nouvelle installation de ReactOS sur votre ordinateur ou met Ó jour votre installation actuelle." + IDS_TOPICDESC1 "Explore le CD." + IDS_TOPICDESC2 "Cliquez pour quitter l'installation." +// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." +// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." +// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." +// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." +// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." +// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." +// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." +END + +/* EOF */ _____ Modified: trunk/reactos/subsys/system/welcome/welcome.rc --- trunk/reactos/subsys/system/welcome/welcome.rc 2005-12-18 23:21:58 UTC (rev 20264) +++ trunk/reactos/subsys/system/welcome/welcome.rc 2005-12-19 00:11:04 UTC (rev 20265) @@ -47,14 +47,16 @@ /* Language-specific resources */ -#include "En.rc" +#include "Bg.rc" #include "Cz.rc" #include "De.rc" -#include "Bg.rc" #include "Dk.rc" +#include "En.rc" #include "Es.rc" +#include "Fr.rc" +#include "Hu.rc" #include "Ja.rc" #include "Sv.rc" -#include "Hu.rc" + /* EOF */

1 0

[gvg] 20264: Detach GUI process from console
by gvg＠svn.reactos.com 18 Dec '05

18 Dec '05

Detach GUI process from console Modified: trunk/reactos/lib/kernel32/process/create.c _____ Modified: trunk/reactos/lib/kernel32/process/create.c --- trunk/reactos/lib/kernel32/process/create.c 2005-12-18 23:13:05 UTC (rev 20263) +++ trunk/reactos/lib/kernel32/process/create.c 2005-12-18 23:21:58 UTC (rev 20264) @@ -1107,6 +1107,13 @@ SetLastError(ERROR_BAD_EXE_FORMAT); goto Cleanup; } + + if (IMAGE_SUBSYSTEM_WINDOWS_GUI == SectionImageInfo.SubsystemType) + { + /* Do not create a console for GUI applications */ + dwCreationFlags &= ~CREATE_NEW_CONSOLE; + dwCreationFlags |= DETACHED_PROCESS; + } /* Initialize the process object attributes */ ObjectAttributes = BasepConvertObjectAttributes(&LocalObjectAttributes, @@ -1332,7 +1339,6 @@ goto Cleanup; } - /* Notify CSRSS */ Status = BasepNotifyCsrOfCreation(dwCreationFlags, (HANDLE)ProcessBasicInfo.UniqueProcessId,

1 0

[greatlrd] 20263: in function deformat_environment did cut of one letter of GetEnvironmentVariableW at beigner in second call. it try found example LLUSERSPROFILE but it mean ALLUSERSPROFILE. fixed by me and hpussin.
by greatlrd＠svn.reactos.com 18 Dec '05

18 Dec '05

in function deformat_environment did cut of one letter of GetEnvironmentVariableW at beigner in second call. it try found example LLUSERSPROFILE but it mean ALLUSERSPROFILE. fixed by me and hpussin. Modified: trunk/reactos/lib/msi/format.c _____ Modified: trunk/reactos/lib/msi/format.c --- trunk/reactos/lib/msi/format.c 2005-12-18 23:02:36 UTC (rev 20262) +++ trunk/reactos/lib/msi/format.c 2005-12-18 23:13:05 UTC (rev 20263) @@ -151,7 +151,7 @@ { sz++; value = msi_alloc(sz * sizeof(WCHAR)); - GetEnvironmentVariableW(&key[1],value,sz); + GetEnvironmentVariableW(key,value,sz); *chunk = (strlenW(value)) * sizeof(WCHAR); } else

1 0

[hpoussin] 20262: Merge 20261 and part of 20256 from trunk:
by hpoussin＠svn.reactos.com 18 Dec '05

18 Dec '05

Merge 20261 and part of 20256 from trunk: - Fix little bug which prevented IRP_MJ_PNP to be forwarded to lower driver - Fix serial mouse type detection - Shut up some debug message Modified: branches/ros-branch-0_2_9/reactos/drivers/bus/serenum/serenum.c Modified: branches/ros-branch-0_2_9/reactos/drivers/input/mouclass/mouclass.c Modified: branches/ros-branch-0_2_9/reactos/drivers/input/sermouse/detect.c Modified: branches/ros-branch-0_2_9/reactos/drivers/input/sermouse/fdo.c Modified: branches/ros-branch-0_2_9/reactos/drivers/input/sermouse/readmouse.c Modified: branches/ros-branch-0_2_9/reactos/drivers/input/sermouse/sermouse.c _____ Modified: branches/ros-branch-0_2_9/reactos/drivers/bus/serenum/serenum.c --- branches/ros-branch-0_2_9/reactos/drivers/bus/serenum/serenum.c 2005-12-18 23:00:00 UTC (rev 20261) +++ branches/ros-branch-0_2_9/reactos/drivers/bus/serenum/serenum.c 2005-12-18 23:02:36 UTC (rev 20262) @@ -100,7 +100,7 @@ DriverObject->DriverUnload = DriverUnload; DriverObject->DriverExtension->AddDevice = SerenumAddDevice; - for (i = 0; i < IRP_MJ_MAXIMUM_FUNCTION; i++) + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) DriverObject->MajorFunction[i] = IrpStub; //DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = SerialQueryInformation; _____ Modified: branches/ros-branch-0_2_9/reactos/drivers/input/mouclass/mouclass.c --- branches/ros-branch-0_2_9/reactos/drivers/input/mouclass/mouclass.c 2005-12-18 23:00:00 UTC (rev 20261) +++ branches/ros-branch-0_2_9/reactos/drivers/input/mouclass/mouclass.c 2005-12-18 23:02:36 UTC (rev 20262) @@ -136,6 +136,7 @@ /* Forward some IRPs to lower device */ switch (IoGetCurrentIrpStackLocation(Irp)->MajorFunction) { + case IRP_MJ_PNP: case IRP_MJ_INTERNAL_DEVICE_CONTROL: return ForwardIrpAndForget(DeviceObject, Irp); default: @@ -788,7 +789,7 @@ DriverObject->DriverExtension->AddDevice = ClassAddDevice; DriverObject->DriverUnload = DriverUnload; - for (i = 0; i < IRP_MJ_MAXIMUM_FUNCTION; i++) + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) DriverObject->MajorFunction[i] = IrpStub; DriverObject->MajorFunction[IRP_MJ_CREATE] = ClassCreate; _____ Modified: branches/ros-branch-0_2_9/reactos/drivers/input/sermouse/detect.c --- branches/ros-branch-0_2_9/reactos/drivers/input/sermouse/detect.c 2005-12-18 23:00:00 UTC (rev 20261) +++ branches/ros-branch-0_2_9/reactos/drivers/input/sermouse/detect.c 2005-12-18 23:02:36 UTC (rev 20262) @@ -186,7 +186,7 @@ &Fcr, sizeof(Fcr), NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; /* Set serial port speed */ - BaudRate = SERIAL_BAUD_1200; + BaudRate = 1200; Status = SermouseDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_BAUD_RATE, &BaudRate, sizeof(BaudRate), NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; _____ Modified: branches/ros-branch-0_2_9/reactos/drivers/input/sermouse/fdo.c --- branches/ros-branch-0_2_9/reactos/drivers/input/sermouse/fdo.c 2005-12-18 23:00:00 UTC (rev 20261) +++ branches/ros-branch-0_2_9/reactos/drivers/input/sermouse/fdo.c 2005-12-18 23:02:36 UTC (rev 20262) @@ -115,8 +115,6 @@ Fdo->Flags |= DO_BUFFERED_IO; Fdo->Flags &= ~DO_DEVICE_INITIALIZING; - /* FIXME: create registry entry in HKEY_LOCAL_MACHINE\HARDWARE\DEVICEMAP */ - ExFreePool(DeviceNameU.Buffer); return STATUS_SUCCESS; @@ -124,6 +122,8 @@ cleanupFDO: if (DeviceExtension) { + if (DeviceExtension->LowerDevice) + IoDetachDevice(DeviceExtension->LowerDevice); ExFreePool(DeviceExtension->MouseInputData[0]); ExFreePool(DeviceExtension->MouseInputData[1]); } @@ -177,7 +177,7 @@ /* Override the number of buttons */ DeviceExtension->AttributesInformation.NumberOfButtons = DeviceExtension->DriverExtension->NumberOfButtons; - DeviceExtension->AttributesInformation.SampleRate = 1200 / 8; + DeviceExtension->AttributesInformation.SampleRate = DeviceExtension->DriverExtension->SampleRate / 8; DeviceExtension->AttributesInformation.InputDataQueueLength = DeviceExtension->DriverExtension->MouseDataQueueSize; DeviceExtension->MouseType = MouseType; DeviceExtension->PnpState = dsStarted; _____ Modified: branches/ros-branch-0_2_9/reactos/drivers/input/sermouse/readmouse.c --- branches/ros-branch-0_2_9/reactos/drivers/input/sermouse/readmouse.c 2005-12-18 23:00:00 UTC (rev 20261) +++ branches/ros-branch-0_2_9/reactos/drivers/input/sermouse/readmouse.c 2005-12-18 23:02:36 UTC (rev 20262) @@ -172,7 +172,7 @@ for (i = 0; i < ioStatus.Information; i++) { ReceivedByte = Buffer[i]; - DPRINT1("ReceivedByte 0x%02x\n", ReceivedByte); + DPRINT("ReceivedByte 0x%02x\n", ReceivedByte); /* Synchronize */ if ((ReceivedByte & 0x40) == 0x40) _____ Modified: branches/ros-branch-0_2_9/reactos/drivers/input/sermouse/sermouse.c --- branches/ros-branch-0_2_9/reactos/drivers/input/sermouse/sermouse.c 2005-12-18 23:00:00 UTC (rev 20261) +++ branches/ros-branch-0_2_9/reactos/drivers/input/sermouse/sermouse.c 2005-12-18 23:02:36 UTC (rev 20262) @@ -150,7 +150,7 @@ DriverObject->DriverUnload = DriverUnload; DriverObject->DriverExtension->AddDevice = SermouseAddDevice; - for (i = 0; i < IRP_MJ_MAXIMUM_FUNCTION; i++) + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) DriverObject->MajorFunction[i] = IrpStub; DriverObject->MajorFunction[IRP_MJ_CREATE] = SermouseCreate;

1 0

[hpoussin] 20261: Fix serial mouse type detection
by hpoussin＠svn.reactos.com 18 Dec '05

18 Dec '05

Fix serial mouse type detection Shut up some debug message Modified: trunk/reactos/drivers/input/sermouse/detect.c Modified: trunk/reactos/drivers/input/sermouse/fdo.c Modified: trunk/reactos/drivers/input/sermouse/readmouse.c _____ Modified: trunk/reactos/drivers/input/sermouse/detect.c --- trunk/reactos/drivers/input/sermouse/detect.c 2005-12-18 22:51:10 UTC (rev 20260) +++ trunk/reactos/drivers/input/sermouse/detect.c 2005-12-18 23:00:00 UTC (rev 20261) @@ -186,7 +186,7 @@ &Fcr, sizeof(Fcr), NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; /* Set serial port speed */ - BaudRate = SERIAL_BAUD_1200; + BaudRate = 1200; Status = SermouseDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_BAUD_RATE, &BaudRate, sizeof(BaudRate), NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; _____ Modified: trunk/reactos/drivers/input/sermouse/fdo.c --- trunk/reactos/drivers/input/sermouse/fdo.c 2005-12-18 22:51:10 UTC (rev 20260) +++ trunk/reactos/drivers/input/sermouse/fdo.c 2005-12-18 23:00:00 UTC (rev 20261) @@ -115,8 +115,6 @@ Fdo->Flags |= DO_BUFFERED_IO; Fdo->Flags &= ~DO_DEVICE_INITIALIZING; - /* FIXME: create registry entry in HKEY_LOCAL_MACHINE\HARDWARE\DEVICEMAP */ - ExFreePool(DeviceNameU.Buffer); return STATUS_SUCCESS; @@ -124,6 +122,8 @@ cleanupFDO: if (DeviceExtension) { + if (DeviceExtension->LowerDevice) + IoDetachDevice(DeviceExtension->LowerDevice); ExFreePool(DeviceExtension->MouseInputData[0]); ExFreePool(DeviceExtension->MouseInputData[1]); } @@ -177,7 +177,7 @@ /* Override the number of buttons */ DeviceExtension->AttributesInformation.NumberOfButtons = DeviceExtension->DriverExtension->NumberOfButtons; - DeviceExtension->AttributesInformation.SampleRate = 1200 / 8; + DeviceExtension->AttributesInformation.SampleRate = DeviceExtension->DriverExtension->SampleRate / 8; DeviceExtension->AttributesInformation.InputDataQueueLength = DeviceExtension->DriverExtension->MouseDataQueueSize; DeviceExtension->MouseType = MouseType; DeviceExtension->PnpState = dsStarted; _____ Modified: trunk/reactos/drivers/input/sermouse/readmouse.c --- trunk/reactos/drivers/input/sermouse/readmouse.c 2005-12-18 22:51:10 UTC (rev 20260) +++ trunk/reactos/drivers/input/sermouse/readmouse.c 2005-12-18 23:00:00 UTC (rev 20261) @@ -172,7 +172,7 @@ for (i = 0; i < ioStatus.Information; i++) { ReceivedByte = Buffer[i]; - DPRINT1("ReceivedByte 0x%02x\n", ReceivedByte); + DPRINT("ReceivedByte 0x%02x\n", ReceivedByte); /* Synchronize */ if ((ReceivedByte & 0x40) == 0x40)

1 0

[turner] 20260: change version to RC2
by turner＠svn.reactos.com 18 Dec '05

18 Dec '05

change version to RC2 Modified: branches/ros-branch-0_2_9/reactos/include/reactos/version.h _____ Modified: branches/ros-branch-0_2_9/reactos/include/reactos/version.h --- branches/ros-branch-0_2_9/reactos/include/reactos/version.h 2005-12-18 21:38:05 UTC (rev 20259) +++ branches/ros-branch-0_2_9/reactos/include/reactos/version.h 2005-12-18 22:51:10 UTC (rev 20260) @@ -22,7 +22,7 @@ #define KERNEL_VERSION_PATCH_LEVEL 9 /* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"RELEASE" */ -#define KERNEL_VERSION_BUILD_TYPE L"RC1" +#define KERNEL_VERSION_BUILD_TYPE L"RC2" #endif

1 0

[ekohl] 20259: - Move SetServiceObjectSecurity to the right file.
by ekohl＠svn.reactos.com 18 Dec '05

18 Dec '05

- Move SetServiceObjectSecurity to the right file. - Pass arguments to ANSI services. Modified: trunk/reactos/lib/advapi32/service/scm.c Modified: trunk/reactos/lib/advapi32/service/sctrl.c _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-12-18 21:01:56 UTC (rev 20258) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-12-18 21:38:05 UTC (rev 20259) @@ -1223,6 +1223,21 @@ /********************************************************************** + * SetServiceObjectSecurity + * + * @unimplemented + */ +BOOL STDCALL +SetServiceObjectSecurity(SC_HANDLE hService, + SECURITY_INFORMATION dwSecurityInformation, + PSECURITY_DESCRIPTOR lpSecurityDescriptor) +{ + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/********************************************************************** * StartServiceA * * @unimplemented _____ Modified: trunk/reactos/lib/advapi32/service/sctrl.c --- trunk/reactos/lib/advapi32/service/sctrl.c 2005-12-18 21:01:56 UTC (rev 20258) +++ trunk/reactos/lib/advapi32/service/sctrl.c 2005-12-18 21:38:05 UTC (rev 20259) @@ -134,7 +134,54 @@ } else { - (lpService->Main.lpFuncA)(0, NULL); + LPSTR *lpArgVector; + LPSTR Ptr; + LPSTR AnsiString; + DWORD AnsiLength; + + AnsiLength = WideCharToMultiByte(CP_ACP, + 0, + lpService->Arguments, + dwLength, + NULL, + 0, + NULL, + NULL); + AnsiString = HeapAlloc(GetProcessHeap(), + 0, + AnsiLength); + WideCharToMultiByte(CP_ACP, + 0, + lpService->Arguments, + dwLength, + AnsiString, + AnsiLength, + NULL, + NULL); + + lpArgVector = HeapAlloc(GetProcessHeap(), + 0, + (dwArgCount + 1) * sizeof(LPSTR)); + + dwArgCount = 0; + Ptr = AnsiString; + while (*Ptr) + { + lpArgVector[dwArgCount] = Ptr; + + dwArgCount++; + Ptr += (strlen(Ptr) + 1); + } + lpArgVector[dwArgCount] = NULL; + + (lpService->Main.lpFuncA)(dwArgCount, lpArgVector); + + HeapFree(GetProcessHeap(), + 0, + lpArgVector); + HeapFree(GetProcessHeap(), + 0, + AnsiString); } return ERROR_SUCCESS; @@ -255,7 +302,7 @@ NULL); if (bResult == FALSE) { - DPRINT1("Pipe read failed\n"); + DPRINT1("Pipe read failed (Error: %lu)\n", GetLastError()); return FALSE; } @@ -408,21 +455,6 @@ /********************************************************************** - * SetServiceObjectSecurity - * - * @unimplemented - */ -BOOL STDCALL -SetServiceObjectSecurity(SC_HANDLE hService, - SECURITY_INFORMATION dwSecurityInformation, - PSECURITY_DESCRIPTOR lpSecurityDescriptor) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - - -/********************************************************************** * SetServiceStatus * * @implemented

1 0

[gvg] 20258: Merge from trunk:
by gvg＠svn.reactos.com 18 Dec '05

18 Dec '05

Merge from trunk: Fix C++ exception handling Modified: branches/ros-branch-0_2_9/reactos/lib/crt/wine/cppexcept.c _____ Modified: branches/ros-branch-0_2_9/reactos/lib/crt/wine/cppexcept.c --- branches/ros-branch-0_2_9/reactos/lib/crt/wine/cppexcept.c 2005-12-18 20:58:32 UTC (rev 20257) +++ branches/ros-branch-0_2_9/reactos/lib/crt/wine/cppexcept.c 2005-12-18 21:01:56 UTC (rev 20258) @@ -42,12 +42,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); #ifdef __i386__ /* CxxFrameHandler is not supported on non-i386 */ -#define CONTEXT86 CONTEXT //Mingw Hack static DWORD cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame, PCONTEXT exc_context, EXCEPTION_REGISTRATION_RECORD** dispatch, cxx_function_descr *descr, EXCEPTION_REGISTRATION_RECORD* nested_frame, - int nested_trylevel, CONTEXT86 *context ); + int nested_trylevel ); /* call a function with a given ebp */ __inline static void *call_ebp_func( void *func, void *ebp ) @@ -255,7 +254,7 @@ TRACE( "got nested exception in catch function\n" ); return cxx_frame_handler( rec, nested_frame->cxx_frame, context, NULL, nested_frame->descr, &nested_frame->frame, - nested_frame->trylevel, context ); + nested_frame->trylevel ); } } @@ -332,10 +331,11 @@ static DWORD cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame, PCONTEXT exc_context, EXCEPTION_REGISTRATION_RECORD** dispatch, cxx_function_descr *descr, EXCEPTION_REGISTRATION_RECORD* nested_frame, - int nested_trylevel, CONTEXT86 *context ) + int nested_trylevel ) { cxx_exception_type *exc_type; void *next_ip; + PEXCEPTION_RECORD orig_rec = rec; if (descr->magic != CXX_FRAME_MAGIC) { @@ -375,10 +375,10 @@ next_ip = call_catch_block( rec, frame, descr, frame->trylevel, exc_type ); if (!next_ip) return ExceptionContinueSearch; - rec->ExceptionFlags &= ~EH_NONCONTINUABLE; - context->Eip = (DWORD)next_ip; - context->Ebp = (DWORD)&frame->ebp; - context->Esp = ((DWORD*)frame)[-1]; + orig_rec->ExceptionFlags &= ~EH_NONCONTINUABLE; + exc_context->Eip = (DWORD)next_ip; + exc_context->Ebp = (DWORD)&frame->ebp; + exc_context->Esp = ((DWORD*)frame)[-1]; return ExceptionContinueExecution; } @@ -386,16 +386,15 @@ /********************************************************************* * __CxxFrameHandler (MSVCRT.@) */ -void __CxxFrameHandler( PEXCEPTION_RECORD rec, EXCEPTION_REGISTRATION_RECORD* frame, - PCONTEXT exc_context, EXCEPTION_REGISTRATION_RECORD** dispatch, - CONTEXT86 *context ) +DWORD __CxxFrameHandler( PEXCEPTION_RECORD rec, EXCEPTION_REGISTRATION_RECORD* frame, + PCONTEXT exc_context, EXCEPTION_REGISTRATION_RECORD** dispatch ) { - cxx_function_descr *descr = (cxx_function_descr *)context->Eax; - context->Eax = cxx_frame_handler( rec, (cxx_exception_frame *)frame, - exc_context, dispatch, descr, NULL, 0, context ); + cxx_function_descr *descr; + + __asm__ __volatile__("mov %%eax, %0\n" : "=m"(descr)); + return cxx_frame_handler(rec, (cxx_exception_frame *)frame, + exc_context, dispatch, descr, NULL, 0 ); } -//DEFINE_REGS_ENTRYPOINT( __CxxFrameHandler, MSVCRT__CxxFrameHandler, 16, 0 ); -// ROS #endif /* __i386__ */ /*********************************************************************

1 0

[gvg] 20257: Fix C++ exception handling
by gvg＠svn.reactos.com 18 Dec '05

18 Dec '05

Fix C++ exception handling Modified: trunk/reactos/lib/crt/wine/cppexcept.c _____ Modified: trunk/reactos/lib/crt/wine/cppexcept.c --- trunk/reactos/lib/crt/wine/cppexcept.c 2005-12-18 20:50:26 UTC (rev 20256) +++ trunk/reactos/lib/crt/wine/cppexcept.c 2005-12-18 20:58:32 UTC (rev 20257) @@ -42,12 +42,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); #ifdef __i386__ /* CxxFrameHandler is not supported on non-i386 */ -#define CONTEXT86 CONTEXT //Mingw Hack static DWORD cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame, PCONTEXT exc_context, EXCEPTION_REGISTRATION_RECORD** dispatch, cxx_function_descr *descr, EXCEPTION_REGISTRATION_RECORD* nested_frame, - int nested_trylevel, CONTEXT86 *context ); + int nested_trylevel ); /* call a function with a given ebp */ __inline static void *call_ebp_func( void *func, void *ebp ) @@ -255,7 +254,7 @@ TRACE( "got nested exception in catch function\n" ); return cxx_frame_handler( rec, nested_frame->cxx_frame, context, NULL, nested_frame->descr, &nested_frame->frame, - nested_frame->trylevel, context ); + nested_frame->trylevel ); } } @@ -332,10 +331,11 @@ static DWORD cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame, PCONTEXT exc_context, EXCEPTION_REGISTRATION_RECORD** dispatch, cxx_function_descr *descr, EXCEPTION_REGISTRATION_RECORD* nested_frame, - int nested_trylevel, CONTEXT86 *context ) + int nested_trylevel ) { cxx_exception_type *exc_type; void *next_ip; + PEXCEPTION_RECORD orig_rec = rec; if (descr->magic != CXX_FRAME_MAGIC) { @@ -375,10 +375,10 @@ next_ip = call_catch_block( rec, frame, descr, frame->trylevel, exc_type ); if (!next_ip) return ExceptionContinueSearch; - rec->ExceptionFlags &= ~EH_NONCONTINUABLE; - context->Eip = (DWORD)next_ip; - context->Ebp = (DWORD)&frame->ebp; - context->Esp = ((DWORD*)frame)[-1]; + orig_rec->ExceptionFlags &= ~EH_NONCONTINUABLE; + exc_context->Eip = (DWORD)next_ip; + exc_context->Ebp = (DWORD)&frame->ebp; + exc_context->Esp = ((DWORD*)frame)[-1]; return ExceptionContinueExecution; } @@ -386,16 +386,15 @@ /********************************************************************* * __CxxFrameHandler (MSVCRT.@) */ -void __CxxFrameHandler( PEXCEPTION_RECORD rec, EXCEPTION_REGISTRATION_RECORD* frame, - PCONTEXT exc_context, EXCEPTION_REGISTRATION_RECORD** dispatch, - CONTEXT86 *context ) +DWORD __CxxFrameHandler( PEXCEPTION_RECORD rec, EXCEPTION_REGISTRATION_RECORD* frame, + PCONTEXT exc_context, EXCEPTION_REGISTRATION_RECORD** dispatch ) { - cxx_function_descr *descr = (cxx_function_descr *)context->Eax; - context->Eax = cxx_frame_handler( rec, (cxx_exception_frame *)frame, - exc_context, dispatch, descr, NULL, 0, context ); + cxx_function_descr *descr; + + __asm__ __volatile__("mov %%eax, %0\n" : "=m"(descr)); + return cxx_frame_handler(rec, (cxx_exception_frame *)frame, + exc_context, dispatch, descr, NULL, 0 ); } -//DEFINE_REGS_ENTRYPOINT( __CxxFrameHandler, MSVCRT__CxxFrameHandler, 16, 0 ); -// ROS #endif /* __i386__ */ /*********************************************************************

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