Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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 04 Dec '08

04 Dec '08

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

1 0

[tkreuzer] 37849: Partly implement KiDispatchException, based on x86 implementation.
by tkreuzer＠svn.reactos.org 04 Dec '08

04 Dec '08

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

1 0

[sginsberg] 37848: - Don't cache a value if we might dereference NULL - Fix for CID 653
by sginsberg＠svn.reactos.org 04 Dec '08

04 Dec '08

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))

1 0

[tkreuzer] 37847: Implement KeContextToTrapFrame and KeTrapFrameToContext
by tkreuzer＠svn.reactos.org 04 Dec '08

04 Dec '08

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); }

1 0

[sginsberg] 37846: - Fix some redefinitions
by sginsberg＠svn.reactos.org 04 Dec '08

04 Dec '08

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 */

1 0

[fireball] 37845: - WDK defines PNOTIFY_SYNC as a pointer to VOID.
by fireball＠svn.reactos.org 04 Dec '08

04 Dec '08

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,

1 0

[tkreuzer] 37844: fix a comment, #undef RtlGetCallersaddress before implementing it
by tkreuzer＠svn.reactos.org 04 Dec '08

04 Dec '08

Author: tkreuzer Date: Thu Dec 4 05:26:30 2008 New Revision: 37844 URL: http://svn.reactos.org/svn/reactos?rev=37844&view=rev Log: fix a comment, #undef RtlGetCallersaddress before implementing it Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c [iso-8859-1] Thu Dec 4 05:26:30 2008 @@ -117,9 +117,7 @@ ULONG IndexLo, IndexHi, IndexMid; /* Find the corresponding table */ - FunctionTable = RtlLookupFunctionTable(ControlPc, - ImageBase, - &TableLength); + FunctionTable = RtlLookupFunctionTable(ControlPc, ImageBase, &TableLength); /* Fail, if no table is found */ if (!FunctionTable) @@ -544,8 +542,8 @@ return i; } -// CHEKCME: return PVOID? // http://undocumented.ntinternals.net/UserMode/Undocumented%20Functions/Debug… +#undef RtlGetCallersAddress VOID NTAPI RtlGetCallersAddress(

1 0

[fireball] 37843: - Fix FsRtlFastCheckLockForRead and Write function prototypes.
by fireball＠svn.reactos.org 04 Dec '08

04 Dec '08

Author: fireball Date: Thu Dec 4 05:12:42 2008 New Revision: 37843 URL: http://svn.reactos.org/svn/reactos?rev=37843&view=rev Log: - Fix FsRtlFastCheckLockForRead and Write function prototypes. Modified: trunk/reactos/include/ddk/ntifs.h trunk/reactos/ntoskrnl/fsrtl/filelock.c 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 05:12:42 2008 @@ -3128,7 +3128,7 @@ IN PLARGE_INTEGER Length, IN ULONG Key, IN PFILE_OBJECT FileObject, - IN PEPROCESS Process + IN PVOID Process ); NTKERNELAPI @@ -3140,7 +3140,7 @@ IN PLARGE_INTEGER Length, IN ULONG Key, IN PFILE_OBJECT FileObject, - IN PEPROCESS Process + IN PVOID Process ); #define FsRtlFastLock(A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11) ( \ Modified: trunk/reactos/ntoskrnl/fsrtl/filelock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/filelock.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/filelock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/filelock.c [iso-8859-1] Thu Dec 4 05:12:42 2008 @@ -141,7 +141,7 @@ IN PLARGE_INTEGER Length, IN ULONG Key, IN PFILE_OBJECT FileObject, - IN PEPROCESS Process) + IN PVOID Process) { KeBugCheck(FILE_SYSTEM); return FALSE; @@ -157,7 +157,7 @@ IN PLARGE_INTEGER Length, IN ULONG Key, IN PFILE_OBJECT FileObject, - IN PEPROCESS Process) + IN PVOID Process) { KeBugCheck(FILE_SYSTEM); return FALSE;

1 0

[janderwald] 37842: - Add CLSIDs for Miniport drivers - Add IIDs for IResourceList, IRegistryKey - Add IMiniportWaveCyclicStream, IMiniportWaveCyclic interface
by janderwald＠svn.reactos.org 04 Dec '08

04 Dec '08

Author: janderwald Date: Thu Dec 4 02:44:17 2008 New Revision: 37842 URL: http://svn.reactos.org/svn/reactos?rev=37842&view=rev Log: - Add CLSIDs for Miniport drivers - Add IIDs for IResourceList, IRegistryKey - Add IMiniportWaveCyclicStream, IMiniportWaveCyclic interface Added: trunk/reactos/include/ddk/dmusicks.h (with props) Modified: trunk/reactos/include/ddk/portcls.h Added: 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 (added) +++ trunk/reactos/include/ddk/dmusicks.h [iso-8859-1] Thu Dec 4 02:44:17 2008 @@ -1,0 +1,10 @@ +#ifndef _DMUSICKS_ +#define _DMUSICKS_ + +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); + + + + +#endif Propchange: trunk/reactos/include/ddk/dmusicks.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Thu Dec 4 02:44:17 2008 @@ -162,24 +162,9 @@ #define PORT_CLASS_DEVICE_EXTENSION_SIZE ( 64 * sizeof(ULONG_PTR) ) -/* =============================================================== - Class IDs - TODO (put these elsewhere!!!) -*/ -#if 0 -//#define CLSID_PortDMus /* dmusicks.h */ -DEFINE_GUID(CLSID_PortMidi,0xb4c90a43L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); -#define CLSID_PortTopology -#define CLSID_PortWaveCyclic -#define CLSID_PortWavePci - -/* first 2 are dmusicks.h */ -#define CLSID_MiniportDriverDMusUART -#define CLSID_MiniportDriverDMusUARTCapture -#define CLSID_MiniportDriverFmSynth -#define CLSID_MiniportDriverFmSynthWithVol -DEFINE_GUID(CLSID_MiniportDriverUart,0xb4c90ae1L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); -#endif - + +DEFINE_GUID(CLSID_MiniportDriverFmSynth, 0xb4c90ae0L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); +DEFINE_GUID(CLSID_MiniportDriverFmSynthWithVol, 0xe5a3c139L, 0xf0f2, 0x11d1, 0x81, 0xaf, 0x00, 0x60, 0x08, 0x33, 0x16, 0xc1); /* =============================================================== Event Item Flags - TODO @@ -400,6 +385,8 @@ #undef INTERFACE #define INTERFACE IResourceList +DEFINE_GUID(IID_IResourceList, 0x22C6AC60L, 0x851B, 0x11D0, 0x9A, 0x7F, 0x00, 0xAA, 0x00, 0x38, 0xAC, 0xFE); + DECLARE_INTERFACE_(IResourceList, IUnknown) { DEFINE_ABSTRACT_UNKNOWN() @@ -788,6 +775,8 @@ /* =============================================================== IRegistryKey Interface */ + +DEFINE_GUID(IID_IRegistryKey, 0xE8DA4302l, 0xF304, 0x11D0, 0x95, 0x8B, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); DECLARE_INTERFACE_(IRegistryKey, IUnknown) { @@ -1015,28 +1004,55 @@ STDMETHODIMP_(NTSTATUS) RegisterServiceGroup( \ IN PSERVICEGROUP ServiceGroup); - +#undef INTERFACE /* =============================================================== IPortWaveCyclic Interface */ - -#if 0 -#define STATIC_IPortWaveCyclic \ - 0xb4c90a26L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44 -DEFINE_GUIDSTRUCT("0xB4C90A26-5791-11d0-86f9-00a0c911b544", IID_IPortWaveCyclic); -#define IID_IPortWaveCyclic DEFINE_GUIDNAMED(IID_IPortWaveCyclic) -#endif DEFINE_GUID(IID_IPortWaveCyclic, 0xb4c90a26L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); DEFINE_GUID(CLSID_PortWaveCyclic, 0xb4c90a2aL, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); +#define INTERFACE IPortWaveCyclic + DECLARE_INTERFACE_(IPortWaveCyclic, IPort) { - DEFINE_ABSTRACT_UNKNOWN() - DEFINE_ABSTRACT_PORT() + 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) PURE; + STDMETHOD_(NTSTATUS, NewMasterDmaChannel)(THIS_ OUT PDMACHANNEL* DmaChannel, @@ -1057,13 +1073,12 @@ IN BOOL DemandMode, IN DMA_SPEED DmaSpeed) PURE; - STDMETHOD_(VOID, Notify)(THIS_ - IN PSERVICEGROUP ServiceGroup) PURE; -}; - -/* TODO ... */ - - + +}; + +typedef IPortWaveCyclic *PPORTWAVECYCLIC; + +#undef INTERFACE /* =============================================================== IPortWavePci Interface */ @@ -1231,6 +1246,7 @@ #define IMP_IPortTopology IMP_IPort + /* =============================================================== IMiniportTopology Interface */ @@ -1239,9 +1255,73 @@ IMiniportWaveCyclicStream Interface */ +DECLARE_INTERFACE_(IMiniportWaveCyclicStream,IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() // For IUnknown + + STDMETHOD_(NTSTATUS,SetFormat)(THIS_ + IN PKSDATAFORMAT DataFormat)PURE; + + STDMETHOD_(ULONG,SetNotificationFreq)(THIS_ + IN ULONG Interval, + OUT PULONG FrameSize) PURE; + + STDMETHOD_(NTSTATUS,SetState)(THIS_ + IN KSSTATE State) PURE; + + STDMETHOD_(NTSTATUS,GetPosition)( THIS_ + OUT PULONG Position) PURE; + + STDMETHOD_(NTSTATUS,NormalizePhysicalPosition)(THIS_ + IN OUT PLONGLONG PhysicalPosition) PURE; + + STDMETHOD_(void, Silence)( THIS_ + IN PVOID Buffer, + IN ULONG ByteCount) PURE; +}; + +typedef IMiniportWaveCyclicStream *PMINIPORTWAVECYCLICSTREAM; + /* =============================================================== IMiniportWaveCyclic Interface */ +#undef INTERFACE + +DEFINE_GUID(IID_IMiniportWaveCyclic, + 0xb4c90a27L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); + +#define INTERFACE IMiniportWaveCyclic + +DECLARE_INTERFACE_(IMiniportWaveCyclic, IMiniport) +{ + STDMETHOD_(NTSTATUS, QueryInterface)(THIS_ + REFIID InterfaceId, + PVOID* Interface + ) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + + + DEFINE_ABSTRACT_MINIPORT() + + STDMETHOD_(NTSTATUS, Init)(THIS_ + IN PUNKNOWN UnknownAdapter, + IN PRESOURCELIST ResourceList, + IN PPORTWAVECYCLIC Port) PURE; + + STDMETHOD_(NTSTATUS, NewStream)(THIS_ + OUT PMINIPORTWAVECYCLICSTREAM *Stream, + IN PUNKNOWN OuterUnknown OPTIONAL, + IN POOL_TYPE PoolType, + IN ULONG Pin, + IN BOOL Capture, + IN PKSDATAFORMAT DataFormat, + OUT PDMACHANNEL *DmaChannel, + OUT PSERVICEGROUP *ServiceGroup) PURE; +}; + +typedef IMiniportWaveCyclic *PMINIPORTWAVECYCLIC; +#undef INTERFACE /* =============================================================== IMiniportWavePciStream Interface

1 0

[dgorbachev] 37841: Fix them second time.
by dgorbachev＠svn.reactos.org 04 Dec '08

04 Dec '08

Author: dgorbachev Date: Wed Dec 3 18:55:15 2008 New Revision: 37841 URL: http://svn.reactos.org/svn/reactos?rev=37841&view=rev Log: Fix them second time. Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] Wed Dec 3 18:55:15 2008 @@ -16,7 +16,9 @@ #define Ke386GetInterruptDescriptorTable(X) \ __asm__("sidt %0\n\t" \ - : "=m" (X)); + : "=m" (X) \ + : /* no input */ \ + : "memory"); #define Ke386SetGlobalDescriptorTable(X) \ __asm__("lgdt %0\n\t" \ @@ -25,11 +27,15 @@ #define Ke386GetGlobalDescriptorTable(X) \ __asm__("sgdt %0\n\t" \ - : "=m" (X)); + : "=m" (X) \ + : /* no input */ \ + : "memory"); #define Ke386GetLocalDescriptorTable(X) \ __asm__("sldt %0\n\t" \ - : "=m" (X)); + : "=m" (X) \ + : /* no input */ \ + : "memory"); #define Ke386SetLocalDescriptorTable(X) \ __asm__("lldt %w0\n\t" \

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