Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 37609: - Get rid of warnings.
by fireball＠svn.reactos.org 24 Nov '08

24 Nov '08

Author: fireball Date: Mon Nov 24 06:14:48 2008 New Revision: 37609 URL: http://svn.reactos.org/svn/reactos?rev=37609&view=rev Log: - Get rid of warnings. Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c trunk/reactos/drivers/storage/class/cdrom/cdrom.rbuild Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] Mon Nov 24 06:14:48 2008 @@ -2972,7 +2972,7 @@ } - if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (ULONG)realIrpNextStack->Parameters.Others.Argument1-1)) { + if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (PVOID)((ULONG)realIrpNextStack->Parameters.Others.Argument1-1))) { if (((ULONG)realIrpNextStack->Parameters.Others.Argument1)) { @@ -3497,7 +3497,7 @@ retry = TRUE; } - if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (ULONG)realIrpNextStack->Parameters.Others.Argument1-1)) { + if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (PVOID)((ULONG)realIrpNextStack->Parameters.Others.Argument1-1))) { if (((ULONG)realIrpNextStack->Parameters.Others.Argument1)) { @@ -3823,7 +3823,7 @@ retry = TRUE; } - if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (ULONG)realIrpNextStack->Parameters.Others.Argument1-1)) { + if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (PVOID)((ULONG)realIrpNextStack->Parameters.Others.Argument1-1))) { if (((ULONG)realIrpNextStack->Parameters.Others.Argument1)) { @@ -4199,7 +4199,7 @@ retry = TRUE; } - if (retry && (irpNextStack->Parameters.Others.Argument1 = (ULONG)irpNextStack->Parameters.Others.Argument1-1)) { + if (retry && (irpNextStack->Parameters.Others.Argument1 = (PVOID)((ULONG)irpNextStack->Parameters.Others.Argument1-1))) { if (((ULONG)irpNextStack->Parameters.Others.Argument1)) { Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom/cdrom.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom/cdrom.rbuild [iso-8859-1] Mon Nov 24 06:14:48 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="cdrom" type="kernelmodedriver" installbase="system32/drivers" installname="cdrom.sys" allowwarnings="true"> +<module name="cdrom" type="kernelmodedriver" installbase="system32/drivers" installname="cdrom.sys"> <bootstrap installbase="$(CDOUTPUT)" /> <library>ntoskrnl</library> <library>hal</library>

1 0

[fireball] 37608: - Make atapi compile warnings-free.
by fireball＠svn.reactos.org 24 Nov '08

24 Nov '08

Author: fireball Date: Mon Nov 24 04:04:05 2008 New Revision: 37608 URL: http://svn.reactos.org/svn/reactos?rev=37608&view=rev Log: - Make atapi compile warnings-free. Modified: trunk/reactos/drivers/storage/ide/atapi/atapi.c trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild Modified: trunk/reactos/drivers/storage/ide/atapi/atapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/atapi/… ============================================================================== --- trunk/reactos/drivers/storage/ide/atapi/atapi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/atapi/atapi.c [iso-8859-1] Mon Nov 24 04:04:05 2008 @@ -198,7 +198,7 @@ VOID STDCALL AtapiZeroMemory( - IN PCHAR Buffer, + IN PUCHAR Buffer, IN ULONG Count ); @@ -927,10 +927,10 @@ { PHW_DEVICE_EXTENSION deviceExtension = HwDeviceExtension; PIDE_REGISTERS_1 baseIoAddress1 = deviceExtension->BaseIoAddress1[Srb->TargetId >> 1]; - PIDE_REGISTERS_2 baseIoAddress2 = deviceExtension->BaseIoAddress2[Srb->TargetId >> 1]; + //PIDE_REGISTERS_2 baseIoAddress2 = deviceExtension->BaseIoAddress2[Srb->TargetId >> 1]; ULONG i; UCHAR errorByte; - UCHAR srbStatus; + UCHAR srbStatus = SRB_STATUS_ERROR; UCHAR scsiStatus; // @@ -1400,7 +1400,7 @@ vendorId[j+1] = ((PUCHAR)deviceExtension->IdentifyData[i].ModelNumber)[j]; } - if (!AtapiStringCmp (vendorId, "CD-ROM CDR", 11)) { + if (!AtapiStringCmp ((PCHAR)vendorId, "CD-ROM CDR", 11)) { // // Inquiry string for older model had a '-', newer is '_' @@ -1435,7 +1435,7 @@ // is clear and then just wait for an arbitrary amount of time! // if (deviceExtension->DeviceFlags[i] & DFLAGS_ATAPI_DEVICE) { - PIDE_REGISTERS_1 baseIoAddress1 = deviceExtension->BaseIoAddress1[i >> 1]; + //PIDE_REGISTERS_1 baseIoAddress1 = deviceExtension->BaseIoAddress1[i >> 1]; PIDE_REGISTERS_2 baseIoAddress2 = deviceExtension->BaseIoAddress2[i >> 1]; ULONG waitCount; @@ -2138,8 +2138,8 @@ { PHW_DEVICE_EXTENSION deviceExtension = HwDeviceExtension; PULONG adapterCount = (PULONG)Context; - PUCHAR ioSpace; - ULONG i,j; + PUCHAR ioSpace = NULL; + ULONG i; ULONG irq; ULONG portBase; ULONG retryCount; @@ -2600,12 +2600,9 @@ --*/ { - PHW_DEVICE_EXTENSION deviceExtension = DeviceExtension; - ULONG rangeNumber = 0; ULONG pciBuffer; ULONG slotNumber; ULONG functionNumber; - ULONG status; PCI_SLOT_NUMBER slotData; PPCI_COMMON_CONFIG pciData; UCHAR vendorString[5]; @@ -2668,8 +2665,8 @@ vendorStrPtr = vendorString; deviceStrPtr = deviceString; - AtapiHexToString(pciData->VendorID, &vendorStrPtr); - AtapiHexToString(pciData->DeviceID, &deviceStrPtr); + AtapiHexToString(pciData->VendorID, (PCHAR*)&vendorStrPtr); + AtapiHexToString(pciData->DeviceID, (PCHAR*)&deviceStrPtr); DebugPrint((2, "FindBrokenController: Bus %x Slot %x Function %x Vendor %s Product %s\n", @@ -2683,11 +2680,11 @@ // Compare strings. // - if (AtapiStringCmp(vendorString, - VendorID, + if (AtapiStringCmp((PCHAR)vendorString, + (PCHAR)VendorID, VendorIDLength) || - AtapiStringCmp(deviceString, - DeviceID, + AtapiStringCmp((PCHAR)deviceString, + (PCHAR)DeviceID, DeviceIDLength)) { // @@ -2803,17 +2800,17 @@ vendorStrPtr = vendorString; deviceStrPtr = deviceString; - AtapiHexToString(pciData.VendorID, &vendorStrPtr); - AtapiHexToString(pciData.DeviceID, &deviceStrPtr); + AtapiHexToString(pciData.VendorID, (PCHAR*)&vendorStrPtr); + AtapiHexToString(pciData.DeviceID, (PCHAR*)&deviceStrPtr); // // Compare strings. // - if (AtapiStringCmp(vendorString, + if (AtapiStringCmp((PCHAR)vendorString, NativeModeAdapters[nativeModeAdapterTableIndex].VendorId, NativeModeAdapters[nativeModeAdapterTableIndex].VendorIdLength) || - AtapiStringCmp(deviceString, + AtapiStringCmp((PCHAR)deviceString, NativeModeAdapters[nativeModeAdapterTableIndex].DeviceId, NativeModeAdapters[nativeModeAdapterTableIndex].DeviceIdLength)) { continue; @@ -3115,9 +3112,9 @@ lastSlot = FALSE; if (FindBrokenController(deviceExtension, - BrokenAdapters[i].VendorId, + (PUCHAR)BrokenAdapters[i].VendorId, BrokenAdapters[i].VendorIdLength, - BrokenAdapters[i].DeviceId, + (PUCHAR)BrokenAdapters[i].DeviceId, BrokenAdapters[i].DeviceIdLength, &functionNumber, &slotNumber, @@ -3515,7 +3512,6 @@ ULONG status; ULONG i; UCHAR statusByte,interruptReason; - BOOLEAN commandComplete = FALSE; BOOLEAN atapiDev = FALSE; if (srb) { @@ -4771,7 +4767,7 @@ { PHW_DEVICE_EXTENSION deviceExtension = HwDeviceExtension; PIDE_REGISTERS_1 baseIoAddress1 = deviceExtension->BaseIoAddress1[Srb->TargetId >> 1]; - PIDE_REGISTERS_2 baseIoAddress2 = deviceExtension->BaseIoAddress2[Srb->TargetId >> 1]; + //PIDE_REGISTERS_2 baseIoAddress2 = deviceExtension->BaseIoAddress2[Srb->TargetId >> 1]; ULONG startingSector; ULONG sectors; ULONG endSector; @@ -5759,7 +5755,6 @@ { PHW_DEVICE_EXTENSION deviceExtension = HwDeviceExtension; - ULONG status; PSENSE_DATA senseBuffer = (PSENSE_DATA)Srb->DataBuffer; @@ -5968,7 +5963,7 @@ deviceExtension->CurrentSrb = Srb; - if (AtapiStringCmp( ((PSRB_IO_CONTROL)(Srb->DataBuffer))->Signature,"SCSIDISK",strlen("SCSIDISK"))) { + if (AtapiStringCmp( (PCHAR)((PSRB_IO_CONTROL)(Srb->DataBuffer))->Signature,"SCSIDISK",strlen("SCSIDISK"))) { DebugPrint((1, "AtapiStartIo: IoControl signature incorrect. Send %s, expected %s\n", @@ -6381,7 +6376,7 @@ VOID STDCALL AtapiZeroMemory( - IN PCHAR Buffer, + IN PUCHAR Buffer, IN ULONG Count ) { Modified: trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/atapi/… ============================================================================== --- trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild [iso-8859-1] Mon Nov 24 04:04:05 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="atapi" type="kernelmodedriver" installbase="system32/drivers" installname="atapi.sys" allowwarnings="true"> +<module name="atapi" type="kernelmodedriver" installbase="system32/drivers" installname="atapi.sys"> <bootstrap installbase="$(CDOUTPUT)" /> <include base="atapi">.</include> <library>ntoskrnl</library>

1 0

[greatlrd] 37607: Implement WinWatchGetClipList. Update WinWatchClose thx to WinWatchGetClipList ToDO Now only two api left to implement DCIEndAccess and DCIBeginAccess
by greatlrd＠svn.reactos.org 24 Nov '08

24 Nov '08

Author: greatlrd Date: Mon Nov 24 01:21:33 2008 New Revision: 37607 URL: http://svn.reactos.org/svn/reactos?rev=37607&view=rev Log: Implement WinWatchGetClipList. Update WinWatchClose thx to WinWatchGetClipList ToDO Now only two api left to implement DCIEndAccess and DCIBeginAccess Modified: branches/reactx/reactos/dll/win32/dciman32/dciman32.def branches/reactx/reactos/dll/win32/dciman32/dciman_main.c Modified: branches/reactx/reactos/dll/win32/dciman32/dciman32.def URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/dciman… ============================================================================== --- branches/reactx/reactos/dll/win32/dciman32/dciman32.def [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/dciman32/dciman32.def [iso-8859-1] Mon Nov 24 01:21:33 2008 @@ -17,6 +17,6 @@ GetWindowRegionData@12 WinWatchClose@4 WinWatchDidStatusChange@4 -; WinWatchGetClipList + WinWatchGetClipList@16 WinWatchNotify@12 WinWatchOpen@4 Modified: branches/reactx/reactos/dll/win32/dciman32/dciman_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/dciman… ============================================================================== --- branches/reactx/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] Mon Nov 24 01:21:33 2008 @@ -16,7 +16,9 @@ typedef struct _WINWATCH_INT { HWND hWnd; - BOOL WinWtachStatus; + BOOL WinWatchStatus; + LPRGNDATA lpRgnData; + UINT RgnDataSize; } WINWATCH_INT, *LPWINWATCH_INT; @@ -420,10 +422,17 @@ void WINAPI WinWatchClose(HWINWATCH hWW) { + LPWINWATCH_INT pWinwatch_int = (LPWINWATCH_INT)hWW; + EnterCriticalSection(&ddcs); - if (hWW != NULL) - { + if (pWinwatch_int != NULL) + { + if (pWinwatch_int->lpRgnData != NULL) + { + HeapFree(GetProcessHeap(), 0, pWinwatch_int->lpRgnData); + } + HeapFree(GetProcessHeap(), 0, hWW); } @@ -434,8 +443,83 @@ WinWatchDidStatusChange(HWINWATCH hWW) { LPWINWATCH_INT pWinwatch_int = (LPWINWATCH_INT)hWW; - return pWinwatch_int->WinWtachStatus; -} + return pWinwatch_int->WinWatchStatus; +} + +UINT WINAPI +WinWatchGetClipList(HWINWATCH hWW, + LPRECT prc, + UINT size, + LPRGNDATA prd) +{ + + LPWINWATCH_INT pWinwatch_int = (LPWINWATCH_INT) hWW; + DWORD BufferRequestSize; + DWORD NewBufferRequestSize; + + /* Check see if the WinWatch status have changes, it can only be change from DciBeginAccess and DciEndAcess */ + if (pWinwatch_int->WinWatchStatus != FALSE) + { + /* The status have change, Rest some internal value */ + pWinwatch_int->WinWatchStatus = FALSE; + pWinwatch_int->RgnDataSize = 0; + + /* Get the buffer size */ + BufferRequestSize = GetWindowRegionData(pWinwatch_int->hWnd, 0, NULL); + + /* We got a buffer size */ + if (BufferRequestSize != 0) + { + /* We need endless loop to get the buffer size, for we need waiting on gdi when it is ready, to give us that */ + while (1) + { + /* Check see if we got a buffer already for GetWindowRegionData */ + if (pWinwatch_int->lpRgnData != NULL) + { + /* Free our buffer for GetWindowRegionData */ + HeapFree(GetProcessHeap(), 0, pWinwatch_int->lpRgnData); + } + + /* Free our buffer for GetWindowRegionData */ + if ( (pWinwatch_int->lpRgnData = (LPRGNDATA) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, BufferRequestSize )) == NULL ) + { + /* Fail to alloc our buffer for GetWindowRegionData */ + break; + } + + /* Get our data from GetWindowRegionData */ + NewBufferRequestSize = GetWindowRegionData(pWinwatch_int->hWnd, BufferRequestSize, pWinwatch_int->lpRgnData); + + /* Check see if the buffer size match */ + if (NewBufferRequestSize == BufferRequestSize) + { + /* The buffer size match */ + pWinwatch_int->RgnDataSize = BufferRequestSize; + break; + } + else if (BufferRequestSize == 0) + { + /* No buffer size was given */ + break; + } + BufferRequestSize = NewBufferRequestSize; + } + } + } + + /* Setup return data */ + if (size == pWinwatch_int->RgnDataSize) + { + if (pWinwatch_int->RgnDataSize != 0) + { + memcpy(prd,pWinwatch_int->lpRgnData,pWinwatch_int->RgnDataSize); + } + } + + /* return our value */ + return pWinwatch_int->RgnDataSize; +} + /***********************************************************************************************************/

1 0

[hyperion] 37606: Fixed _SEH2_EXCEPT
by hyperion＠svn.reactos.org 24 Nov '08

24 Nov '08

Author: hyperion Date: Sun Nov 23 21:00:50 2008 New Revision: 37606 URL: http://svn.reactos.org/svn/reactos?rev=37606&view=rev Log: Fixed _SEH2_EXCEPT Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Sun Nov 23 21:00:50 2008 @@ -94,6 +94,12 @@ /* Soft memory barrier */ #define __SEH_BARRIER __asm__ __volatile__("#":::"memory") +/* GCC doesn't know that this equals zero */ +#define __SEH_ZERO ({ int zero = 0; __asm__ __volatile__("#" : "+g" (zero)); zero; }) + +#define __SEH_FALSE __builtin_expect(__SEH_ZERO, 0) +#define __SEH_TRUE __builtin_expect(!__SEH_ZERO, 1) + typedef struct __SEH2Registration { struct __SEH2Registration * SER_Prev; @@ -251,7 +257,7 @@ __SEH_USE_NESTED_FUNCTION(_SEHFinally); \ \ _SEHTryLevel.ST_FramePointer = _SEHClosureFromTrampoline((_SEHTrampoline_t *)&_SEHFinally); \ - _SEHTryLevel.ST_Filter = NULL; \ + _SEHTryLevel.ST_Filter = 0; \ _SEHTryLevel.ST_Body = _SEHFunctionFromTrampoline((_SEHTrampoline_t *)&_SEHFinally); \ \ goto _SEHDoTry; \ @@ -318,8 +324,11 @@ { \ __SEH_LEAVE_TRYLEVEL(); \ } \ -\ - goto _SEHEndExcept; \ + \ + if(__SEH_FALSE) \ + goto _SEHBeginExcept; \ + else \ + goto _SEHEndExcept; \ \ _SEHBeginExcept: __SEH_SIDE_EFFECT; \ { \

1 0

[cgutman] 37605: - Make sure we're not trying to close the file object
by cgutman＠svn.reactos.org 24 Nov '08

24 Nov '08

Author: cgutman Date: Sun Nov 23 20:59:37 2008 New Revision: 37605 URL: http://svn.reactos.org/svn/reactos?rev=37605&view=rev Log: - Make sure we're not trying to close the file object Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Sun Nov 23 20:59:37 2008 @@ -27,12 +27,17 @@ */ { KIRQL OldIrql; + PIO_STACK_LOCATION IrpSp; + PTRANSPORT_CONTEXT TransContext; TI_DbgPrint(DEBUG_IRP, ("Called.\n")); + IrpSp = IoGetCurrentIrpStackLocation(Irp); + TransContext = (PTRANSPORT_CONTEXT)IrpSp->FileObject->FsContext; + IoAcquireCancelSpinLock(&OldIrql); - if (!Irp->Cancel) { + if (!Irp->Cancel && !TransContext->CancelIrps) { (void)IoSetCancelRoutine(Irp, CancelRoutine); IoReleaseCancelSpinLock(OldIrql);

1 0

[hyperion] 37604: Missing from previous commit
by hyperion＠svn.reactos.org 24 Nov '08

24 Nov '08

Author: hyperion Date: Sun Nov 23 19:38:43 2008 New Revision: 37604 URL: http://svn.reactos.org/svn/reactos?rev=37604&view=rev Log: Missing from previous commit Modified: trunk/reactos/lib/pseh/framebased-gcchack.c Modified: trunk/reactos/lib/pseh/framebased-gcchack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/framebased-gcchac… ============================================================================== --- trunk/reactos/lib/pseh/framebased-gcchack.c [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/framebased-gcchack.c [iso-8859-1] Sun Nov 23 19:38:43 2008 @@ -29,29 +29,29 @@ #include <excpt.h> -extern _SEHRegistration_t * __cdecl _SEH2CurrentRegistration(void); +extern _SEH2Registration_t * __cdecl _SEH2CurrentRegistration(void); extern int __SEH2Except(void *, void *, void *); extern void __SEH2Finally(void *, void *); static __attribute__((always_inline)) -int _SEH2Except(_SEHFrame_t * frame, volatile _SEHTryLevel_t * trylevel, EXCEPTION_POINTERS * ep) +int _SEH2Except(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel, EXCEPTION_POINTERS * ep) { return __SEH2Except(trylevel->ST_Filter, trylevel->ST_FramePointer, ep); } static __attribute__((noinline)) -void _SEH2Finally(_SEHFrame_t * frame, volatile _SEHTryLevel_t * trylevel) +void _SEH2Finally(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel) { __SEH2Finally(trylevel->ST_Body, trylevel->ST_FramePointer); } static -void _SEH2LocalUnwind(_SEHFrame_t * frame, volatile _SEHTryLevel_t * dsttrylevel) +void _SEH2LocalUnwind(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * dsttrylevel) { - volatile _SEHTryLevel_t * trylevel; + volatile _SEH2TryLevel_t * trylevel; for(trylevel = frame->SF_TopTryLevel; trylevel && trylevel != dsttrylevel; trylevel = trylevel->ST_Next) { @@ -66,7 +66,7 @@ static __attribute__((noreturn)) -void _SEH2Handle(_SEHFrame_t * frame, volatile _SEHTryLevel_t * trylevel) +void _SEH2Handle(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel) { _SEH2GlobalUnwind(frame); _SEH2LocalUnwind(frame, trylevel); @@ -92,7 +92,7 @@ void * DispatcherContext ) { - _SEHFrame_t * frame; + _SEH2Frame_t * frame; __asm__ __volatile__("cld"); @@ -107,7 +107,7 @@ else { int ret = 0; - volatile _SEHTryLevel_t * trylevel; + volatile _SEH2TryLevel_t * trylevel; frame->SF_Code = ExceptionRecord->ExceptionCode; @@ -134,7 +134,7 @@ } extern -void __cdecl _SEH2EnterFrame(_SEHFrame_t * frame) +void __cdecl _SEH2EnterFrame(_SEH2Frame_t * frame) { frame->SF_Registration.SER_Handler = _SEH2FrameHandler; frame->SF_Code = 0; @@ -161,7 +161,7 @@ extern void __cdecl _SEH2Return(void) { - _SEH2LocalUnwind(CONTAINING_RECORD(_SEH2CurrentRegistration(), _SEHFrame_t, SF_Registration), NULL); + _SEH2LocalUnwind(CONTAINING_RECORD(_SEH2CurrentRegistration(), _SEH2Frame_t, SF_Registration), NULL); _SEH2LeaveFrame(); }

1 0

[dreimer] 37603: Updated changelog. Updated help files. In theory "update status" is meant for startup to show new updates, but not with my sloooow webspace. So, this is skipped for now.
by dreimer＠svn.reactos.org 24 Nov '08

24 Nov '08

Author: dreimer Date: Sun Nov 23 17:46:24 2008 New Revision: 37603 URL: http://svn.reactos.org/svn/reactos?rev=37603&view=rev Log: Updated changelog. Updated help files. In theory "update status" is meant for startup to show new updates, but not with my sloooow webspace. So, this is skipped for now. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] Sun Nov 23 17:46:24 2008 @@ -236,9 +236,9 @@ " Usage: update [OPTIONS]" " Updates all files of RosBE to the most recent files." "" - " nocmds - Skips the Updating of the Script Files." - " nogcc - Skips the Updating of GCC." - " notools - Skips the Updating of the Tools." + " reset - Removes the Updates Cache. Not recommended." + " nr X - Re/Installs Update Nr X." + " status - Shows the recent status of available, non installed updates." exit } } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Sun Nov 23 17:46:24 2008 @@ -167,6 +167,8 @@ "For a list of all included commands, type: ""help""" "-------------------------------------------------" "" +# IEX "'$_ROSBE_BASEDIR\sSVN.ps1' status" +# "" # # Load the doskey macros that serve as our commands. Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Sun Nov 23 17:46:24 2008 @@ -1,3 +1,14 @@ +*** XXX xxth, 200x - RosBE 1.3.1 Released + +- Updated: The Update Utility now does not blindly sync the script files. It loads + complete Update Packs and installs them. (Daniel Reimer) +- Updated: The Powershell Port is now complete. (Daniel Reimer) +- Fixed: Now config adds the ELF Parameter to the config file to and lets you modify + it. Without this param, build is broken. (Daniel Reimer) +- Modified: Changed the default values of config to the previous setting instead of + the real default one if you don't type in anything for a setting. (Daniel Reimer) + + *** October 26th, 2008 - RosBE 1.3 Released - Added: Tool to set the Architecture to build ROS for. (Daniel Reimer) Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] Sun Nov 23 17:46:24 2008 @@ -242,9 +242,9 @@ echo Usage: update [OPTIONS] echo Updates all files of RosBE to the most recent files. echo. - echo nocmds - Skips the Updating of the Script Files. - echo nogcc - Skips the Updating of GCC. - echo notools - Skips the Updating of the Tools. + echo reset - Removes the Updates Cache. Not recommended. + echo nr X - Re/Installs Update Nr X. + echo status - Shows the recent status of available, non installed updates. goto :EOC ) ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Sun Nov 23 17:46:24 2008 @@ -110,6 +110,8 @@ echo For a list of all included commands, type: "help" echo ------------------------------------------------- echo. +REM "%_ROSBE_BASEDIR%\sSVN.cmd" status +REM echo. :: :: Load the doskey macros that serve as our commands.

1 0

[dreimer] 37602: Now it works.
by dreimer＠svn.reactos.org 24 Nov '08

24 Nov '08

Author: dreimer Date: Sun Nov 23 17:28:06 2008 New Revision: 37602 URL: http://svn.reactos.org/svn/reactos?rev=37602&view=rev Log: Now it works. Removed: trunk/tools/RosBE/RosBE-Windows/Root/updcheckproc.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Sun Nov 23 17:28:06 2008 @@ -8,21 +8,10 @@ :: @echo off -setlocal -setlocal enableextensions -setlocal enabledelayedexpansion - if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 if %_ROSBE_DEBUG% == 1 ( @echo on ) -set _ROSBE_UPDFINISH=0 -set _ROSBE_OPATH=0 -set _ROSBE_UPDDATE=0 -set _ROSBE_UPDDATE2=0 -set _ROSBE_UPDATES=0 -set _ROSBE_OPATH=%~dp0 -set _ROSBE_OPATH=%_ROSBE_OPATH:~0,-1% :: :: Set Title @@ -39,6 +28,7 @@ :: ::First check for a new Updater :: +setlocal enabledelayedexpansion for %%F in (update.cmd) do set _ROSBE_UPDDATE=%%~tF "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/update.cmd 1> NUL 2> NUL for %%F in (update.cmd) do set _ROSBE_UPDDATE2=%%~tF @@ -55,6 +45,10 @@ echo Updater got updated and needs to be restarted. goto :EOC ) +endlocal + +set _ROSBE_OPATH=%~dp0 +set _ROSBE_OPATH=%_ROSBE_OPATH:~0,-1% if not exist "Updates" mkdir Updates 1> NUL 2> NUL cd Updates @@ -63,58 +57,117 @@ :: Parse the args. :: if "%1" == "" ( - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 1 next - if "!_ROSBE_UPDFINISH!" == "1" (goto :EOC) - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 2 next - if "!_ROSBE_UPDFINISH!" == "1" (goto :EOC) - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 3 next - if "!_ROSBE_UPDFINISH!" == "1" (goto :EOC) - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 4 next - if "!_ROSBE_UPDFINISH!" == "1" (goto :EOC) - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 5 next - if "!_ROSBE_UPDFINISH!" == "1" (goto :EOC) - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 6 next - if "!_ROSBE_UPDFINISH!" == "1" (goto :EOC) - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 7 next - if "!_ROSBE_UPDFINISH!" == "1" (goto :EOC) - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 8 next - if "!_ROSBE_UPDFINISH!" == "1" (goto :EOC) - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 9 next - goto :EOC + set _ROSBE_MULTIUPD=1 + set _ROSBE_STATCOUNT=1 + call :UPDCHECK + set /a _ROSBE_STATCOUNT+=1 + call :UPDCHECK + set /a _ROSBE_STATCOUNT+=1 + call :UPDCHECK + set /a _ROSBE_STATCOUNT+=1 + call :UPDCHECK + set /a _ROSBE_STATCOUNT+=1 + call :UPDCHECK + set /a _ROSBE_STATCOUNT+=1 + call :UPDCHECK + set /a _ROSBE_STATCOUNT+=1 + call :UPDCHECK + set /a _ROSBE_STATCOUNT+=1 + call :UPDCHECK + set /a _ROSBE_STATCOUNT+=1 + call :UPDCHECK + goto :EOC ) if /i "%1" == "reset" ( del /F /Q "%_ROSBE_BASEDIR%\Updates\*.*" 1> NUL 2> NUL goto :EOC ) if /i "%1" == "nr" ( - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" %2 - goto :EOC + set _ROSBE_STATCOUNT=%2 + call :UPDCHECK + goto :EOC ) if /i "%1" == "status" ( mkdir tmp 1> NUL 2> NUL copy *.txt .\tmp\. 1> NUL 2> NUL - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 1 status - if "!_ROSBE_UPDFINISH!" == "1" (goto :UPDFIN) - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 2 status - if "!_ROSBE_UPDFINISH!" == "1" (goto :UPDFIN) - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 3 status - if "!_ROSBE_UPDFINISH!" == "1" (goto :UPDFIN) - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 4 status - if "!_ROSBE_UPDFINISH!" == "1" (goto :UPDFIN) - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 5 status - if "!_ROSBE_UPDFINISH!" == "1" (goto :UPDFIN) - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 6 status - if "!_ROSBE_UPDFINISH!" == "1" (goto :UPDFIN) - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 7 status - if "!_ROSBE_UPDFINISH!" == "1" (goto :UPDFIN) - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 8 status - if "!_ROSBE_UPDFINISH!" == "1" (goto :UPDFIN) - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 9 status + set _ROSBE_STATCOUNT=1 + call :STATUS + set /a _ROSBE_STATCOUNT+=1 + call :STATUS + set /a _ROSBE_STATCOUNT+=1 + call :STATUS + set /a _ROSBE_STATCOUNT+=1 + call :STATUS + set /a _ROSBE_STATCOUNT+=1 + call :STATUS + set /a _ROSBE_STATCOUNT+=1 + call :STATUS + set /a _ROSBE_STATCOUNT+=1 + call :STATUS + set /a _ROSBE_STATCOUNT+=1 + call :STATUS + set /a _ROSBE_STATCOUNT+=1 + call :STATUS + goto :UPDFIN ) +:STATUS + +cd tmp +if not exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt 1> NUL 2> NUL + if exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( + set _ROSBE_UPDATES=%_ROSBE_UPDATES% %_ROSBE_STATCOUNT% + ) +) +cd.. +goto :EOF + :UPDFIN + del /F /Q tmp\*.* -echo Following Updates available: %_ROSBE_UPDATES% +if not "%_ROSBE_UPDATES%" == "" ( + echo Following Updates available: %_ROSBE_UPDATES% +) else ( + echo RosBE is up to Date. +) +goto :EOC + +:UPDCHECK + +if not exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt 1> NUL 2> NUL +) +if exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( + type "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" + echo. + echo Install? + setlocal enabledelayedexpansion + set /p YESNO="(yes), (no)" + if /i "!YESNO!"=="yes" ( + if not exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.7z" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.7z 1> NUL 2> NUL + ) + if exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.7z" ( + "%_ROSBE_BASEDIR%\Tools\7z.exe" x "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.7z" + cd "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%" + call "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.cmd" + ) else ( + echo ERROR: This Update does not seem to exist or the Internet connection is not working correctly. + goto :EOF + ) + ) else if /i "!YESNO!"=="no" ( + del "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" 1> NUL 2> NUL + goto :EOF + ) + endlocal +) else ( + if not "_ROSBE_MULTIUPD" == "1" ( + echo ERROR: This Update does not seem to exist or the Internet connection is not working correctly. + goto :EOF + ) +) +goto :EOF :EOC @@ -127,4 +180,6 @@ set _ROSBE_OPATH= set _ROSBE_UPDDATE= set _ROSBE_UPDATES= -set _ROSBE_UPDDATE2= +set _ROSBE_UPDDATE2= +set _ROSBE_MULTIUPD= +set _ROSBE_STATCOUNT= Removed: trunk/tools/RosBE/RosBE-Windows/Root/updcheckproc.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/updcheckproc.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/updcheckproc.cmd (removed) @@ -1,65 +1,0 @@ -:: -:: PROJECT: RosBE - ReactOS Build Environment for Windows -:: LICENSE: GNU General Public License v2. (see LICENSE.txt) -:: FILE: Root/update.cmd -:: PURPOSE: RosBE Updater. -:: COPYRIGHT: Copyright 2008 Daniel Reimer <reimer.daniel(a)freenet.de> -:: -:: -@echo off - -setlocal -setlocal enableextensions -setlocal enabledelayedexpansion - -if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 1 ( - @echo on -) - -if "%2" == "status" ( - cd tmp - if not exist "%_ROSBE_VERSION%-%1.txt" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-%1.txt 1> NUL 2> NUL - if exist "%_ROSBE_VERSION%-%1.txt" ( - echo %1 - set _ROSBE_UPDATES=%_ROSBE_UPDATES%, %1 - ) else ( - set _ROSBE_UPDFINISH=1 - ) - ) - goto :EOF -) -if not exist "%_ROSBE_VERSION%-%1.txt" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-%1.txt 1> NUL 2> NUL -) -if exist "%_ROSBE_VERSION%-%1.txt" ( - type "%_ROSBE_VERSION%-%1.txt" - echo. - echo Install? - set /p YESNO="(yes), (no)" - if /i "!YESNO!"=="yes" ( - if not exist "%_ROSBE_VERSION%-%1.7z" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-%1.7z 1> NUL 2> NUL - ) - if exist "%_ROSBE_VERSION%-%1.7z" ( - "%_ROSBE_BASEDIR%\Tools\7z.exe" x "%_ROSBE_VERSION%-%1.7z" - cd "%_ROSBE_VERSION%-%1" - call "%_ROSBE_VERSION%-%1.cmd" - ) else ( - echo ERROR: This Update does not seem to exist or the Internet connection is not working correctly. - goto :EOF - ) - ) else if /i "!YESNO!"=="no" ( - del "%_ROSBE_VERSION%-%1.txt" 1> NUL 2> NUL - goto :EOF - ) -) else ( - if "%2" == "next" ( - echo set %2 - set _ROSBE_UPDFINISH=1 - ) else ( - echo ERROR: This Update does not seem to exist or the Internet connection is not working correctly. - goto :EOF - ) -)

1 0

[hyperion] 37601: Allow pseh.h and pseh2.h to be included in the same compilation unit. Mixing PSEH and PSEH 2.0 macros in the same function isn't safe yet, though
by hyperion＠svn.reactos.org 24 Nov '08

24 Nov '08

Author: hyperion Date: Sun Nov 23 17:00:37 2008 New Revision: 37601 URL: http://svn.reactos.org/svn/reactos?rev=37601&view=rev Log: Allow pseh.h and pseh2.h to be included in the same compilation unit. Mixing PSEH and PSEH 2.0 macros in the same function isn't safe yet, though Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Sun Nov 23 17:00:37 2008 @@ -31,7 +31,7 @@ struct _EXCEPTION_POINTERS; struct _CONTEXT; -typedef int (__cdecl * _SEHFrameHandler_t) +typedef int (__cdecl * _SEH2FrameHandler_t) ( struct _EXCEPTION_RECORD *, void *, @@ -94,12 +94,12 @@ /* Soft memory barrier */ #define __SEH_BARRIER __asm__ __volatile__("#":::"memory") -typedef struct __SEHRegistration -{ - struct __SEHRegistration * SER_Prev; - _SEHFrameHandler_t SER_Handler; -} -_SEHRegistration_t; +typedef struct __SEH2Registration +{ + struct __SEH2Registration * SER_Prev; + _SEH2FrameHandler_t SER_Handler; +} +_SEH2Registration_t; #define __SEH_FORCE_NEST \ __asm__ __volatile__("#%0" : : "r" (&_SEHFrame)) @@ -118,24 +118,24 @@ #define __SEH_RETURN_EXCEPT(R_) return (int)(R_) #define __SEH_RETURN_FINALLY() return -typedef struct __SEHFrame -{ - _SEHRegistration_t SF_Registration; - volatile struct __SEHTryLevel * volatile SF_TopTryLevel; +typedef struct __SEH2Frame +{ + _SEH2Registration_t SF_Registration; + volatile struct __SEH2TryLevel * volatile SF_TopTryLevel; void * volatile SF_FramePointer; void * volatile SF_StackPointer; volatile unsigned long SF_Code; } -_SEHFrame_t; - -typedef struct __SEHTryLevel -{ - volatile struct __SEHTryLevel * ST_Next; +_SEH2Frame_t; + +typedef struct __SEH2TryLevel +{ + volatile struct __SEH2TryLevel * ST_Next; void * ST_FramePointer; void * ST_Filter; void * ST_Body; } -_SEHTryLevel_t; +_SEH2TryLevel_t; #define __SEH_BEGIN_TRY \ { \ @@ -157,16 +157,16 @@ #define __SEH_SET_TRYLEVEL(TRYLEVEL_) \ { \ - __SEH_BARRIER; _SEHFrameP->SF_TopTryLevel = (TRYLEVEL_); __SEH_BARRIER; \ + __SEH_BARRIER; _SEH2FrameP->SF_TopTryLevel = (TRYLEVEL_); __SEH_BARRIER; \ } #define __SEH_ENTER_TRYLEVEL() __SEH_SET_TRYLEVEL(&_SEHTryLevel) #define __SEH_LEAVE_TRYLEVEL() __SEH_SET_TRYLEVEL(_SEHPrevTryLevelP) #define __SEH_END_SCOPE_CHAIN \ - static const int _SEHScopeKind = 1; \ - static _SEHFrame_t * const _SEHFrameP = 0; \ - static _SEHTryLevel_t * const _SEHTryLevelP = 0; + static const int _SEH2ScopeKind = 1; \ + static _SEH2Frame_t * const _SEH2FrameP = 0; \ + static _SEH2TryLevel_t * const _SEH2TryLevelP = 0; #define __SEH_BEGIN_SCOPE \ for(;;) \ @@ -176,9 +176,9 @@ \ _SEHBeginScope: __SEH_SIDE_EFFECT; \ \ - const int _SEHTopTryLevel = (_SEHScopeKind != 0); \ - _SEHFrame_t * const _SEHCurFrameP = _SEHFrameP; \ - volatile _SEHTryLevel_t * const _SEHPrevTryLevelP = _SEHTryLevelP; \ + const int _SEHTopTryLevel = (_SEH2ScopeKind != 0); \ + _SEH2Frame_t * const _SEHCurFrameP = _SEH2FrameP; \ + volatile _SEH2TryLevel_t * const _SEHPrevTryLevelP = _SEH2TryLevelP; \ \ (void)_SEHTopTryLevel; \ (void)_SEHCurFrameP; \ @@ -191,17 +191,17 @@ __label__ _SEHBeforeTry; \ __label__ _SEHDoTry; \ __label__ _SEHAfterTry; \ - static const int _SEHScopeKind = 0; \ - _SEHFrame_t _SEHFrame; \ - volatile _SEHTryLevel_t _SEHTryLevel; \ - _SEHFrame_t * const _SEHFrameP = _SEHTopTryLevel ? &_SEHFrame : _SEHCurFrameP; \ - volatile _SEHTryLevel_t * const _SEHTryLevelP = &_SEHTryLevel; \ - \ - (void)_SEHScopeKind; \ + static const int _SEH2ScopeKind = 0; \ + _SEH2Frame_t _SEHFrame; \ + volatile _SEH2TryLevel_t _SEHTryLevel; \ + _SEH2Frame_t * const _SEH2FrameP = _SEHTopTryLevel ? &_SEHFrame : _SEHCurFrameP; \ + volatile _SEH2TryLevel_t * const _SEH2TryLevelP = &_SEHTryLevel; \ + \ + (void)_SEH2ScopeKind; \ (void)_SEHFrame; \ (void)_SEHTryLevel; \ - (void)_SEHFrameP; \ - (void)_SEHTryLevelP; \ + (void)_SEH2FrameP; \ + (void)_SEH2TryLevelP; \ \ _SEHTryLevel.ST_Next = _SEHPrevTryLevelP; \ goto _SEHBeforeTry; \ @@ -274,9 +274,9 @@ { \ __SEH_END_SCOPE_CHAIN; \ \ - (void)_SEHScopeKind; \ - (void)_SEHFrameP; \ - (void)_SEHTryLevelP; \ + (void)_SEH2ScopeKind; \ + (void)_SEH2FrameP; \ + (void)_SEH2TryLevelP; \ \ __SEH_NESTED_PROLOG; \ \ @@ -299,7 +299,7 @@ _SEHTryLevel.ST_FramePointer = _SEHClosureFromTrampoline((_SEHTrampoline_t *)&_SEHExcept); \ _SEHTryLevel.ST_Filter = _SEHFunctionFromTrampoline((_SEHTrampoline_t *)&_SEHExcept); \ _SEHTryLevel.ST_Body = &&_SEHBeginExcept; \ - __SEH_BARRIER; __asm__ __volatile__("mov %%esp, %0" : "=m" (_SEHFrameP->SF_StackPointer)); __SEH_BARRIER; \ + __SEH_BARRIER; __asm__ __volatile__("mov %%esp, %0" : "=m" (_SEH2FrameP->SF_StackPointer)); __SEH_BARRIER; \ \ goto _SEHDoTry; \ \ @@ -324,8 +324,8 @@ _SEHBeginExcept: __SEH_SIDE_EFFECT; \ { \ { \ - _SEHFrame_t * const _SEHFrameP = _SEHTopTryLevel ? &_SEHFrame : _SEHCurFrameP; \ - (void)_SEHFrameP; \ + _SEH2Frame_t * const _SEH2FrameP = _SEHTopTryLevel ? &_SEHFrame : _SEHCurFrameP; \ + (void)_SEH2FrameP; \ __SEH_BARRIER; #define _SEH2_END \ @@ -337,12 +337,12 @@ __SEH_END_SCOPE; #define _SEH2_GetExceptionInformation() ((struct _EXCEPTION_POINTERS *)_SEHExceptionPointers) -#define _SEH2_GetExceptionCode() ((_SEHFrameP)->SF_Code) +#define _SEH2_GetExceptionCode() ((_SEH2FrameP)->SF_Code) #define _SEH2_YIELD(STMT_) \ for(;;) \ { \ - if(!_SEHScopeKind) \ + if(!_SEH2ScopeKind) \ _SEH2Return(); \ \ STMT_; \ @@ -357,7 +357,7 @@ { #endif -extern void __cdecl _SEH2EnterFrame(_SEHFrame_t *); +extern void __cdecl _SEH2EnterFrame(_SEH2Frame_t *); extern void __cdecl _SEH2LeaveFrame(void); extern void __cdecl _SEH2Return(void);

1 0

[hyperion] 37600: GCC can't appreciate my genius. _SEH2_EXCEPT temporarily broken until I figure out a simpler way
by hyperion＠svn.reactos.org 23 Nov '08

23 Nov '08

Author: hyperion Date: Sun Nov 23 16:47:16 2008 New Revision: 37600 URL: http://svn.reactos.org/svn/reactos?rev=37600&view=rev Log: GCC can't appreciate my genius. _SEH2_EXCEPT temporarily broken until I figure out a simpler way Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Sun Nov 23 16:47:16 2008 @@ -333,12 +333,6 @@ } \ } \ _SEHEndExcept: __SEH_SIDE_EFFECT; \ - \ - void _SEHJumpToHandler(void) \ - { \ - if(_SEHFrameP == (_SEHTopTryLevel ? &_SEHFrame : _SEHCurFrameP) && _SEHPrevTryLevelP == _SEHTryLevelP) \ - goto _SEHBeginExcept; \ - } \ } \ __SEH_END_SCOPE;

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