Ros-diffs December 2008

ros-diffs@reactos.org

31 participants
710 discussions

[tkreuzer] 37854: "save your files before committing them!" -> good "test your changes before comitting them!" -> better revert 37787

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Dec 4 11:49:36 2008 New Revision: 37854 URL: http://svn.reactos.org/svn/reactos?rev=37854&view=rev Log: "save your files before committing them!" -> good "test your changes before comitting them!" -> better revert 37787 Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/React… ============================================================================== --- branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] Thu Dec 4 11:49:36 2008 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="Windows-1252" ?> +<?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> <project name="ReactOS" makefile="makefile-amd64.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="config-amd64.rbuild"> @@ -45,7 +45,7 @@ <compilerflag>-Wpointer-arith</compilerflag> <linkerflag>-disable-stdcall-fixup</linkerflag> <linkerflag>-static</linkerflag> -  + <linkerflag>--unique=.eh_frame</linkerflag>  @@ -127,68 +127,102 @@ <include host="true">include/reactos</include> <include host="true">include/reactos/wine</include> -  + </directory --> <directory name="boot"> <xi:include href="boot/boot.rbuild" /> </directory> -  + </directory --> <directory name="drivers"> - <directory name="base"> - <xi:include href="drivers/base/directory.rbuild" /> - </directory> <directory name="bus"> <directory name="pci"> <xi:include href="drivers/bus/pci/pci.rbuild" /> </directory> </directory> +  - <directory name="filesystems"> - <xi:include href="drivers/filesystems/directory.rbuild" /> - </directory> - <directory name="input"> - <xi:include href="drivers/input/directory.rbuild" /> - </directory> +  +  - <directory name="network"> - <xi:include href="drivers/network/directory.rbuild" /> - </directory> + <directory name="parallel"> <xi:include href="drivers/parallel/directory.rbuild" /> </directory> + <directory name="serial"> <xi:include href="drivers/serial/directory.rbuild" /> </directory> - <directory name="setup"> - <xi:include href="drivers/setup/directory.rbuild" /> - </directory> -  +  +  +  + <directory name="wmi"> <xi:include href="drivers/wmi/wmilib.rbuild" /> + </directory> + + <directory name="base"> + <xi:include href="drivers/base/directory.rbuild" /> + </directory> + <directory name="filesystems"> + <xi:include href="drivers/filesystems/directory.rbuild" /> + </directory> + <directory name="input"> + <xi:include href="drivers/input/directory.rbuild" /> + </directory> + <directory name="network"> + <xi:include href="drivers/network/directory.rbuild" /> + </directory> + <directory name="setup"> + <xi:include href="drivers/setup/directory.rbuild" /> + </directory> + <directory name="storage"> + <directory name="class"> + <directory name="cdrom"> + <xi:include href="drivers/storage/class/cdrom/cdrom.rbuild" /> + </directory> + <directory name="class2"> + <xi:include href="drivers/storage/class/class2/class2.rbuild" /> + </directory> + <directory name="disk"> + <xi:include href="drivers/storage/class/disk/disk.rbuild" /> + </directory> + </directory> + <directory name="floppy"> + <xi:include href="drivers/storage/floppy/floppy.rbuild" /> + </directory> + <directory name="ide"> + <directory name="atapi"> + <xi:include href="drivers/storage/ide/atapi/atapi.rbuild" /> + </directory> + </directory> + <directory name="port"> + <xi:include href="drivers/storage/port/directory.rbuild" /> + </directory> + <directory name="scsiport"> + <xi:include href="drivers/storage/scsiport/scsiport.rbuild" /> + </directory> </directory> </directory> @@ -285,9 +319,9 @@ <xi:include href="ntoskrnl/ntoskrnl.rbuild" /> </directory> -  + </directory --> <directory name="tools"> <xi:include href="tools/tools.rbuild" />

16 years

[gschneider] 37853: Free allocated resource on error, CID 1358.

by gschneider＠svn.reactos.org

Author: gschneider Date: Thu Dec 4 10:46:54 2008 New Revision: 37853 URL: http://svn.reactos.org/svn/reactos?rev=37853&view=rev Log: Free allocated resource on error, CID 1358. Modified: trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Thu Dec 4 10:46:54 2008 @@ -1095,7 +1095,11 @@ if (modea && WideCharToMultiByte(CP_ACP,0,mode,mlen,modea,mlen,NULL,NULL)) { - if (get_flags(modea, &open_flags, &stream_flags) == -1) return NULL; + if (get_flags(modea, &open_flags, &stream_flags) == -1) + { + free(modea); + return NULL; + } LOCK_FILES(); if (!(file = alloc_fp())) file = NULL;

16 years

[janderwald] 37852: - Add interfaces for IMasterClock, IMXF, IAllocatorMXF, IPortDMus, IMiniportDMus

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Dec 4 10:29:56 2008 New Revision: 37852 URL: http://svn.reactos.org/svn/reactos?rev=37852&view=rev Log: - Add interfaces for IMasterClock, IMXF, IAllocatorMXF, IPortDMus, IMiniportDMus Modified: trunk/reactos/include/ddk/dmusicks.h Modified: trunk/reactos/include/ddk/dmusicks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/dmusicks.h?rev… ============================================================================== --- trunk/reactos/include/ddk/dmusicks.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/dmusicks.h [iso-8859-1] Thu Dec 4 10:29:56 2008 @@ -1,10 +1,249 @@ #ifndef _DMUSICKS_ #define _DMUSICKS_ +#define DONT_HOLD_FOR_SEQUENCING 0x8000000000000000 + +#ifndef REFERENCE_TIME +typedef LONGLONG REFERENCE_TIME; +#endif + +typedef struct _DMUS_KERNEL_EVENT +{ + BYTE bReserved; + BYTE cbStruct; + USHORT cbEvent; + USHORT usChannelGroup; + USHORT usFlags; + REFERENCE_TIME ullPresTime100ns; + ULONGLONG ullBytePosition; + struct _DMUS_KERNEL_EVENT *pNextEvt; + union + { + BYTE abData[sizeof(PBYTE)]; + PBYTE pbData; + struct _DMUS_KERNEL_EVENT *pPackageEvt; + }uData; +}DMUS_KERNEL_EVENT, *PDMUS_KERNEL_EVENT; + +typedef enum +{ + DMUS_STREAM_MIDI_INVALID = -1, + DMUS_STREAM_MIDI_RENDER = 0, + DMUS_STREAM_MIDI_CAPTURE, + DMUS_STREAM_WAVE_SINK +}DMUS_STREAM_TYPE; + DEFINE_GUID(CLSID_MiniportDriverDMusUART, 0xd3f0ce1c, 0xFFFC, 0x11D1, 0x81, 0xB0, 0x00, 0x60, 0x08, 0x33, 0x16, 0xC1); DEFINE_GUID(CLSID_MiniportDriverDMusUARTCapture, 0xD3F0CE1D, 0xFFFC, 0x11D1, 0x81, 0xB0, 0x00, 0x60, 0x08, 0x33, 0x16, 0xC1); - - +/* =============================================================== + IMasterClock Interface +*/ + +#undef INTERFACE +#define INTERFACE IMasterClock + +DECLARE_INTERFACE_(IMasterClock,IUnknown) +{ + STDMETHOD_(NTSTATUS, QueryInterface)(THIS_ + REFIID InterfaceId, + PVOID* Interface + ) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + + STDMETHOD_(NTSTATUS,GetTime)( THIS_ + OUT REFERENCE_TIME * pTime + ) PURE; +}; + +typedef IMasterClock *PMASTERCLOCK; + +/* =============================================================== + IMXF Interface +*/ + +#undef INTERFACE +#define INTERFACE IMXF + +struct IMXF; +typedef struct IMXF *PMXF; + +DECLARE_INTERFACE_(IMXF,IUnknown) +{ + STDMETHOD_(NTSTATUS, QueryInterface)(THIS_ + REFIID InterfaceId, + PVOID* Interface + ) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + + STDMETHOD_(NTSTATUS,SetState)(THIS_ + IN KSSTATE State + ) PURE; + STDMETHOD_(NTSTATUS,PutMessage) + ( THIS_ + IN PDMUS_KERNEL_EVENT pDMKEvt + ) PURE; + STDMETHOD_(NTSTATUS,ConnectOutput) + ( THIS_ + IN PMXF sinkMXF + ) PURE; + STDMETHOD_(NTSTATUS,DisconnectOutput) + ( THIS_ + IN PMXF sinkMXF + ) PURE; +}; + +/* =============================================================== + IAllocatorMXF Interface +*/ + +#undef INTERFACE +#define INTERFACE IAllocatorMXF + +struct IAllocatorMXF; +typedef struct IAllocatorMXF *PAllocatorMXF; + +DECLARE_INTERFACE_(IAllocatorMXF,IMXF) +{ + STDMETHOD_(NTSTATUS, QueryInterface)(THIS_ + REFIID InterfaceId, + PVOID* Interface + ) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + + STDMETHOD_(NTSTATUS,SetState)(THIS_ + IN KSSTATE State + ) PURE; + STDMETHOD_(NTSTATUS,PutMessage) + ( THIS_ + IN PDMUS_KERNEL_EVENT pDMKEvt + ) PURE; + STDMETHOD_(NTSTATUS,ConnectOutput) + ( THIS_ + IN PMXF sinkMXF + ) PURE; + STDMETHOD_(NTSTATUS,DisconnectOutput) + ( THIS_ + IN PMXF sinkMXF + ) PURE; + + STDMETHOD_(NTSTATUS,GetMessage)(THIS_ + OUT PDMUS_KERNEL_EVENT * ppDMKEvt + ) PURE; + + STDMETHOD_(USHORT,GetBufferSize)(THIS) PURE; + + STDMETHOD_(NTSTATUS,GetBuffer)(THIS_ + OUT PBYTE * ppBuffer + )PURE; + + STDMETHOD_(NTSTATUS,PutBuffer)(THIS_ + IN PBYTE pBuffer + ) PURE; +}; + + +#undef INTERFACE +#define INTERFACE IPortDMus + +DEFINE_GUID(IID_IPortDMus, 0xc096df9c, 0xfb09, 0x11d1, 0x81, 0xb0, 0x00, 0x60, 0x08, 0x33, 0x16, 0xc1); +DEFINE_GUID(CLSID_PortDMus, 0xb7902fe9, 0xfb0a, 0x11d1, 0x81, 0xb0, 0x00, 0x60, 0x08, 0x33, 0x16, 0xc1); + +DECLARE_INTERFACE_(IPortDMus, IPort) +{ + STDMETHOD_(NTSTATUS, QueryInterface)(THIS_ + REFIID InterfaceId, + PVOID* Interface + ) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + + STDMETHOD_(NTSTATUS,Init)(THIS_ + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PUNKNOWN UnknownMiniport, + IN PUNKNOWN UnknownAdapter OPTIONAL, + IN PRESOURCELIST ResourceList + )PURE; + STDMETHOD_(NTSTATUS,GetDeviceProperty)(THIS_ + IN DEVICE_REGISTRY_PROPERTY DeviceProperty, + IN ULONG BufferLength, + OUT PVOID PropertyBuffer, + OUT PULONG ResultLength + )PURE; + STDMETHOD_(NTSTATUS,NewRegistryKey)(THIS_ + OUT PREGISTRYKEY * OutRegistryKey, + IN PUNKNOWN OuterUnknown, + IN ULONG RegistryKeyType, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, + IN ULONG CreateOptions OPTIONAL, + OUT PULONG Disposition OPTIONAL + )PURE; + STDMETHOD_(void,Notify)(THIS_ + IN PSERVICEGROUP ServiceGroup OPTIONAL + )PURE; + + STDMETHOD_(void,RegisterServiceGroup)(THIS_ + IN PSERVICEGROUP ServiceGroup + ) PURE; +}; +typedef IPortDMus *PPORTDMUS; + + + +#undef INTERFACE +#define INTERFACE IMiniportDMus + +DEFINE_GUID(IID_IMiniportDMus, 0xc096df9d, 0xfb09, 0x11d1, 0x81, 0xb0, 0x00, 0x60, 0x08, 0x33, 0x16, 0xc1); +DECLARE_INTERFACE_(IMiniportDMus, IMiniport) +{ + STDMETHOD_(NTSTATUS, QueryInterface)(THIS_ + REFIID InterfaceId, + PVOID* Interface + ) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + + STDMETHOD_(NTSTATUS,GetDescription)(THIS_ + OUT PPCFILTER_DESCRIPTOR * Description + ) PURE; + STDMETHOD_(NTSTATUS,DataRangeIntersection)(THIS_ + IN ULONG PinId, + IN PKSDATARANGE DataRange, + IN PKSDATARANGE MatchingDataRange, + IN ULONG OutputBufferLength, + OUT PVOID ResultantFormat OPTIONAL, + OUT PULONG ResultantFormatLength + ) PURE; + + STDMETHOD_(NTSTATUS,Init)(THIS_ + IN PUNKNOWN UnknownAdapter, + IN PRESOURCELIST ResourceList, + IN PPORTDMUS Port, + OUT PSERVICEGROUP * ServiceGroup + ) PURE; + + STDMETHOD_(void,Service)(THIS) PURE; + + STDMETHOD_(NTSTATUS,NewStream)(THIS_ + OUT PMXF * MXF, + IN PUNKNOWN OuterUnknown OPTIONAL, + IN POOL_TYPE PoolType, + IN ULONG PinID, + IN DMUS_STREAM_TYPE StreamType, + IN PKSDATAFORMAT DataFormat, + OUT PSERVICEGROUP * ServiceGroup, + IN PAllocatorMXF AllocatorMXF, + IN PMASTERCLOCK MasterClock, + OUT PULONGLONG SchedulePreFetch + ) PURE; +}; + +typedef IMiniportDMus *PMINIPORTDMUS; +#undef INTERFACE #endif

16 years

[hyperion] 37851: DWARF debugging information confuses rsym, and DWARF-2 information from internal libraries (like libgcc) results in huge executables that don't even run on Windows. Therefore, before the rsym phase, strip all DWARF-2 sections This is a HACK for gcc builds compiled with DWARF-2 symbols (e.g. 4.3.2-tdm-1). The real solution (to be implemented soon) is to parse DWARF-2 line numbers in rsym

by hyperion＠svn.reactos.org

Author: hyperion Date: Thu Dec 4 10:09:26 2008 New Revision: 37851 URL: http://svn.reactos.org/svn/reactos?rev=37851&view=rev Log: DWARF debugging information confuses rsym, and DWARF-2 information from internal libraries (like libgcc) results in huge executables that don't even run on Windows. Therefore, before the rsym phase, strip all DWARF-2 sections This is a HACK for gcc builds compiled with DWARF-2 symbols (e.g. 4.3.2-tdm-1). The real solution (to be implemented soon) is to parse DWARF-2 line numbers in rsym Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Thu Dec 4 10:09:26 2008 @@ -1428,6 +1428,9 @@ "ifneq ($(ROS_GENERATE_RSYM),no)\n" ); fprintf ( fMakefile, "\t$(ECHO_RSYM)\n" ); + // FIXME! workaround until rsym can extract line numbers from DWARF + fprintf ( fMakefile, + "\t$(Q)${strip} -R .debug_abbrev -R .debug_aranges -R .debug_frame -R .debug_info -R .debug_line -R .debug_pubnames -R .debug_macinfo -R .debug_str -R .debug_loc -R .debug_pubtypes -R .debug_ranges -R .debug_static_func -R .debug_static_vars -R .debug_types -R .debug_weaknames $@\n\n" ); fprintf ( fMakefile, "\t$(Q)$(RSYM_TARGET) $@ $@\n\n" ); fprintf ( fMakefile,

16 years

[hyperion] 37850: modified lib/3rdparty/mingw/main.c Make -Wno-main redundant modified tools/rbuild/backend/mingw/modulehandler.cpp -Wno-main now redundant

by hyperion＠svn.reactos.org

Author: hyperion Date: Thu Dec 4 09:49:47 2008 New Revision: 37850 URL: http://svn.reactos.org/svn/reactos?rev=37850&view=rev Log: modified lib/3rdparty/mingw/main.c Make -Wno-main redundant modified tools/rbuild/backend/mingw/modulehandler.cpp -Wno-main now redundant Modified: trunk/reactos/lib/3rdparty/mingw/main.c trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/lib/3rdparty/mingw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/main.c?… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/main.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/main.c [iso-8859-1] Thu Dec 4 09:49:47 2008 @@ -20,7 +20,7 @@ LPSTR szCmdLine, int nShow); int -main (int argc, const char *argv[], const char *environ[]) +main (int argc, const char *argv[]) { char *szCmd; STARTUPINFO startinfo; Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Thu Dec 4 09:49:47 2008 @@ -2009,16 +2009,6 @@ linkerflags ); } - if ( IsStaticLibrary ( module ) && module.isStartupLib ) - { - fprintf ( fMakefile, - "%s += -Wno-main\n\n", - cflagsMacro.c_str () ); - fprintf ( fMakefile, - "%s += -Wno-main\n\n", - cxxflagsMacro.c_str () ); - } - fprintf ( fMakefile, "\n\n" ); // future references to the macros will be to get their values

16 years

[tkreuzer] 37849: Partly implement KiDispatchException, based on x86 implementation.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Dec 4 09:39:42 2008 New Revision: 37849 URL: http://svn.reactos.org/svn/reactos?rev=37849&view=rev Log: Partly implement KiDispatchException, based on x86 implementation. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/except.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/except.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/except.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/except.c [iso-8859-1] Thu Dec 4 09:39:42 2008 @@ -1,11 +1,10 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/ke/i386/exp.c - * PURPOSE: Exception Dispatching and Context<->Trap Frame Conversion - * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) - * Gregor Anich - * Skywing (skywing(a)valhallalegends.com) + * FILE: ntoskrnl/ke/amd64/except.c + * PURPOSE: Exception Dispatching for amd64 + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + * Alex Ionescu (alex.ionescu(a)reactos.org) */ /* INCLUDES ******************************************************************/ @@ -99,7 +98,104 @@ IN KPROCESSOR_MODE PreviousMode, IN BOOLEAN FirstChance) { - UNIMPLEMENTED; + CONTEXT Context; + + DPRINT1("KiDispatchException(%p, %p, %p, %d, %d)\n", + ExceptionRecord, ExceptionFrame, TrapFrame, PreviousMode, FirstChance); + + /* Increase number of Exception Dispatches */ + KeGetCurrentPrcb()->KeExceptionDispatchCount++; + + /* Set the context flags */ + Context.ContextFlags = CONTEXT_FULL | CONTEXT_DEBUG_REGISTERS; + + /* Check if User Mode or if the debugger is enabled */ + if ((PreviousMode == UserMode) || (KdDebuggerEnabled)) + { + /* Add the FPU Flag */ + Context.ContextFlags |= CONTEXT_FLOATING_POINT; + } + + /* Get a Context */ + KeTrapFrameToContext(TrapFrame, ExceptionFrame, &Context); + + /* Look at our exception code */ + switch (ExceptionRecord->ExceptionCode) + { + /* Breakpoint */ + case STATUS_BREAKPOINT: + + /* Decrement EIP by one */ + Context.Rip--; + break; + + /* Internal exception */ + case KI_EXCEPTION_ACCESS_VIOLATION: + + /* Set correct code */ + ExceptionRecord->ExceptionCode = STATUS_ACCESS_VIOLATION; + if (PreviousMode == UserMode) + { + /* FIXME: Handle no execute */ + } + break; + } + + /* Handle kernel-mode first, it's simpler */ + if (PreviousMode == KernelMode) + { + /* Check if this is a first-chance exception */ + if (FirstChance == TRUE) + { + /* Break into the debugger for the first time */ + if (KiDebugRoutine(TrapFrame, + ExceptionFrame, + ExceptionRecord, + &Context, + PreviousMode, + FALSE)) + { + /* Exception was handled */ + goto Handled; + } + + /* If the Debugger couldn't handle it, dispatch the exception */ + if (RtlDispatchException(ExceptionRecord, &Context)) goto Handled; + } + + /* This is a second-chance exception, only for the debugger */ + if (KiDebugRoutine(TrapFrame, + ExceptionFrame, + ExceptionRecord, + &Context, + PreviousMode, + TRUE)) + { + /* Exception was handled */ + goto Handled; + } + + /* Third strike; you're out */ + KeBugCheckEx(KMODE_EXCEPTION_NOT_HANDLED, + ExceptionRecord->ExceptionCode, + (ULONG_PTR)ExceptionRecord->ExceptionAddress, + (ULONG_PTR)TrapFrame, + 0); + } + else + { + /* FIXME: user-mode exception handling unimplemented */ + ASSERT(FALSE); + } + +Handled: + /* Convert the context back into Trap/Exception Frames */ + KeContextToTrapFrame(&Context, + ExceptionFrame, + TrapFrame, + Context.ContextFlags, + PreviousMode); + return; } NTSTATUS

16 years

[sginsberg] 37848: - Don't cache a value if we might dereference NULL - Fix for CID 653

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Thu Dec 4 09:15:01 2008 New Revision: 37848 URL: http://svn.reactos.org/svn/reactos?rev=37848&view=rev Log: - Don't cache a value if we might dereference NULL - Fix for CID 653 Modified: trunk/reactos/lib/rtl/unicodeprefix.c Modified: trunk/reactos/lib/rtl/unicodeprefix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/unicodeprefix.c?re… ============================================================================== --- trunk/reactos/lib/rtl/unicodeprefix.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/unicodeprefix.c [iso-8859-1] Thu Dec 4 09:15:01 2008 @@ -465,13 +465,14 @@ BOOLEAN Restart) { PRTL_SPLAY_LINKS SplayLinks; - PUNICODE_PREFIX_TABLE_ENTRY Entry, CaseMatchEntry; + PUNICODE_PREFIX_TABLE_ENTRY Entry, CaseMatchEntry = NULL; DPRINT("RtlNextUnicodePrefix(): Table %p Restart %b\n", PrefixTable, Restart); /* We might need this entry 2/3rd of the time, so cache it now */ - CaseMatchEntry = PrefixTable->LastNextEntry->CaseMatch; + if (PrefixTable->LastNextEntry) + CaseMatchEntry = PrefixTable->LastNextEntry->CaseMatch; /* Check if this is a restart or if we don't have a last entry */ if ((Restart) || !(PrefixTable->LastNextEntry))

16 years

[tkreuzer] 37847: Implement KeContextToTrapFrame and KeTrapFrameToContext

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Dec 4 09:01:02 2008 New Revision: 37847 URL: http://svn.reactos.org/svn/reactos?rev=37847&view=rev Log: Implement KeContextToTrapFrame and KeTrapFrameToContext Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/context.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/context.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/context.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/context.c [iso-8859-1] Thu Dec 4 09:01:02 2008 @@ -22,7 +22,90 @@ IN ULONG ContextFlags, IN KPROCESSOR_MODE PreviousMode) { - UNIMPLEMENTED; + KIRQL OldIrql; + + /* Do this at APC_LEVEL */ + OldIrql = KeGetCurrentIrql(); + if (OldIrql < APC_LEVEL) KeRaiseIrql(APC_LEVEL, &OldIrql); + + /* Handle integer registers */ + if ((Context->ContextFlags & CONTEXT_INTEGER) == CONTEXT_INTEGER) + { + TrapFrame->Rax = Context->Rax; + TrapFrame->Rbx = Context->Rbx; + TrapFrame->Rcx = Context->Rcx; + TrapFrame->Rdx = Context->Rdx; + TrapFrame->Rsi = Context->Rsi; + TrapFrame->Rdi = Context->Rdi; + TrapFrame->Rbp = Context->Rbp; + TrapFrame->R8 = Context->R8; + TrapFrame->R9 = Context->R9; + TrapFrame->R10 = Context->R10; + TrapFrame->R11 = Context->R11; + } + + /* Handle floating point registers */ + if (((Context->ContextFlags & CONTEXT_FLOATING_POINT) == + CONTEXT_FLOATING_POINT) && (Context->SegCs & MODE_MASK)) + { + TrapFrame->Xmm0 = Context->Xmm0; + TrapFrame->Xmm1 = Context->Xmm1; + TrapFrame->Xmm2 = Context->Xmm2; + TrapFrame->Xmm3 = Context->Xmm3; + TrapFrame->Xmm4 = Context->Xmm4; + TrapFrame->Xmm5 = Context->Xmm5; + } + + /* Handle control registers */ + if ((Context->ContextFlags & CONTEXT_CONTROL) == CONTEXT_CONTROL) + { + /* RIP, RSP, EFLAGS */ + TrapFrame->Rip = Context->Rip; + TrapFrame->Rsp = Context->Rsp; + TrapFrame->EFlags = Context->EFlags; + } + + /* Handle segment selectors */ + if ((Context->ContextFlags & CONTEXT_SEGMENTS) == CONTEXT_SEGMENTS) + { + /* Check if this was a Kernel Trap */ + if (Context->SegCs == KGDT_64_R0_CODE) + { + /* Set valid selectors */ + TrapFrame->SegCs = KGDT_64_R0_CODE; + TrapFrame->SegDs = KGDT_64_DATA | RPL_MASK; + TrapFrame->SegEs = KGDT_64_DATA | RPL_MASK; + TrapFrame->SegFs = KGDT_32_R3_TEB; + TrapFrame->SegGs = KGDT_64_DATA | RPL_MASK; + TrapFrame->SegSs = KGDT_64_R0_SS; + } + else + { + /* Copy selectors */ + TrapFrame->SegCs = Context->SegCs; + TrapFrame->SegDs = Context->SegDs; + TrapFrame->SegEs = Context->SegEs; + TrapFrame->SegFs = Context->SegFs; + TrapFrame->SegGs = Context->SegGs; + TrapFrame->SegSs = Context->SegSs; + } + } + + /* Handle debug registers */ + if ((Context->ContextFlags & CONTEXT_DEBUG_REGISTERS) == + CONTEXT_DEBUG_REGISTERS) + { + /* Copy the debug registers */ + TrapFrame->Dr0 = Context->Dr0; + TrapFrame->Dr1 = Context->Dr1; + TrapFrame->Dr2 = Context->Dr2; + TrapFrame->Dr3 = Context->Dr3; + TrapFrame->Dr6 = Context->Dr6; + TrapFrame->Dr7 = Context->Dr7; + } + + /* Restore IRQL */ + if (OldIrql < APC_LEVEL) KeLowerIrql(OldIrql); } VOID @@ -31,6 +114,89 @@ IN PKEXCEPTION_FRAME ExceptionFrame, IN OUT PCONTEXT Context) { - UNIMPLEMENTED; + KIRQL OldIrql; + + /* Do this at APC_LEVEL */ + OldIrql = KeGetCurrentIrql(); + if (OldIrql < APC_LEVEL) KeRaiseIrql(APC_LEVEL, &OldIrql); + + /* Handle integer registers */ + if ((Context->ContextFlags & CONTEXT_INTEGER) == CONTEXT_INTEGER) + { + Context->Rax = TrapFrame->Rax; + Context->Rbx = TrapFrame->Rbx; + Context->Rcx = TrapFrame->Rcx; + Context->Rdx = TrapFrame->Rdx; + Context->Rsi = TrapFrame->Rsi; + Context->Rdi = TrapFrame->Rdi; + Context->Rbp = TrapFrame->Rbp; + Context->R8 = TrapFrame->R8; + Context->R9 = TrapFrame->R9; + Context->R10 = TrapFrame->R10; + Context->R11 = TrapFrame->R11; + } + + /* Handle floating point registers */ + if (((Context->ContextFlags & CONTEXT_FLOATING_POINT) == + CONTEXT_FLOATING_POINT) && (TrapFrame->SegCs & MODE_MASK)) + { + Context->Xmm0 = TrapFrame->Xmm0; + Context->Xmm1 = TrapFrame->Xmm1; + Context->Xmm2 = TrapFrame->Xmm2; + Context->Xmm3 = TrapFrame->Xmm3; + Context->Xmm4 = TrapFrame->Xmm4; + Context->Xmm5 = TrapFrame->Xmm5; + } + + /* Handle control registers */ + if ((Context->ContextFlags & CONTEXT_CONTROL) == CONTEXT_CONTROL) + { + /* RIP, RSP, EFLAGS */ + Context->Rip = TrapFrame->Rip; + Context->Rsp = TrapFrame->Rsp; + Context->EFlags = TrapFrame->EFlags; + } + + /* Handle segment selectors */ + if ((Context->ContextFlags & CONTEXT_SEGMENTS) == CONTEXT_SEGMENTS) + { + /* Check if this was a Kernel Trap */ + if (TrapFrame->SegCs == KGDT_64_R0_CODE) + { + /* Set valid selectors */ + Context->SegCs = KGDT_64_R0_CODE; + Context->SegDs = KGDT_64_DATA | RPL_MASK; + Context->SegEs = KGDT_64_DATA | RPL_MASK; + Context->SegFs = KGDT_32_R3_TEB; + Context->SegGs = KGDT_64_DATA | RPL_MASK; + Context->SegSs = KGDT_64_R0_SS; + } + else + { + /* Copy selectors */ + Context->SegCs = TrapFrame->SegCs; + Context->SegDs = TrapFrame->SegDs; + Context->SegEs = TrapFrame->SegEs; + Context->SegFs = TrapFrame->SegFs; + Context->SegGs = TrapFrame->SegGs; + Context->SegSs = TrapFrame->SegSs; + } + } + + /* Handle debug registers */ + if ((Context->ContextFlags & CONTEXT_DEBUG_REGISTERS) == + CONTEXT_DEBUG_REGISTERS) + { + /* Copy the debug registers */ + Context->Dr0 = TrapFrame->Dr0; + Context->Dr1 = TrapFrame->Dr1; + Context->Dr2 = TrapFrame->Dr2; + Context->Dr3 = TrapFrame->Dr3; + Context->Dr6 = TrapFrame->Dr6; + Context->Dr7 = TrapFrame->Dr7; + } + + /* Restore IRQL */ + if (OldIrql < APC_LEVEL) KeLowerIrql(OldIrql); }

16 years

[sginsberg] 37846: - Fix some redefinitions

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Thu Dec 4 08:11:57 2008 New Revision: 37846 URL: http://svn.reactos.org/svn/reactos?rev=37846&view=rev Log: - Fix some redefinitions Modified: trunk/reactos/include/psdk/ntsecpkg.h trunk/reactos/include/psdk/sspi.h Modified: trunk/reactos/include/psdk/ntsecpkg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecpkg.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntsecpkg.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntsecpkg.h [iso-8859-1] Thu Dec 4 08:11:57 2008 @@ -432,41 +432,4 @@ typedef NTSTATUS (WINAPI *SpUserModeInitializeFn)(ULONG, PULONG, PSECPKG_USER_FUNCTION_TABLE *, PULONG); -#define ISC_REQ_DELEGATE 1 -#define ISC_REQ_MUTUAL_AUTH 2 -#define ISC_REQ_REPLAY_DETECT 4 -#define ISC_REQ_SEQUENCE_DETECT 8 -#define ISC_REQ_CONFIDENTIALITY 16 -#define ISC_REQ_USE_SESSION_KEY 32 -#define ISC_REQ_PROMPT_FOR_CREDS 64 -#define ISC_REQ_USE_SUPPLIED_CREDS 128 -#define ISC_REQ_ALLOCATE_MEMORY 256 -#define ISC_REQ_USE_DCE_STYLE 512 -#define ISC_REQ_DATAGRAM 1024 -#define ISC_REQ_CONNECTION 2048 -#define ISC_REQ_EXTENDED_ERROR 16384 -#define ISC_REQ_STREAM 32768 -#define ISC_REQ_INTEGRITY 65536 -#define ISC_REQ_MANUAL_CRED_VALIDATION 524288 -#define ISC_REQ_HTTP 268435456 - -#define ISC_RET_EXTENDED_ERROR 16384 - -#define ASC_REQ_DELEGATE 1 -#define ASC_REQ_MUTUAL_AUTH 2 -#define ASC_REQ_REPLAY_DETECT 4 -#define ASC_REQ_SEQUENCE_DETECT 8 -#define ASC_REQ_CONFIDENTIALITY 16 -#define ASC_REQ_USE_SESSION_KEY 32 -#define ASC_REQ_ALLOCATE_MEMORY 256 -#define ASC_REQ_USE_DCE_STYLE 512 -#define ASC_REQ_DATAGRAM 1024 -#define ASC_REQ_CONNECTION 2048 -#define ASC_REQ_EXTENDED_ERROR 32768 -#define ASC_REQ_STREAM 65536 -#define ASC_REQ_INTEGRITY 131072 - -#define SECURITY_NATIVE_DREP 16 -#define SECURITY_NETWORK_DREP 0 - #endif /* _NTSECPKG_H */ Modified: trunk/reactos/include/psdk/sspi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sspi.h?rev=37… ============================================================================== --- trunk/reactos/include/psdk/sspi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sspi.h [iso-8859-1] Thu Dec 4 08:11:57 2008 @@ -367,9 +367,10 @@ #define ASC_RET_FRAGMENT_ONLY 0x00800000 #define ASC_RET_NO_TOKEN 0x01000000 -/* values for TargetDataRep */ -#define SECURITY_NATIVE_DREP 0x00000010 -#define SECURITY_NETWORK_DREP 0x00000000 +/*Vvalues for TargetDataRep */ +#define SECURITY_NATIVE_DREP 0x00000010 +#define SECURITY_NETWORK_DREP 0x00000000 + SECURITY_STATUS SEC_ENTRY CompleteAuthToken(PCtxtHandle phContext, PSecBufferDesc pToken); @@ -421,13 +422,6 @@ #define SECPKG_ATTR_ACCESS_TOKEN 18 #define SECPKG_ATTR_TARGET 19 #define SECPKG_ATTR_AUTHENTICATION_ID 20 -#define SECPKG_ATTR_ISSUER_LIST 80 -#define SECPKG_ATTR_REMOTE_CRED 81 -#define SECPKG_ATTR_LOCAL_CRED 82 -#define SECPKG_ATTR_REMOTE_CERT_CONTEXT 83 -#define SECPKG_ATTR_LOCAL_CERT_CONTEXT 84 -#define SECPKG_ATTR_ISSUER_LIST_EX 89 -#define SECPKG_ATTR_CONNECTION_INFO 90 /* types for QueryContextAttributes/SetContextAttributes */

16 years

[fireball] 37845: - WDK defines PNOTIFY_SYNC as a pointer to VOID.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Dec 4 08:01:50 2008 New Revision: 37845 URL: http://svn.reactos.org/svn/reactos?rev=37845&view=rev Log: - WDK defines PNOTIFY_SYNC as a pointer to VOID. Modified: trunk/reactos/include/ddk/ntifs.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=37… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Thu Dec 4 08:01:50 2008 @@ -586,20 +586,7 @@ typedef ULONG VBN; typedef VBN *PVBN; -typedef struct _NOTIFY_SYNC -{ - ULONG Unknown0; - ULONG Unknown1; - ULONG Unknown2; - USHORT Unknown3; - USHORT Unknown4; - ULONG Unknown5; - ULONG Unknown6; - ULONG Unknown7; - ULONG Unknown8; - ULONG Unknown9; - ULONG Unknown10; -} NOTIFY_SYNC, * PNOTIFY_SYNC; +typedef PVOID *PNOTIFY_SYNC; typedef enum _FAST_IO_POSSIBLE { FastIoIsNotPossible,

16 years

← Newer
1
...
62
63
64
65
66
67
68
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2008